Skip to content

Commit 38f916d

Browse files
committed
Merge remote-tracking branch 'origin/mat_index_bug' into view_axis_length
2 parents 17a0461 + e1024d3 commit 38f916d

31 files changed

+252
-571
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/" # Location of package manifests
6+
schedule:
7+
interval: "weekly"

.github/workflows/ci.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,20 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
version:
18-
- '1.6'
19-
- '1.8'
20-
- '1.9'
2118
- '1.10'
2219
- '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
20+
- 'pre'
2321
os:
2422
- ubuntu-latest
2523
arch:
2624
- x64
2725
steps:
28-
- uses: actions/checkout@v2
29-
- uses: julia-actions/setup-julia@v1
26+
- uses: actions/checkout@v4
27+
- uses: julia-actions/setup-julia@v2
3028
with:
3129
version: ${{ matrix.version }}
3230
arch: ${{ matrix.arch }}
33-
- uses: actions/cache@v1
31+
- uses: actions/cache@v4
3432
env:
3533
cache-name: cache-artifacts
3634
with:
@@ -43,6 +41,6 @@ jobs:
4341
- uses: julia-actions/julia-buildpkg@v1
4442
- uses: julia-actions/julia-runtest@v1
4543
- uses: julia-actions/julia-processcoverage@v1
46-
- uses: codecov/codecov-action@v1
44+
- uses: codecov/codecov-action@v5
4745
with:
4846
file: lcov.info

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- uses: julia-actions/setup-julia@latest
1616
with:
17-
version: '1.6'
17+
version: '1.10'
1818
- name: Install dependencies
1919
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
2020
- name: Build and deploy

.github/workflows/downgrade.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Downgrade
2+
on:
3+
pull_request:
4+
branches:
5+
- main
6+
paths-ignore:
7+
- 'docs/**'
8+
push:
9+
branches:
10+
- main
11+
paths-ignore:
12+
- 'docs/**'
13+
jobs:
14+
test:
15+
runs-on: ubuntu-latest
16+
strategy:
17+
matrix:
18+
version: ['1.10']
19+
steps:
20+
- uses: actions/checkout@v4
21+
- uses: julia-actions/setup-julia@v2
22+
with:
23+
version: ${{ matrix.version }}
24+
- uses: cjdoris/julia-downgrade-compat-action@v1
25+
- uses: julia-actions/julia-buildpkg@v1
26+
- uses: julia-actions/julia-runtest@v1

NEWS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ComponentArrays.jl NEWS
2-
Notes on new features (minor releases). For more details on bugfixes and non-feature-adding changes (patch releases), check out the [releases page](https://github.com/jonniedie/ComponentArrays.jl/releases).
2+
Notes on new features (minor releases). For more details on bugfixes and non-feature-adding changes (patch releases), check out the [releases page](https://github.com/SciML/ComponentArrays.jl/releases).
33

44
### v0.15.0
55
- Unpack array components as `StaticArray`s!
@@ -27,7 +27,7 @@ ComponentVector{Float64,SubArray...}(e = 2.0, f = [6.0, 30.0])
2727

2828
### v0.12.0
2929
- Multiple symbol indexing!
30-
- Use either an `Array` or `Tuple` of `Symbol`s to extract multiple named components into a new `ComponentArray
30+
- Use either an `Array` or `Tuple` of `Symbol`s to extract multiple named components into a new `ComponentArray`
3131
- It's fast!
3232
```julia
3333
julia> ca = ComponentArray(a=5, b=[4, 1], c=(a=2, b=[6, 30.0]))
@@ -118,7 +118,7 @@ julia> @btime sum(x.a + x.b for x in $ca.c.a);
118118
- Easier DifferentialEquations plotting!
119119
- Automatic legend labeling!
120120
- `Symbol` and `String` support for the `vars` plot keyword!
121-
- See it in an action [here](https://github.com/jonniedie/ComponentArrays.jl/blob/master/docs/src/examples/adaptive_control.md)!
121+
- See it in an action [here](https://github.com/SciML/ComponentArrays.jl/blob/main/docs/src/examples/adaptive_control.md)!
122122

123123
### v0.5.0
124124
- Constructor for making new `ComponentVector`s with additional fields! Watch out, it's slow!
@@ -131,7 +131,7 @@ ComponentVector{Int64}(a = 5, b = [1, 2], c = [0 0; 0 0], d = (a = 2, b = 10))
131131
```
132132

133133
### v0.4.0
134-
- Zygote rules for DiffEqFlux support! Check out [the docs](https://jonniedie.github.io/ComponentArrays.jl/dev/examples/DiffEqFlux/) for an example!
134+
- Zygote rules for DiffEqFlux support! Check out [the docs](https://sciml.github.io/ComponentArrays.jl/dev/examples/DiffEqFlux/) for an example!
135135

136136
### v0.3.0
137137
- Matrix and higher-dimensional array components!

Project.toml

Lines changed: 24 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,58 @@
11
name = "ComponentArrays"
22
uuid = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
33
authors = ["Jonnie Diegelman <[email protected]>"]
4-
version = "0.15.17"
4+
version = "0.15.22"
55

66
[deps]
7+
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
78
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
89
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
10+
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
911
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
1012
Functors = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
1113
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
12-
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
1314
StaticArrayInterface = "0d7ed370-da01-4f52-bd93-41d350b8b718"
1415
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
1516

1617
[weakdeps]
17-
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
18-
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
1918
GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
19+
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
2020
Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2"
21+
Reactant = "3c362404-f566-11ee-1572-e11a4b42c853"
2122
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
2223
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
2324
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
2425
Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
25-
TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77"
2626
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
2727

2828
[extensions]
29-
ComponentArraysAdaptExt = "Adapt"
30-
ComponentArraysConstructionBaseExt = "ConstructionBase"
3129
ComponentArraysGPUArraysExt = "GPUArrays"
30+
ComponentArraysKernelAbstractionsExt = "KernelAbstractions"
3231
ComponentArraysOptimisersExt = "Optimisers"
32+
ComponentArraysReactantExt = "Reactant"
3333
ComponentArraysRecursiveArrayToolsExt = "RecursiveArrayTools"
3434
ComponentArraysReverseDiffExt = "ReverseDiff"
3535
ComponentArraysSciMLBaseExt = "SciMLBase"
3636
ComponentArraysTrackerExt = "Tracker"
37-
ComponentArraysTruncatedStacktracesExt = "TruncatedStacktraces"
3837
ComponentArraysZygoteExt = "Zygote"
3938

4039
[compat]
41-
Adapt = "3, 4"
42-
ArrayInterface = "6, 7"
43-
ChainRulesCore = "0.8, 0.9, 0.10, 1"
40+
Adapt = "4.1"
41+
ArrayInterface = "7.17.1"
42+
ChainRulesCore = "1.25"
4443
ConstructionBase = "1"
45-
ForwardDiff = "0.10"
46-
Functors = "0.4.4"
47-
GPUArrays = "8, 9, 10"
48-
LinearAlgebra = "1"
49-
Optimisers = "0.3"
50-
PackageExtensionCompat = "1"
51-
RecursiveArrayTools = "2, 3"
52-
ReverseDiff = "1"
53-
SciMLBase = "1, 2"
44+
ForwardDiff = "0.10.36"
45+
Functors = "0.4.12, 0.5"
46+
GPUArrays = "10.3.1, 11"
47+
KernelAbstractions = "0.9.29"
48+
LinearAlgebra = "1.10"
49+
Optimisers = "0.3, 0.4"
50+
Reactant = "0.2.15"
51+
RecursiveArrayTools = "3.8"
52+
ReverseDiff = "1.15"
53+
SciMLBase = "2"
5454
StaticArrayInterface = "1"
55-
StaticArraysCore = "1"
56-
Test = "1"
57-
Tracker = "0.2"
58-
TruncatedStacktraces = "1.4"
59-
Zygote = "0.6"
60-
julia = "1.6"
61-
62-
[extras]
63-
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
64-
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
65-
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
66-
GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
67-
Optimisers = "3bd65402-5787-11e9-1adc-39752487f4e2"
68-
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
69-
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
70-
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
71-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
72-
Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c"
73-
TruncatedStacktraces = "781d530d-4396-4725-bb49-402e4bee1e77"
74-
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
55+
StaticArraysCore = "1.4"
56+
Tracker = "0.2.37"
57+
Zygote = "0.6.70, 0.7"
58+
julia = "1.10"

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# ComponentArrays.jl
22
![](assets/logo.png)
33

4-
| **Documentation** | **Build Status** |
5-
|:-------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------:|
4+
| **Documentation** | **Build Status** |
5+
|:-------------------------------------------------------------------------:|:-----------------------------------------------------------:|
66
| [![][docs-stable-img]][docs-stable-url] [![][docs-dev-img]][docs-dev-url] | [![][build-img]][build-url] [![][codecov-img]][codecov-url] |
77

88

99
[docs-dev-img]: https://img.shields.io/badge/docs-latest-blue.svg
10-
[docs-dev-url]: https://jonniedie.github.io/ComponentArrays.jl/dev
10+
[docs-dev-url]: https://sciml.github.io/ComponentArrays.jl/dev
1111

1212
[docs-stable-img]: https://img.shields.io/badge/docs-stable-blue.svg
13-
[docs-stable-url]: https://jonniedie.github.io/ComponentArrays.jl/stable
13+
[docs-stable-url]: https://sciml.github.io/ComponentArrays.jl/stable
1414

15-
[build-img]: https://img.shields.io/github/actions/workflow/status/jonniedie/ComponentArrays.jl/ci.yml
16-
[build-url]: https://github.com/jonniedie/docs/ComponentArrays.jl/workflows/ci.yml
15+
[build-img]: https://img.shields.io/github/actions/workflow/status/SciML/ComponentArrays.jl/ci.yml
16+
[build-url]: https://github.com/SciML/ComponentArrays.jl/actions/workflows/ci.yml
1717

18-
[codecov-img]: https://img.shields.io/codecov/c/github/jonniedie/ComponentArrays.jl
19-
[codecov-url]: https://codecov.io/gh/jonniedie/ComponentArrays.jl
18+
[codecov-img]: https://img.shields.io/codecov/c/github/SciML/ComponentArrays.jl
19+
[codecov-url]: https://codecov.io/gh/SciML/ComponentArrays.jl
2020

2121
The main export of this package is the ````ComponentArray```` type. "Components" of ````ComponentArray````s
2222
are really just array blocks that can be accessed through a named index. This will create a new ```ComponentArray``` whose data is a view into the original,
@@ -27,7 +27,7 @@ in [DifferentialEquations.jl](https://github.com/SciML/DifferentialEquations.jl)
2727
[Optim.jl](https://github.com/JuliaNLSolvers/Optim.jl), but anything that requires
2828
flat vectors is fair game.
2929

30-
Check out the [NEWS](https://github.com/jonniedie/ComponentArrays.jl/blob/master/NEWS.md) for new features by minor release version.
30+
Check out the [NEWS](https://github.com/SciML/ComponentArrays.jl/blob/master/NEWS.md) for new features by minor release version.
3131

3232

3333
## General use
@@ -45,7 +45,7 @@ julia> x[8]
4545
400.0
4646

4747
julia> collect(x)
48-
10-element Array{Float64,1}:
48+
10-element Vector{Float64}:
4949
5.0
5050
20.0
5151
0.0

0 commit comments

Comments
 (0)