Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,24 @@ jobs:
file: lcov.info
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
jet:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: julia-actions/setup-julia@v2
with:
version: '1'
- uses: actions/cache@v5
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-jet-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-jet-${{ env.cache-name }}-
${{ runner.os }}-jet-
${{ runner.os }}-
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
env:
GROUP: JET
1 change: 1 addition & 0 deletions .github/workflows/Downgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
- 'docs/**'
jobs:
test:
if: false # Disabled until dependency compatibility issues are resolved. See https://github.com/SciML/DiffEqBayes.jl/issues/370
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down
5 changes: 2 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,11 @@ StanSample = "6, 7"
StructArrays = "0.7"
TransformVariables = "0.8"
TransformedLogDensities = "1"
Turing = "0.38, 0.39, 0.40"
Turing = "0.42"
julia = "1.10"

[extras]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
ParameterizedFunctions = "65888b18-ceab-5e60-b2b9-181511a3b968"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Expand All @@ -71,4 +70,4 @@ SteadyStateDiffEq = "9672c7b4-1e72-59bd-8a11-6ac3964bc41f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["ADTypes", "JET", "Test", "Pkg", "OrdinaryDiffEq", "ParameterizedFunctions", "SafeTestsets", "StatsBase", "SteadyStateDiffEq"]
test = ["ADTypes", "Test", "Pkg", "OrdinaryDiffEq", "ParameterizedFunctions", "SafeTestsets", "StatsBase", "SteadyStateDiffEq"]
2 changes: 1 addition & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ StanSample = "7"
StatsBase = "0.33, 0.34"
StatsPlots = "0.15"
TransformVariables = "0.8"
Turing = "0.38, 0.39, 0.40"
Turing = "0.42"
2 changes: 1 addition & 1 deletion src/abc_inference.jl
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function createabcfunction(
end

function abc_inference(
prob::DiffEqBase.DEProblem, alg, t, data, priors; ϵ = 0.001,
prob::SciMLBase.AbstractSciMLProblem, alg, t, data, priors; ϵ = 0.001,
distancefunction = euclidean, ABCalgorithm = ABCSMC,
progress = false,
num_samples = 500, maxiterations = 10^5, save_idxs = nothing,
Expand Down
2 changes: 1 addition & 1 deletion src/dynamichmc_inference.jl
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ posterior values (transformed from `ℝⁿ`).
- `mcmc_kwargs` are passed on as keyword arguments to `DynamicHMC.mcmc_with_warmup`
"""
function dynamichmc_inference(
problem::Union{DiffEqBase.DEProblem, DiffEqBase.AbstractNonlinearProblem}, algorithm, t, data,
problem::SciMLBase.AbstractSciMLProblem, algorithm, t, data,
parameter_priors,
parameter_transformations = as(
Vector, asℝ₊,
Expand Down
2 changes: 1 addition & 1 deletion src/stan_inference.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function generate_theta(n::Integer, priors)
end

function stan_inference(
prob::Union{DiffEqBase.DEProblem, DiffEqBase.AbstractNonlinearProblem},
prob::SciMLBase.AbstractSciMLProblem,
alg,
# Positional arguments
t,
Expand Down
4 changes: 4 additions & 0 deletions test/jet/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[deps]
DiffEqBayes = "ebbdde9d-f333-5424-9be2-dbf1e9acfb5e"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
File renamed without changes.
7 changes: 5 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@ if GROUP == "Stan" || GROUP == "All"
end
end

if GROUP == "JET" || GROUP == "All"
if GROUP == "JET"
using Pkg
Pkg.activate(joinpath(@__DIR__, "jet"))
Pkg.instantiate()
@time @safetestset "JET" begin
include("jet.jl")
include("jet/jet_tests.jl")
end
end
Loading