Merge branch 'dev' of https://github.com/josephsdavid/MLJFlux.jl into…

… josephsdavid-dev
FluxML · Aug 19, 2022 · ab5c3e1 · ab5c3e1
2 parents f86654a + ccbed5e
commit ab5c3e1
Show file tree

Hide file tree

Showing 5 changed files with 699 additions and 73 deletions.
diff --git a/src/MLJFlux.jl b/src/MLJFlux.jl
@@ -1,4 +1,4 @@
-module MLJFlux 
+module MLJFlux
 
 export CUDALibs, CPU1
 
@@ -14,6 +14,8 @@ using ColorTypes
 using ComputationalResources
 using Random
 
+const MMI=MLJModelInterface
+
 include("penalizers.jl")
 include("core.jl")
 include("builders.jl")
@@ -24,7 +26,7 @@ include("image.jl")
 include("mlj_model_interface.jl")
 
 ### Package specific model traits:
-MLJModelInterface.metadata_pkg.((NeuralNetworkRegressor,
+MMI.metadata_pkg.((NeuralNetworkRegressor,
                                  MultitargetNeuralNetworkRegressor,
                                  NeuralNetworkClassifier,
                                  ImageClassifier),
@@ -37,4 +39,6 @@ MLJModelInterface.metadata_pkg.((NeuralNetworkRegressor,
 export NeuralNetworkRegressor, MultitargetNeuralNetworkRegressor
 export NeuralNetworkClassifier, ImageClassifier
 
+
+
 end #module
diff --git a/src/classifier.jl b/src/classifier.jl
@@ -31,8 +31,4 @@ end
 MLJModelInterface.metadata_model(NeuralNetworkClassifier,
                                  input=Table(Continuous),
                                  target=AbstractVector{<:Finite},
-                                 path="MLJFlux.NeuralNetworkClassifier",
-                                 descr="A neural network model for making "*
-                                 "probabilistic predictions of a "*
-                                 "`Multiclass` or `OrderedFactor` target, "*
-                                 "given a table of `Continuous` features. ")
+                                 path="MLJFlux.NeuralNetworkClassifier")
diff --git a/src/image.jl b/src/image.jl
@@ -29,7 +29,4 @@ end
 MLJModelInterface.metadata_model(ImageClassifier,
                input=AbstractVector{<:MLJModelInterface.Image},
                target=AbstractVector{<:Multiclass},
-               path="MLJFlux.ImageClassifier",
-               descr="A neural network model for making probabilistic "*
-                     "predictions of a `GrayImage` target, "*
-                     "given a table of `Continuous` features. ")
+               path="MLJFlux.ImageClassifier")
diff --git a/src/regressor.jl b/src/regressor.jl
@@ -23,11 +23,7 @@ end
 MLJModelInterface.metadata_model(NeuralNetworkRegressor,
                input=Table(Continuous),
                target=AbstractVector{<:Continuous},
-               path="MLJFlux.NeuralNetworkRegressor",
-               descr="A neural network model for making "*
-                     "deterministic predictions of a "*
-                     "`Continuous` target, given a table of "*
-                     "`Continuous` features. ")
+               path="MLJFlux.NeuralNetworkRegressor")
 
 
 # # MULTITARGET NEURAL NETWORK REGRESSOR
@@ -59,9 +55,4 @@ end
 MLJModelInterface.metadata_model(MultitargetNeuralNetworkRegressor,
                input=Table(Continuous),
                target=Table(Continuous),
-               path="MLJFlux.MultitargetNeuralNetworkRegressor",
-               descr = "A neural network model for making "*
-                       "deterministic predictions of a "*
-                       "`Continuous` multi-target, presented "*
-                       "as a table, given a table of "*
-                       "`Continuous` features. ")
+               path="MLJFlux.MultitargetNeuralNetworkRegressor")