fix: bump componentarrays version

LuxDL · Jan 11, 2025 · 80b00f0 · 80b00f0
1 parent 34f9cf2
commit 80b00f0
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 23 deletions.
diff --git a/Project.toml b/Project.toml
@@ -85,7 +85,7 @@ ArrayInterface = "7.17.1"
 CUDA = "5.3.2"
 ChainRulesCore = "1.25"
 Compat = "4.16"
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 ConcreteStructs = "0.2.3"
 DispatchDoctor = "0.4.12"
 Enzyme = "0.13.28"

diff --git a/docs/Project.toml b/docs/Project.toml
@@ -34,7 +34,7 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 ADTypes = "1.10"
 Adapt = "4"
 ChainRulesCore = "1.25"
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 Documenter = "1.4"
 DocumenterVitepress = "0.1.3"
 Enzyme = "0.13.16"

diff --git a/examples/Basics/Project.toml b/examples/Basics/Project.toml
@@ -8,7 +8,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [compat]
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 ForwardDiff = "0.10"
 Lux = "1"
 Optimisers = "0.4.1"

diff --git a/examples/GravitationalWaveForm/Project.toml b/examples/GravitationalWaveForm/Project.toml
@@ -12,7 +12,7 @@ SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1"
 
 [compat]
 CairoMakie = "0.12"
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 LineSearches = "7"
 Lux = "1"
 Optimization = "4"

diff --git a/examples/HyperNet/Project.toml b/examples/HyperNet/Project.toml
@@ -11,7 +11,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [compat]
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 Lux = "1"
 LuxCUDA = "0.3"
 MLDatasets = "0.7"

diff --git a/examples/HyperNet/main.jl b/examples/HyperNet/main.jl
@@ -10,23 +10,27 @@ CUDA.allowscalar(false)
 # ## Loading Datasets
 function load_dataset(::Type{dset}, n_train::Union{Nothing, Int},
         n_eval::Union{Nothing, Int}, batchsize::Int) where {dset}
-    if n_train === nothing
-        imgs, labels = dset(:train)
+    (; features, targets) = if n_train === nothing
+        tmp = dset(:train)
+        tmp[1:length(tmp)]
     else
-        imgs, labels = dset(:train)[1:n_train]
+        dset(:train)[1:n_train]
     end
-    x_train, y_train = reshape(imgs, 28, 28, 1, n_train), onehotbatch(labels, 0:9)
+    x_train, y_train = reshape(features, 28, 28, 1, :), onehotbatch(targets, 0:9)
 
-    if n_eval === nothing
-        imgs, labels = dset(:test)
+    (; features, targets) = if n_eval === nothing
+        tmp = dset(:test)
+        tmp[1:length(tmp)]
     else
-        imgs, labels = dset(:test)[1:n_eval]
+        dset(:test)[1:n_eval]
     end
-    x_test, y_test = reshape(imgs, 28, 28, 1, n_eval), onehotbatch(labels, 0:9)
+    x_test, y_test = reshape(features, 28, 28, 1, :), onehotbatch(targets, 0:9)
 
     return (
-        DataLoader((x_train, y_train); batchsize=min(batchsize, n_train), shuffle=true),
-        DataLoader((x_test, y_test); batchsize=min(batchsize, n_eval), shuffle=false)
+        DataLoader(
+            (x_train, y_train); batchsize=min(batchsize, size(x_train, 4)), shuffle=true),
+        DataLoader(
+            (x_test, y_test); batchsize=min(batchsize, size(x_test, 4)), shuffle=false)
     )
 end
 

diff --git a/examples/NeuralODE/Project.toml b/examples/NeuralODE/Project.toml
@@ -15,7 +15,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [compat]
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 Lux = "1"
 LuxCUDA = "0.3"
 MLDatasets = "0.7"

diff --git a/examples/OptimizationIntegration/Project.toml b/examples/OptimizationIntegration/Project.toml
@@ -13,7 +13,7 @@ SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1"
 
 [compat]
 CairoMakie = "0.12.10"
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 Lux = "1"
 MLUtils = "0.4.4"
 Optimization = "4"

diff --git a/lib/LuxLib/test/Project.toml b/lib/LuxLib/test/Project.toml
@@ -37,7 +37,7 @@ Aqua = "0.8.7"
 BLISBLAS = "0.1"
 BenchmarkTools = "1.5"
 ChainRulesCore = "1.24"
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 Enzyme = "0.13.16"
 EnzymeCore = "0.8.8"
 ExplicitImports = "1.9.0"

diff --git a/lib/LuxTestUtils/Project.toml b/lib/LuxTestUtils/Project.toml
@@ -28,7 +28,7 @@ MLDataDevices = {path = "../MLDataDevices"}
 ADTypes = "1.10"
 ArrayInterface = "7.17.1"
 ChainRulesCore = "1.24.0"
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 DispatchDoctor = "0.4.12"
 Enzyme = "0.13.16"
 FiniteDiff = "2.23.1"

diff --git a/lib/LuxTestUtils/test/Project.toml b/lib/LuxTestUtils/test/Project.toml
@@ -9,7 +9,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 CUDA = "5"
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 Hwloc = "3"
 InteractiveUtils = "<0.0.1, 1"
 MetaTesting = "0.1"

diff --git a/lib/MLDataDevices/Project.toml b/lib/MLDataDevices/Project.toml
@@ -57,7 +57,7 @@ CUDA = "5.2"
 ChainRules = "1.51"
 ChainRulesCore = "1.23"
 Compat = "4.16"
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 FillArrays = "1"
 Functors = "0.5"
 GPUArrays = "10, 11"

diff --git a/lib/MLDataDevices/test/Project.toml b/lib/MLDataDevices/test/Project.toml
@@ -25,7 +25,7 @@ Adapt = "4"
 Aqua = "0.8.4"
 ArrayInterface = "7.11"
 ChainRulesTestUtils = "1.13.0"
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 ExplicitImports = "1.9.0"
 FillArrays = "1"
 ForwardDiff = "0.10.36"

diff --git a/test/Project.toml b/test/Project.toml
@@ -45,7 +45,7 @@ ADTypes = "1.10"
 Adapt = "4"
 Aqua = "0.8.4"
 ChainRulesCore = "1.24"
-ComponentArrays = "0.15.18"
+ComponentArrays = "0.15.22"
 DispatchDoctor = "0.4.12"
 Documenter = "1.4"
 Enzyme = "0.13.16"