Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Abstractcosmoemu #23

Merged
merged 29 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6daf623
Adding the AbstractCosmologicalEmulators package
marcobonici Sep 22, 2023
1616bae
Working with ACE
marcobonici Sep 24, 2023
a483b20
Added window convolution
marcobonici Nov 8, 2023
1b61264
Fixing typo in agn diam distane
marcobonici Nov 9, 2023
b8ded33
Fixed typo in default argument
marcobonici Nov 9, 2023
f1491a1
Updating AP evaluation
marcobonici Nov 9, 2023
7c4ab0b
Renaming things
marcobonici Nov 9, 2023
7446aef
Bug fixing in AP stoch
marcobonici Nov 10, 2023
48cd1a4
Fixed bug in window
marcobonici Nov 10, 2023
af9575c
ixed typo in q_perp qpar
marcobonici Nov 11, 2023
c08342f
From cubic to quadratic spline
marcobonici Nov 11, 2023
535db6a
Added precise neutrino growth
marcobonici May 28, 2024
dfac5d7
Small change in API
marcobonici May 28, 2024
c5738e6
new method
marcobonici Jul 21, 2024
60d4d59
Adding CI
marcobonici Aug 29, 2024
1e63a88
Fixing CI
marcobonici Aug 29, 2024
d759fb2
Fixing CI
marcobonici Aug 29, 2024
410f7a8
Fixing CI
marcobonici Aug 29, 2024
aca5b09
Updating CI
marcobonici Aug 29, 2024
94d9ae8
Updating readme; removed old lines
marcobonici Aug 29, 2024
05b8d2c
Towards diff D(z)
marcobonici Aug 29, 2024
fec4ea3
Added tests
marcobonici Aug 29, 2024
f19d878
More tests
marcobonici Aug 29, 2024
4c94322
Added finiteDiff test
marcobonici Aug 29, 2024
13766bd
Updating comov distance
marcobonici Aug 30, 2024
94705d6
Added test for growth rate diff
marcobonici Aug 30, 2024
51086ec
Updating tolerance finitediff test
marcobonici Aug 30, 2024
8cc6877
Removed useless string
marcobonici Aug 30, 2024
9a392b4
Updating docs
marcobonici Aug 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: '1.8'
version: '1.10'
- name: Install dependencies
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: Build and deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
run: julia --project=docs/ docs/make.jl
run: julia --project=docs/ docs/make.jl
52 changes: 52 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: CI
on:
schedule:
- cron: 0 0 * * *
pull_request:
branches:
- main
- develop
- abstractcosmoemu
push:
branches:
- '**'
tags: '*'
jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- '1.7'
- '1.8'
- '1.9'
- '1.10'
os:
- ubuntu-latest
arch:
- x64
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@latest
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v4
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
file: lcov.info
9 changes: 7 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
name = "Effort"
uuid = "ace19e24-02c2-4bce-bc41-b57e89c0fc53"
authors = ["marcobonici <[email protected]>"]
version = "0.1.1"
version = "0.2.0"

[deps]
AbstractCosmologicalEmulators = "c83c1981-e5c4-4837-9eb8-c9b1572acfc6"
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
LegendrePolynomials = "3db4a2ba-fc88-11e8-3e01-49c72059a882"
LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
Memoization = "6fafb56a-5788-4b4e-91ca-c0cea6611c73"
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
SimpleChains = "de6bee2f-e2f4-4ec7-b6ed-219cc6f6e9e5"

[compat]
AbstractCosmologicalEmulators = "0.3.3"
Adapt = "3"
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# Effort.jl
[![](https://img.shields.io/badge/docs-stable-blue.svg)](https://cosmologicalemulators.github.io/Effort.jl/stable)
[![](https://img.shields.io/badge/docs-dev-blue.svg)](https://cosmologicalemulators.github.io/Effort.jl/dev)
![size](https://img.shields.io/github/repo-size/CosmologicalEmulators/Effort.jl)
[![Code Style: Blue](https://img.shields.io/badge/code%20style-blue-4495d1.svg)](https://github.com/invenia/BlueStyle)
[![ColPrac: Contributor's Guide on Collaborative Practices for Community Packages](https://img.shields.io/badge/ColPrac-Contributor's%20Guide-blueviolet)](https://github.com/SciML/ColPrac)

| **Documentation** | **Build Status** | **Code style** |
|:--------:|:----------------:|:----------------:|
| [![](https://img.shields.io/badge/docs-dev-blue.svg)](https://cosmologicalemulators.github.io/Effort.jl/dev) [![](https://img.shields.io/badge/docs-stable-blue.svg)](https://cosmologicalemulators.github.io/Effort.jl/stable) | [![Build status (Github Actions)](https://github.com/CosmologicalEmulators/Effort.jl/workflows/CI/badge.svg)](https://github.com/CosmologicalEmulators/Effort.jl/actions) [![codecov](https://codecov.io/gh/CosmologicalEmulators/Effort.jl/branch/abstractcosmoemu/graph/badge.svg?token=0PYHCWVL67)](https://codecov.io/gh/CosmologicalEmulators/Effort.jl) | [![Code Style: Blue](https://img.shields.io/badge/code%20style-blue-4495d1.svg)](https://github.com/invenia/BlueStyle) [![ColPrac: Contributor's Guide on Collaborative Practices for Community Packages](https://img.shields.io/badge/ColPrac-Contributor's%20Guide-blueviolet)](https://github.com/SciML/ColPrac) |

Repository containing the EFfective Field theORy surrogaTe.

### Authors

- Marco Bonici, INAF - Institute of Space Astrophysics and Cosmic Physics (IASF), Milano
- Guido D'Amico, Università Degli Studi di Parma
- Marco Bonici, PostDoctoral Researcher at Waterloo Centre for Astrophysics
- Guido D'Amico, Associate Professor at Università Degli Studi di Parma
16 changes: 15 additions & 1 deletion src/Effort.jl
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
module Effort

using Base: @kwdef
using AbstractCosmologicalEmulators
import AbstractCosmologicalEmulators.get_emulator_description
using DataInterpolations
using FastGaussQuadrature
using LegendrePolynomials
using LoopVectorization
using Memoization
using OrdinaryDiffEq
using QuadGK
using SimpleChains

const c_0 = 2.99792458e5

function __init__()
min_y = get_y(0,0) #obvious, I know
max_y = get_y(1,10)
y_grid = vcat(LinRange(min_y, 100, 100), LinRange(100.1, max_y, 1000))
F_grid = [_F(y) for y in y_grid]
global F_interpolant = AkimaInterpolation(F_grid, y_grid)
y_grid = vcat(LinRange(min_y, 10., 10000), LinRange(10.1, max_y, 10000))
dFdy_grid = [_dFdy(y) for y in y_grid]
global dFdy_interpolant = AkimaInterpolation(dFdy_grid, y_grid)
end

include("background.jl")
include("neural_networks.jl")
Expand Down
Loading