Merge pull request #301 from lcontento/flux016

Test fixes for Flux 0.16

Author: ablaom

Project.toml

@@ -1,7 +1,7 @@
 name = "MLJFlux"
 uuid = "094fc8d1-fd35-5302-93ea-dabda2abf845"
 authors = ["Anthony D. Blaom <anthony.blaom@gmail.com>", "Ayush Shridhar <ayush.shridhar1999@gmail.com>"]
-version = "0.6.3"
+version = "0.6.4"
 
 [deps]
 CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"

src/mlj_embedder_interface.jl

@@ -32,16 +32,16 @@ end
 # 8. Extra metadata
 MMI.metadata_pkg(
     EntityEmbedder,
-    package_name = "MLJTransforms",
-    package_uuid = "23777cdb-d90c-4eb0-a694-7c2b83d5c1d6",
-    package_url = "https://github.com/JuliaAI/MLJTransforms.jl",
+    package_name = "MLJFlux",
+    package_uuid = "094fc8d1-fd35-5302-93ea-dabda2abf845",
+    package_url = "https://github.com/FluxML/MLJFlux.jl",
     is_pure_julia = true,
     is_wrapper = true
 )
 
 MMI.metadata_model(
     EntityEmbedder,
-    load_path = "MLJTransforms.EntityEmbedder",
+    load_path = "MLJFlux.EntityEmbedder",
 )
 
 MMI.target_in_fit(::Type{<:EntityEmbedder}) = true
@@ -153,4 +153,4 @@ Xnew
 See also
 [`NeuralNetworkClassifier`, `NeuralNetworkRegressor`](@ref)
 """
-EntityEmbedder
+EntityEmbedder

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)