diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3beb53d..31f3423 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,14 +1,7 @@ name: CI on: - pull_request: - branches: - - main - - develop - push: - branches: - - main - - develop - tags: '*' + - push + - pull_request jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} @@ -19,7 +12,8 @@ jobs: version: - '1.7' - '1.8' - - '^1.9.0-0' + - '1.9' + - '~1.10.0-0' os: - ubuntu-latest arch: @@ -40,7 +34,6 @@ jobs: ${{ runner.os }}-test-${{ env.cache-name }}- ${{ runner.os }}-test- ${{ runner.os }}- - - run: julia --project=@. -e 'using Pkg; Pkg.add(url="https://github.com/CosmologicalEmulators/AbstractEmulator.jl")' - uses: julia-actions/julia-runtest@v1 - uses: julia-actions/julia-processcoverage@v1 - uses: codecov/codecov-action@v1 diff --git a/Project.toml b/Project.toml index 31de3e1..7d5d521 100644 --- a/Project.toml +++ b/Project.toml @@ -1,13 +1,10 @@ name = "Bora" uuid = "f2bc0970-dd97-4292-b510-1db90d18516e" authors = ["marcobonici "] -version = "0.2.0" +version = "0.3.0" [deps] -AbstractEmulator = "0dc76ace-04b2-4bd9-b691-6d8501953659" -LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890" -SimpleChains = "de6bee2f-e2f4-4ec7-b6ed-219cc6f6e9e5" +AbstractCosmologicalEmulators = "c83c1981-e5c4-4837-9eb8-c9b1572acfc6" [compat] -LoopVectorization = "0.12" -SimpleChains = "0.4" +AbstractCosmologicalEmulators = "0.3.1" \ No newline at end of file diff --git a/src/Bora.jl b/src/Bora.jl index cf930b1..0c1e93d 100644 --- a/src/Bora.jl +++ b/src/Bora.jl @@ -2,7 +2,8 @@ module Bora using Base: @kwdef -using AbstractEmulator +using AbstractCosmologicalEmulators +import AbstractCosmologicalEmulators.get_emulator_description abstract type AbstractξℓEmulator end @@ -91,4 +92,8 @@ function get_ξℓs(cosmo_params, bb_params, ξℓs_emu::CompleteEmulator) return Pls .+ BB end +function get_emulator_description(Clemu::AbstractξℓEmulator) + get_emulator_description(Clemu.TrainedEmulator) +end + end # module diff --git a/test/Project.toml b/test/Project.toml index 3dd0bcb..54c48cf 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,5 +1,4 @@ [deps] -AbstractEmulator = "0dc76ace-04b2-4bd9-b691-6d8501953659" SimpleChains = "de6bee2f-e2f4-4ec7-b6ed-219cc6f6e9e5" Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"