Skip to content

Commit 68b8f20

Browse files
Merge branch 'main' into runic-formatting
2 parents ae5f31d + 970a927 commit 68b8f20

8 files changed

Lines changed: 40 additions & 13 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ on:
99
tags: '*'
1010
jobs:
1111
test:
12-
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
12+
name: Julia ${{ matrix.version }} - ${{ matrix.group }} - ${{ github.event_name }}
1313
runs-on: ${{ matrix.os }}
1414
strategy:
1515
fail-fast: false
1616
matrix:
17+
group:
18+
- All
19+
- nopre
1720
version:
1821
- 'lts'
1922
- '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
@@ -22,6 +25,9 @@ jobs:
2225
- ubuntu-latest
2326
arch:
2427
- x64
28+
exclude:
29+
- group: nopre
30+
version: 'pre'
2531
steps:
2632
- uses: actions/checkout@v6
2733
- uses: julia-actions/setup-julia@v2
@@ -40,6 +46,8 @@ jobs:
4046
${{ runner.os }}-
4147
- uses: julia-actions/julia-buildpkg@v1
4248
- uses: julia-actions/julia-runtest@v1
49+
env:
50+
GROUP: ${{ matrix.group }}
4351
- uses: julia-actions/julia-processcoverage@v1
4452
- uses: codecov/codecov-action@v5
4553
with:

docs/make.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ makedocs(;
1818
"examples/DiffEqFlux.md",
1919
"examples/adaptive_control.md",
2020
"examples/ODE_jac.md",
21+
"examples/coulomb_control.md",
2122
],
2223
"API" => "api.md",
2324
],

docs/src/index.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,3 @@ language for, but without actually needing a modeling language. The main targets
99
in [DifferentialEquations.jl](https://github.com/SciML/DifferentialEquations.jl) and
1010
[Optim.jl](https://github.com/JuliaNLSolvers/Optim.jl), but anything that requires
1111
flat vectors is fair game.
12-
13-
```@contents
14-
Pages = ["examples/example1.md"]
15-
Depth = 2
16-
```

docs/src/indexing_behavior.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ julia> ca[KeepIndex(:b)]
9191
ComponentVector{Int64}(b = [4, 1])
9292
```
9393

94-
Now instead of just returning a plain `Vector`, this returns a `ComponentVector` that keeps the `b` name. Of course, this is still compatible with `view`s, so we could have done `@view ca[KeepIndex(:b)]` if we wanted to retain the view into the origianl.
94+
Now instead of just returning a plain `Vector`, this returns a `ComponentVector` that keeps the `b` name. Of course, this is still compatible with `view`s, so we could have done `@view ca[KeepIndex(:b)]` if we wanted to retain the view into the original.
9595

9696
Similarly, we can use plain indexes like ranges or integers and they will keep the names of any components they capture:
9797

test/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
77
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
88
Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
99
InvertedIndices = "41ab1584-1d38-5bbf-9106-f11c6c58b48f"
10-
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
1110
JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb"
1211
LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
1312
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1413
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
1514
Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2"
15+
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1616
Reactant = "3c362404-f566-11ee-1572-e11a4b42c853"
1717
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
1818
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"

test/nopre/Project.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[deps]
2+
ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
3+
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
4+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
5+
6+
[compat]
7+
JET = "0.9, 0.10, 0.11"

test/runtests.jl

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
using Pkg
2+
using Test
3+
4+
const GROUP = get(ENV, "GROUP", "All")
5+
6+
function activate_nopre_env()
7+
Pkg.activate("nopre")
8+
Pkg.develop(PackageSpec(path = dirname(@__DIR__)))
9+
Pkg.instantiate()
10+
end
11+
12+
# Handle nopre group separately - requires its own environment
13+
if GROUP == "nopre"
14+
activate_nopre_env()
15+
@testset "JET" begin
16+
include("nopre/jet_tests.jl")
17+
end
18+
exit(0) # Exit after nopre tests
19+
end
20+
21+
# Main test group (GROUP == "All" or default)
122
using ComponentArrays
223
using BenchmarkTools
324
using ForwardDiff
@@ -7,7 +28,6 @@ using LabelledArrays
728
using LinearAlgebra
829
using StaticArrays
930
using OffsetArrays
10-
using Test
1131
using Unitful
1232
using Functors
1333

@@ -1004,7 +1024,3 @@ end
10041024
@testset "Reactant" begin
10051025
include("reactant_tests.jl")
10061026
end
1007-
1008-
@testset "JET" begin
1009-
include("jet_tests.jl")
1010-
end

0 commit comments

Comments
 (0)