From 8fb676a76022b7928d31ae6d61de79ae2384fb4a Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Thu, 7 Jul 2022 16:46:03 +1200 Subject: [PATCH 1/4] update bigtest example because of some issue resolutions --- examples/bigtest/notebook.jl | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/examples/bigtest/notebook.jl b/examples/bigtest/notebook.jl index b4e09d6..db9b9ae 100644 --- a/examples/bigtest/notebook.jl +++ b/examples/bigtest/notebook.jl @@ -67,12 +67,11 @@ known_problems = models() do model (name = "DecisionTreeClassifier", package_name="BetaML"), (name="RandomForestClassifier", package_name="BetaML"), + #https://github.com/JuliaAI/MLJLinearModels.jl/issues/123 + (name= "MultinomialClassifier", package_name="MLJLinearModels"), + # https://github.com/alan-turing-institute/MLJ.jl/issues/939 (name = "NuSVC", package_name="LIBSVM"), - (name="SVMNuClassifier", package_name="ScikitLearn"), - (name="LinearSVC", package_name="LIBSVM"), - (name= "MultinomialClassifier", package_name="MLJLinearModels"), - (name="SVMLinearClassifier", package_name="ScikitLearn"), ] end @@ -95,6 +94,3 @@ fails2 |> DataFrame #- report2 |> DataFrame - - - From 547c7769a85106bfd3e4cb8d95405cc3bda5f03f Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Thu, 14 Jul 2022 17:58:58 +1200 Subject: [PATCH 2/4] add report(mach) and fitted_params(mach) calls to fitted_machine attemptor --- examples/bigtest/Manifest.toml | 212 ++++++++++++++++++--------------- examples/bigtest/Project.toml | 2 + src/attemptors.jl | 3 + 3 files changed, 121 insertions(+), 96 deletions(-) diff --git a/examples/bigtest/Manifest.toml b/examples/bigtest/Manifest.toml index 45c8e83..51b01ea 100644 --- a/examples/bigtest/Manifest.toml +++ b/examples/bigtest/Manifest.toml @@ -11,9 +11,9 @@ version = "1.4.1" [[deps.AbstractFFTs]] deps = ["ChainRulesCore", "LinearAlgebra"] -git-tree-sha1 = "6f1d9bc1c08f9f4a8fa92e3ea3cb50153a1b40d4" +git-tree-sha1 = "69f7020bd72f069c219b5e8c236c1fa90d2cb409" uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" -version = "1.1.0" +version = "1.2.1" [[deps.AbstractTrees]] git-tree-sha1 = "03e0550477d86222521d254b741d470ba17ea0b5" @@ -49,9 +49,9 @@ version = "5.0.8" [[deps.ArrayInterfaceCore]] deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "d0f59ebfe8d3ea2799fb3fb88742d69978e5843e" +git-tree-sha1 = "7d255eb1d2e409335835dc8624c35d97453011eb" uuid = "30b0a656-2188-435a-8636-2ec0e6a096e2" -version = "0.1.10" +version = "0.1.14" [[deps.Artifacts]] uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" @@ -119,9 +119,9 @@ version = "0.9.11" [[deps.CUDA]] deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "SpecialFunctions", "TimerOutputs"] -git-tree-sha1 = "925a16b909fdae16920c1319feadecffb6695b9d" +git-tree-sha1 = "e4e5ece72fa2f108fb20c3c5538a5fa9ef3d668a" uuid = "052768ef-5323-5732-b1bb-66c8b64840ba" -version = "3.10.1" +version = "3.11.0" [[deps.Calculus]] deps = ["LinearAlgebra"] @@ -136,22 +136,22 @@ uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597" version = "0.10.6" [[deps.CategoricalDistributions]] -deps = ["CategoricalArrays", "Distributions", "Missings", "OrderedCollections", "Random", "ScientificTypesBase", "UnicodePlots"] -git-tree-sha1 = "8c340dc71d2dc9177b1f701726d08d2255d2d811" +deps = ["CategoricalArrays", "Distributions", "Missings", "OrderedCollections", "Random", "ScientificTypes", "UnicodePlots"] +git-tree-sha1 = "8b35ae165075f95415b15ff6f3c31e879affe977" uuid = "af321ab8-2d2e-40a6-b165-3d674595d28e" -version = "0.1.5" +version = "0.1.7" [[deps.ChainRules]] -deps = ["ChainRulesCore", "Compat", "IrrationalConstants", "LinearAlgebra", "Random", "RealDot", "SparseArrays", "Statistics"] -git-tree-sha1 = "34e265b1b0049896430625ce1638b2719c783c6b" +deps = ["ChainRulesCore", "Compat", "Distributed", "IrrationalConstants", "LinearAlgebra", "Random", "RealDot", "SparseArrays", "Statistics"] +git-tree-sha1 = "cc81c5c6bab557f89e4b5951b252d7ab863639a4" uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "1.35.2" +version = "1.37.0" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "9489214b993cd42d17f44c36e359bf6a7c919abf" +git-tree-sha1 = "2dd813e5f2f7eec2d1268c57cf2373d3ee91fcea" uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "1.15.0" +version = "1.15.1" [[deps.ChangesOfVariables]] deps = ["ChainRulesCore", "LinearAlgebra", "Test"] @@ -171,11 +171,17 @@ git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da" uuid = "944b1d66-785c-5afd-91f1-9de20f533193" version = "0.7.0" +[[deps.ColorSchemes]] +deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Random"] +git-tree-sha1 = "1fd869cc3875b57347f7027521f561cf46d1fcd8" +uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" +version = "3.19.0" + [[deps.ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "0f4e115f6f34bbe43c19751c90a38b2f380637b9" +git-tree-sha1 = "eb7f0f8307f71fac7c606984ea5fb2817275d6e4" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.11.3" +version = "0.11.4" [[deps.ColorVectorSpace]] deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"] @@ -223,15 +229,14 @@ version = "1.7.0" [[deps.ConstructionBase]] deps = ["LinearAlgebra"] -git-tree-sha1 = "f74e9d5388b8620b4cee35d4c5a618dd4dc547f4" +git-tree-sha1 = "59d00b3139a9de4eb961057eabb65ac6522be954" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" -version = "1.3.0" +version = "1.4.0" [[deps.Contour]] -deps = ["StaticArrays"] -git-tree-sha1 = "9f02045d934dc030edad45944ea80dbd1f0ebea7" +git-tree-sha1 = "a599cfb8b1909b0f97c5e1b923ab92e1c0406076" uuid = "d38c429a-6771-53c6-b99e-75d170b6e991" -version = "0.5.7" +version = "0.6.1" [[deps.CorpusLoaders]] deps = ["CSV", "DataDeps", "Glob", "InternedStrings", "LightXML", "MultiResolutionIterators", "StringEncodings", "WordTokenizers"] @@ -277,10 +282,10 @@ deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" [[deps.DecisionTree]] -deps = ["AbstractTrees", "DelimitedFiles", "Distributed", "LinearAlgebra", "Random", "ScikitLearnBase", "Statistics", "Test"] -git-tree-sha1 = "bace9f3e644fb2cf4cc839f2cf5c45a4b68f0801" +deps = ["AbstractTrees", "DelimitedFiles", "LinearAlgebra", "Random", "ScikitLearnBase", "Statistics"] +git-tree-sha1 = "9aa42c2c742079495c244bf7e63746bccbc8bd7b" uuid = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb" -version = "0.10.12" +version = "0.11.1" [[deps.DelimitedFiles]] deps = ["Mmap"] @@ -316,9 +321,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[deps.Distributions]] deps = ["ChainRulesCore", "DensityInterface", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns", "Test"] -git-tree-sha1 = "0ec161f87bf4ab164ff96dfacf4be8ffff2375fd" +git-tree-sha1 = "429077fd74119f5ac495857fd51f4120baf36355" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.25.62" +version = "0.25.65" [[deps.DocStringExtensions]] deps = ["LibGit2"] @@ -361,9 +366,9 @@ version = "0.1.8" [[deps.FFTW]] deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"] -git-tree-sha1 = "505876577b5481e50d089c1c68899dfb6faebc62" +git-tree-sha1 = "90630efff0894f8142308e334473eba54c433549" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.4.6" +version = "1.5.0" [[deps.FFTW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -393,10 +398,10 @@ uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" version = "0.12.8" [[deps.FiniteDiff]] -deps = ["ArrayInterfaceCore", "LinearAlgebra", "Requires", "SparseArrays", "StaticArrays"] -git-tree-sha1 = "a0700c21266b55bf62c22e75af5668aa7841b500" +deps = ["ArrayInterfaceCore", "LinearAlgebra", "Requires", "Setfield", "SparseArrays", "StaticArrays"] +git-tree-sha1 = "cb8c5f0074153ace28ce5100714df4378ad885e0" uuid = "6a86dc24-6348-571c-b903-95158fe2bd41" -version = "2.12.1" +version = "2.14.0" [[deps.FixedPointNumbers]] deps = ["Statistics"] @@ -462,16 +467,22 @@ uuid = "38e38edf-8417-5370-95a0-9cbb8c7f171a" version = "1.8.0" [[deps.GPUArrays]] -deps = ["Adapt", "LLVM", "LinearAlgebra", "Printf", "Random", "Serialization", "Statistics"] -git-tree-sha1 = "c783e8883028bf26fb05ed4022c450ef44edd875" +deps = ["Adapt", "GPUArraysCore", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "Serialization", "Statistics"] +git-tree-sha1 = "470dcaf29237a0818bc2cc97f0c408f0bc052653" uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" -version = "8.3.2" +version = "8.4.1" + +[[deps.GPUArraysCore]] +deps = ["Adapt"] +git-tree-sha1 = "4078d3557ab15dd9fe6a0cf6f65e3d4937e98427" +uuid = "46192b85-c4d5-4398-a991-12ede77f4527" +version = "0.1.0" [[deps.GPUCompiler]] deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "TimerOutputs", "UUIDs"] -git-tree-sha1 = "d8c5999631e1dc18d767883f621639c838f8e632" +git-tree-sha1 = "47f63159f7cb5d0e5e0cfd2f20454adea429bec9" uuid = "61eb1bfa-7361-4325-ad38-22787b887f55" -version = "0.15.2" +version = "0.16.1" [[deps.GeometryBasics]] deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] @@ -509,10 +520,10 @@ uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" version = "0.9.17" [[deps.HypergeometricFunctions]] -deps = ["DualNumbers", "LinearAlgebra", "SpecialFunctions", "Test"] -git-tree-sha1 = "cb7099a0109939f16a4d3b572ba8396b1f6c7c31" +deps = ["DualNumbers", "LinearAlgebra", "OpenLibm_jll", "SpecialFunctions", "Test"] +git-tree-sha1 = "709d864e3ed6e3545230601f94e11ebc65994641" uuid = "34004b35-14d8-5ef3-9330-4cdb6864b03a" -version = "0.3.10" +version = "0.3.11" [[deps.IRTools]] deps = ["InteractiveUtils", "MacroTools", "Test"] @@ -532,9 +543,9 @@ version = "0.5.1" [[deps.InlineStrings]] deps = ["Parsers"] -git-tree-sha1 = "61feba885fac3a407465726d0c330b3055df897f" +git-tree-sha1 = "d19f9edd8c34760dca2de2b503f969d8700ed288" uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48" -version = "1.1.2" +version = "1.1.4" [[deps.IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] @@ -720,9 +731,9 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[deps.LinearMaps]] deps = ["LinearAlgebra", "SparseArrays", "Statistics"] -git-tree-sha1 = "9e9c3fa4de0b4f146d97eed3485711928789865b" +git-tree-sha1 = "d1b46faefb7c2f48fdec69e6f3cc34857769bc15" uuid = "7a12625a-238d-50fd-b39a-03d52299707e" -version = "3.6.2" +version = "3.8.0" [[deps.LogExpFunctions]] deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"] @@ -753,17 +764,15 @@ version = "2022.0.0+0" [[deps.MLJ]] deps = ["CategoricalArrays", "ComputationalResources", "Distributed", "Distributions", "LinearAlgebra", "MLJBase", "MLJEnsembles", "MLJIteration", "MLJModels", "MLJTuning", "OpenML", "Pkg", "ProgressMeter", "Random", "ScientificTypes", "Statistics", "StatsBase", "Tables"] -git-tree-sha1 = "fba4aaf41e614fb03ce5aee8b08b0bb66b4e9b67" +git-tree-sha1 = "19609e3e1479f419e4077ffba91f9af480c5c015" uuid = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7" -version = "0.18.2" +version = "0.18.3" [[deps.MLJBase]] deps = ["CategoricalArrays", "CategoricalDistributions", "ComputationalResources", "Dates", "DelimitedFiles", "Distributed", "Distributions", "InteractiveUtils", "InvertedIndices", "LinearAlgebra", "LossFunctions", "MLJModelInterface", "Missings", "OrderedCollections", "Parameters", "PrettyTables", "ProgressMeter", "Random", "ScientificTypes", "Serialization", "StatisticalTraits", "Statistics", "StatsBase", "Tables"] -git-tree-sha1 = "6ddcfc397fc589114d6a9008d6c2311b818cec3e" -repo-rev = "stack_cache_and_acceleration_rebased" -repo-url = "https://github.com/JuliaAI/MLJBase.jl" +git-tree-sha1 = "4cb023df79484b751c86175f128fa46084448d82" uuid = "a7f614a8-145f-11e9-1d2a-a57a1082229d" -version = "0.20.5" +version = "0.20.11" [[deps.MLJClusteringInterface]] deps = ["Clustering", "Distances", "MLJModelInterface"] @@ -773,9 +782,9 @@ version = "0.1.4" [[deps.MLJDecisionTreeInterface]] deps = ["DecisionTree", "MLJModelInterface", "Random", "Tables"] -git-tree-sha1 = "fb5a1e6f7314c68b785d7ea3b1fbfa2751386295" +git-tree-sha1 = "b80765e390f2ab9aa451cf0c67a0c6b72058a0ed" uuid = "c6f25543-311c-4c74-83dc-3ea6d1015661" -version = "0.2.2" +version = "0.2.3" [[deps.MLJEnsembles]] deps = ["CategoricalArrays", "CategoricalDistributions", "ComputationalResources", "Distributed", "Distributions", "MLJBase", "MLJModelInterface", "ProgressMeter", "Random", "ScientificTypesBase", "StatsBase"] @@ -791,9 +800,9 @@ version = "0.2.7" [[deps.MLJGLMInterface]] deps = ["Distributions", "GLM", "MLJModelInterface", "Tables"] -git-tree-sha1 = "3220b8002a451d2c9e55e61e9ebe6d6850568051" +git-tree-sha1 = "dd24688271c39996e3a605184299175d8587fc38" uuid = "caf8df21-4939-456d-ac9c-5fefbfb04c0c" -version = "0.3.1" +version = "0.3.3" [[deps.MLJIteration]] deps = ["IterationControl", "MLJBase", "Random", "Serialization"] @@ -815,9 +824,9 @@ version = "0.6.3" [[deps.MLJModelInterface]] deps = ["Random", "ScientificTypesBase", "StatisticalTraits"] -git-tree-sha1 = "74d7fb54c306af241c5f9d4816b735cb4051e125" +git-tree-sha1 = "900345c2f9a473f18e79370d7bf41faba49808b7" uuid = "e80e1ace-859a-464e-9ed9-23947d8ae3ea" -version = "1.4.2" +version = "1.5.1" [[deps.MLJModels]] deps = ["CategoricalArrays", "CategoricalDistributions", "Dates", "Distances", "Distributions", "InteractiveUtils", "LinearAlgebra", "MLJModelInterface", "Markdown", "OrderedCollections", "Parameters", "Pkg", "PrettyPrinting", "REPL", "Random", "ScientificTypes", "StatisticalTraits", "Statistics", "StatsBase", "Tables"] @@ -827,9 +836,9 @@ version = "0.15.9" [[deps.MLJMultivariateStatsInterface]] deps = ["Distances", "LinearAlgebra", "MLJModelInterface", "MultivariateStats", "StatsBase"] -git-tree-sha1 = "19ec8774dcb42ff12e49b30f62f912b2710ec239" +git-tree-sha1 = "0c8a6c63a41b674e302b25bf6e20d5c4c6ecd075" uuid = "1b6a4a23-ba22-4f51-9698-8599985d3728" -version = "0.3.1" +version = "0.3.2" [[deps.MLJNaiveBayesInterface]] deps = ["LogExpFunctions", "MLJModelInterface", "NaiveBayes"] @@ -850,10 +859,10 @@ uuid = "7fa162e1-0e29-41ca-a6fa-c000ca4e7e7e" version = "0.1.4" [[deps.MLJTestIntegration]] -deps = ["MLJ", "MLJBase", "MLJTuning", "NearestNeighborModels", "Pkg", "Test"] -path = "/Users/anthony/MLJ/MLJTestIntegration" +deps = ["MLJ", "NearestNeighborModels", "Pkg", "Test"] +git-tree-sha1 = "de8b51636f05ee6c326cac893c5f185a1e982d18" uuid = "697918b4-fdc1-4f9e-8ff9-929724cee270" -version = "0.1.0" +version = "0.2.0" [[deps.MLJText]] deps = ["CorpusLoaders", "MLJModelInterface", "ScientificTypes", "ScientificTypesBase", "SparseArrays", "Statistics", "TextAnalysis"] @@ -863,9 +872,9 @@ version = "0.2.0" [[deps.MLJTuning]] deps = ["ComputationalResources", "Distributed", "Distributions", "LatinHypercubeSampling", "MLJBase", "ProgressMeter", "Random", "RecipesBase"] -git-tree-sha1 = "b61910708c28d783f214bbab33c887dcc6f7958a" +git-tree-sha1 = "e1d0220d8bf5c17270cef41835ed57f88d63579d" uuid = "03970b2e-30c4-11ea-3135-d1576263f10f" -version = "0.7.1" +version = "0.7.2" [[deps.MLJXGBoostInterface]] deps = ["MLJModelInterface", "SparseArrays", "Tables", "XGBoost"] @@ -890,10 +899,10 @@ deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[deps.MbedTLS]] -deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"] -git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe" +deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"] +git-tree-sha1 = "891d3b4e8f8415f53108b4918d0183e61e18015b" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "1.0.3" +version = "1.1.0" [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] @@ -937,9 +946,9 @@ version = "7.8.2" [[deps.NNlib]] deps = ["Adapt", "ChainRulesCore", "LinearAlgebra", "Pkg", "Requires", "Statistics"] -git-tree-sha1 = "a0331452b4cfd5e53ee2325376794aea47364d5a" +git-tree-sha1 = "1a80840bcdb73de345230328d49767ab115be6f2" uuid = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" -version = "0.8.7" +version = "0.8.8" [[deps.NNlibCUDA]] deps = ["CUDA", "LinearAlgebra", "NNlib", "Random", "Statistics"] @@ -966,9 +975,9 @@ version = "0.2.0" [[deps.NearestNeighbors]] deps = ["Distances", "StaticArrays"] -git-tree-sha1 = "ded92de95031d4a8c61dfb6ba9adb6f1d8016ddd" +git-tree-sha1 = "0e353ed734b1747fc20cd4cba0edd9ac027eff6a" uuid = "b8a86587-4115-5ab1-83bc-aa920d37bbce" -version = "0.4.10" +version = "0.4.11" [[deps.NetworkLayout]] deps = ["GeometryBasics", "LinearAlgebra", "Random", "Requires", "SparseArrays"] @@ -981,9 +990,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" [[deps.OffsetArrays]] deps = ["Adapt"] -git-tree-sha1 = "b4975062de00106132d0b01b5962c09f7db7d880" +git-tree-sha1 = "1ea784113a6aa054c5ebd95945fa5e52c2f378e7" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "1.12.5" +version = "1.12.7" [[deps.OneRule]] deps = ["CategoricalArrays", "MLJModelInterface", "Tables"] @@ -1007,9 +1016,9 @@ version = "0.2.0" [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "ab05aa4cc89736e95915b01e7279e61b1bfe33b8" +git-tree-sha1 = "e60321e3f2616584ff98f0a4f18d98ae6f89bbb3" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.14+0" +version = "1.1.17+0" [[deps.OpenSpecFun_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] @@ -1054,9 +1063,9 @@ version = "0.1.2" [[deps.PDMats]] deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"] -git-tree-sha1 = "3e32c8dbbbe1159a5057c80b8a463369a78dd8d8" +git-tree-sha1 = "cf494dca75a69712a72b80bc48f59dcf3dea63ec" uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" -version = "0.11.12" +version = "0.11.16" [[deps.ParallelKMeans]] deps = ["Distances", "MLJModelInterface", "Random", "StatsBase", "UnsafeArrays"] @@ -1072,9 +1081,9 @@ version = "0.12.3" [[deps.Parsers]] deps = ["Dates"] -git-tree-sha1 = "1285416549ccfcdf0c50d4997a94331e88d68413" +git-tree-sha1 = "0044b23da09b5608b4ecacb4e5e6c6332f833a7e" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "2.3.1" +version = "2.3.2" [[deps.PartialLeastSquaresRegressor]] deps = ["LinearAlgebra", "MLJModelInterface", "Random", "Statistics"] @@ -1236,6 +1245,12 @@ version = "1.3.13" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" +[[deps.Setfield]] +deps = ["ConstructionBase", "Future", "MacroTools", "Requires"] +git-tree-sha1 = "77172cadd2fdfa0c84c87e3a01215a4ca7723310" +uuid = "efcf1570-3423-57d1-acb7-fd33fddbac46" +version = "1.0.0" + [[deps.SharedArrays]] deps = ["Distributed", "Mmap", "Random", "Serialization"] uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" @@ -1272,9 +1287,9 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[deps.SpecialFunctions]] deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] -git-tree-sha1 = "a9e798cae4867e3a41cae2dd9eb60c047f1212db" +git-tree-sha1 = "d75bda01f8c31ebb72df80a46c88b25d1c79c56d" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "2.1.6" +version = "2.1.7" [[deps.StableRNGs]] deps = ["Random", "Test"] @@ -1289,16 +1304,21 @@ uuid = "aedffcd0-7271-4cad-89d0-dc628f76c6d3" version = "0.6.6" [[deps.StaticArrays]] -deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "2bbd9f2e40afd197a1379aef05e0d85dba649951" +deps = ["LinearAlgebra", "Random", "StaticArraysCore", "Statistics"] +git-tree-sha1 = "e972716025466461a3dc1588d9168334b71aafff" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.4.7" +version = "1.5.1" + +[[deps.StaticArraysCore]] +git-tree-sha1 = "66fe9eb253f910fe8cf161953880cfdaef01cdf0" +uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" +version = "1.0.1" [[deps.StatisticalTraits]] deps = ["ScientificTypesBase"] -git-tree-sha1 = "271a7fea12d319f23d55b785c51f6876aadb9ac0" +git-tree-sha1 = "823fb7e68f7a22cfd5dacc73b906dcea723ec807" uuid = "64bff920-2084-43da-a3e6-9bb72801c0c9" -version = "3.0.0" +version = "3.1.0" [[deps.Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -1312,9 +1332,9 @@ version = "1.2.2" [[deps.StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] -git-tree-sha1 = "8977b17906b0a1cc74ab2e3a05faa16cf08a8291" +git-tree-sha1 = "48598584bacbebf7d30e20880438ed1d24b7c7d6" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.16" +version = "0.33.18" [[deps.StatsFuns]] deps = ["ChainRulesCore", "HypergeometricFunctions", "InverseFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"] @@ -1342,9 +1362,9 @@ version = "0.3.5" [[deps.StructArrays]] deps = ["Adapt", "DataAPI", "StaticArrays", "Tables"] -git-tree-sha1 = "9abba8f8fb8458e9adf07c8a2377a070674a24f1" +git-tree-sha1 = "ec47fb6069c57f1cee2f67541bf8f23415146de7" uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" -version = "0.6.8" +version = "0.6.11" [[deps.SuiteSparse]] deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] @@ -1422,10 +1442,10 @@ version = "1.0.2" uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [[deps.UnicodePlots]] -deps = ["ColorTypes", "Contour", "Crayons", "Dates", "FileIO", "FreeTypeAbstraction", "LazyModules", "LinearAlgebra", "MarchingCubes", "NaNMath", "Printf", "SparseArrays", "StaticArrays", "StatsBase", "Unitful"] -git-tree-sha1 = "9e0309e1a1b40c2ee402264d8bee3bfee915c26b" +deps = ["ColorSchemes", "ColorTypes", "Contour", "Crayons", "Dates", "FileIO", "FreeTypeAbstraction", "LazyModules", "LinearAlgebra", "MarchingCubes", "NaNMath", "Printf", "SparseArrays", "StaticArrays", "StatsBase", "Unitful"] +git-tree-sha1 = "e8192bf70f28cf0e79ae9c215008e2f1464edbd6" uuid = "b8865327-cd53-5732-bb35-84acbb429228" -version = "2.12.2" +version = "3.0.3" [[deps.Unitful]] deps = ["ConstructionBase", "Dates", "LinearAlgebra", "Random"] @@ -1434,9 +1454,9 @@ uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" version = "1.11.0" [[deps.UnsafeArrays]] -git-tree-sha1 = "038cd6ae292c857e6f91be52b81236607627aacd" +git-tree-sha1 = "3350f94f6caa02f324a23645bf524fc9334c7488" uuid = "c4a57d5a-5b31-53a6-b365-19f8c011fbd6" -version = "1.0.3" +version = "1.0.4" [[deps.VersionParsing]] git-tree-sha1 = "58d6e80b4ee071f5efd07fda82cb9fbe17200868" @@ -1496,10 +1516,10 @@ uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" version = "1.5.2+0" [[deps.Zygote]] -deps = ["AbstractFFTs", "ChainRules", "ChainRulesCore", "DiffRules", "Distributed", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "MacroTools", "NaNMath", "Random", "Requires", "SparseArrays", "SpecialFunctions", "Statistics", "ZygoteRules"] -git-tree-sha1 = "a49267a2e5f113c7afe93843deea7461c0f6b206" +deps = ["AbstractFFTs", "ChainRules", "ChainRulesCore", "DiffRules", "Distributed", "FillArrays", "ForwardDiff", "IRTools", "InteractiveUtils", "LinearAlgebra", "LogExpFunctions", "MacroTools", "NaNMath", "Random", "Requires", "SparseArrays", "SpecialFunctions", "Statistics", "ZygoteRules"] +git-tree-sha1 = "3cfdb31b517eec4173584fba2b1aa65daad46e09" uuid = "e88e6eb3-aa80-5325-afca-941959d7151f" -version = "0.6.40" +version = "0.6.41" [[deps.ZygoteRules]] deps = ["MacroTools"] diff --git a/examples/bigtest/Project.toml b/examples/bigtest/Project.toml index ab749bf..4e6b3a8 100644 --- a/examples/bigtest/Project.toml +++ b/examples/bigtest/Project.toml @@ -12,6 +12,7 @@ MLJFlux = "094fc8d1-fd35-5302-93ea-dabda2abf845" MLJGLMInterface = "caf8df21-4939-456d-ac9c-5fefbfb04c0c" MLJLIBSVMInterface = "61c7150f-6c77-4bb1-949c-13197eac2a52" MLJLinearModels = "6ee0df7b-362f-4a72-a706-9e79364fb692" +MLJModelInterface = "e80e1ace-859a-464e-9ed9-23947d8ae3ea" MLJModels = "d491faf4-2d78-11e9-2867-c94bc002c0b7" MLJMultivariateStatsInterface = "1b6a4a23-ba22-4f51-9698-8599985d3728" MLJNaiveBayesInterface = "33e4bacb-b9e2-458e-9a13-5d9a90b235fa" @@ -28,6 +29,7 @@ OutlierDetectionPython = "2449c660-d36c-460e-a68b-92ab3c865b3e" ParallelKMeans = "42b8e9d4-006b-409a-8472-7f34b3fb58af" PartialLeastSquaresRegressor = "f4b1acfe-f311-436c-bb79-8483f53c17d5" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +StatisticalTraits = "64bff920-2084-43da-a3e6-9bb72801c0c9" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [extras] diff --git a/src/attemptors.jl b/src/attemptors.jl index f93bd0d..94379c5 100644 --- a/src/attemptors.jl +++ b/src/attemptors.jl @@ -91,6 +91,9 @@ function fitted_machine(model, data...; throw=false, verbosity=1) attempt(finalize(message, verbosity); throw) do mach = machine(model, data...) fit!(mach, verbosity=-1) + MLJ.report(mach) + MLJ.fitted_params(mach) + mach end end From 21f6a1bccbf049172997864b3707ba1214b2ec75 Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Thu, 14 Jul 2022 18:01:22 +1200 Subject: [PATCH 3/4] update docstring --- src/test.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test.jl b/src/test.jl index 5ffbdb4..4e3a225 100644 --- a/src/test.jl +++ b/src/test.jl @@ -118,7 +118,8 @@ that model are skipped. The following are applied to all models: - `:model_instance`: Create a default instance. -- `:fitted_machine`: Bind instance to data in a machine and `fit!` +- `:fitted_machine`: Bind instance to data in a machine and `fit!`. Call `report` and + `fitted_params` on the machine. - `:operations`: Call implemented operations, such as `predict` and `transform` From a029095974e10219dbae8530a810534fcfa9b140 Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Thu, 14 Jul 2022 18:21:00 +1200 Subject: [PATCH 4/4] bump 0.2.1 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 0823e89..26f5d8f 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MLJTestIntegration" uuid = "697918b4-fdc1-4f9e-8ff9-929724cee270" authors = ["Anthony D. Blaom "] -version = "0.2.0" +version = "0.2.1" [deps] MLJ = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7"