Skip to content

Commit

Permalink
Merge branch 'main' into subcell-limiting-parallel-bounds-check
Browse files Browse the repository at this point in the history
  • Loading branch information
bennibolm authored Jan 11, 2024
2 parents 35aa674 + 994bb4b commit 980cf3e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
run: julia --project=benchmark/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: Run benchmarks
run: julia --project=benchmark/ --color=yes benchmark/run_benchmarks.jl
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: my-artifact
path: benchmark/results*.md
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
- shell: bash
run: |
cp ./lcov.info ./lcov-${{ matrix.trixi_test }}-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.arch }}.info
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lcov-${{ matrix.trixi_test }}-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.arch }}
path: ./lcov-${{ matrix.trixi_test }}-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.arch }}.info
Expand All @@ -176,7 +176,7 @@ jobs:
# At first, we check out the repository and download all artifacts
# (and list files for debugging).
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
- run: ls -R
# Next, we merge the individual coverage files and upload
# the combined results to Coveralls.
Expand All @@ -199,7 +199,7 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./lcov.info
# Upload merged coverage data as artifact for debugging
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: lcov
path: ./lcov.info
Expand Down
6 changes: 6 additions & 0 deletions src/semidiscretization/semidiscretization.jl
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ end

function _jacobian_ad_forward(semi, t0, u0_ode, du_ode, config)
new_semi = remake(semi, uEltype = eltype(config))
# Create anonymous function passed as first argument to `ForwardDiff.jacobian` to match
# `ForwardDiff.jacobian(f!, y::AbstractArray, x::AbstractArray,
# cfg::JacobianConfig = JacobianConfig(f!, y, x), check=Val{true}())`
J = ForwardDiff.jacobian(du_ode, u0_ode, config) do du_ode, u_ode
Trixi.rhs!(du_ode, u_ode, new_semi, t0)
end
Expand All @@ -279,6 +282,9 @@ end

function _jacobian_ad_forward_structarrays(semi, t0, u0_ode_plain, du_ode_plain, config)
new_semi = remake(semi, uEltype = eltype(config))
# Create anonymous function passed as first argument to `ForwardDiff.jacobian` to match
# `ForwardDiff.jacobian(f!, y::AbstractArray, x::AbstractArray,
# cfg::JacobianConfig = JacobianConfig(f!, y, x), check=Val{true}())`
J = ForwardDiff.jacobian(du_ode_plain, u0_ode_plain,
config) do du_ode_plain, u_ode_plain
u_ode = StructArray{SVector{nvariables(semi), eltype(config)}}(ntuple(v -> view(u_ode_plain,
Expand Down

0 comments on commit 980cf3e

Please sign in to comment.