Merge pull request #297 from FluxML/compathelper/new_version/2025-02-12-04-24-08-847-03479061932

CompatHelper: bump compat for Flux to 0.16, (keep existing compat)

Author: ablaom

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.9'
+          - '1.10'
           - '1'
         os:
           - ubuntu-latest

Project.toml

@@ -20,15 +20,15 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 CategoricalArrays = "0.10"
 ColorTypes = "0.10.3, 0.11, 0.12"
 ComputationalResources = "0.3.2"
-Flux = "0.14, 0.15"
+Flux = "0.14, 0.15, 0.16"
 MLJModelInterface = "1.11"
 Metalhead = "0.9.3"
 Optimisers = "0.3.2, 0.4"
 ProgressMeter = "1.7.1"
 StatisticalMeasures = "0.1"
 Statistics = "<0.0.1, 1"
 Tables = "1.0"
-julia = "1.9"
+julia = "1.10"
 
 [extras]
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"

test/mlj_model_interface.jl

@@ -53,21 +53,21 @@ end
     model = MLJFlux.NeuralNetworkRegressor(; alpha=0, lambda=0.3, optimiser)
     chain = MLJFlux.regularized_optimiser(model, 1)
     @test chain isa Optimisers.OptimiserChain{
-        Tuple{Optimisers.WeightDecay, Optimisers.Momentum}
+        <:Tuple{Optimisers.WeightDecay, Optimisers.Momentum}
     }
 
     # alpha = 1:
     model = MLJFlux.NeuralNetworkRegressor(; alpha=1, lambda=0.3, optimiser)
     chain = MLJFlux.regularized_optimiser(model, 1)
     @test chain isa Optimisers.OptimiserChain{
-        Tuple{Optimisers.SignDecay, Optimisers.Momentum}
+        <:Tuple{Optimisers.SignDecay, Optimisers.Momentum}
     }
 
     # general case:
     model = MLJFlux.NeuralNetworkRegressor(; alpha=0.4, lambda=0.3, optimiser)
     chain = MLJFlux.regularized_optimiser(model, 1)
     @test chain isa Optimisers.OptimiserChain{
-        Tuple{Optimisers.SignDecay, Optimisers.WeightDecay, Optimisers.Momentum}
+        <:Tuple{Optimisers.SignDecay, Optimisers.WeightDecay, Optimisers.Momentum}
     }
 end
 
@@ -133,8 +133,8 @@ mutable struct LisasBuilder
   n1::Int
 end
 
-# UndefVarError accepts two inputs from julia > v"1.9"
-_UndefVarError(var, scope) = @static if VERSION < v"1.10"
+# UndefVarError accepts two inputs from julia > v"1.10"
+_UndefVarError(var, scope) = @static if VERSION < v"1.11"
     UndefVarError(var)
 else
     UndefVarError(var, scope)