From a31de09f7b18691588d7ed67cd59422b4290a3eb Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Thu, 21 Sep 2023 14:45:08 +1200 Subject: [PATCH 1/4] get rid of test/Project.toml --- Project.toml | 11 +++++++++++ test/Project.toml | 14 -------------- 2 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 test/Project.toml diff --git a/Project.toml b/Project.toml index c3d2b15..b33bfc5 100644 --- a/Project.toml +++ b/Project.toml @@ -13,3 +13,14 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" IterationControl = "0.5" MLJBase = "0.20, 0.21" julia = "1.6" + +[extras] +JLSO = "9da8a3cd-07a3-59c0-a743-3fdc52c30d11" +MLJModelInterface = "e80e1ace-859a-464e-9ed9-23947d8ae3ea" +StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3" +Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["JLSO", "MLJModelInterface", "StableRNGs", "Statistics", "Test"] + diff --git a/test/Project.toml b/test/Project.toml deleted file mode 100644 index eec0b36..0000000 --- a/test/Project.toml +++ /dev/null @@ -1,14 +0,0 @@ -[deps] -IterationControl = "b3c1a2ee-3fec-4384-bf48-272ea71de57c" -JLSO = "9da8a3cd-07a3-59c0-a743-3fdc52c30d11" -MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d" -MLJModelInterface = "e80e1ace-859a-464e-9ed9-23947d8ae3ea" -Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" -StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3" -Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[compat] -MLJModelInterface = "1.3" -StableRNGs = "1.0" From 0bef379c8ff26013a0ad842720fd8ebdf2016e10 Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Thu, 21 Sep 2023 15:16:28 +1200 Subject: [PATCH 2/4] adapt tests broken by migration of measures to StatisticalMeasures.jl --- Project.toml | 4 ++-- test/constructors.jl | 1 + test/controls.jl | 3 ++- test/core.jl | 3 ++- test/ic_model.jl | 1 + test/traits.jl | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index b33bfc5..8c4af85 100644 --- a/Project.toml +++ b/Project.toml @@ -18,9 +18,9 @@ julia = "1.6" JLSO = "9da8a3cd-07a3-59c0-a743-3fdc52c30d11" MLJModelInterface = "e80e1ace-859a-464e-9ed9-23947d8ae3ea" StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3" +StatisticalMeasures = "a19d573c-0a75-4610-95b3-7071388c7541" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["JLSO", "MLJModelInterface", "StableRNGs", "Statistics", "Test"] - +test = ["JLSO", "MLJModelInterface", "StableRNGs", "StatisticalMeasures", "Statistics", "Test"] diff --git a/test/constructors.jl b/test/constructors.jl index 790dc41..833f6cf 100644 --- a/test/constructors.jl +++ b/test/constructors.jl @@ -4,6 +4,7 @@ using MLJIteration using MLJBase using ..DummyModel using Test +using StatisticalMeasures struct Foo <: MLJBase.Unsupervised end struct Bar <: MLJBase.Deterministic end diff --git a/test/controls.jl b/test/controls.jl index 0bed8fb..0bc7a8f 100644 --- a/test/controls.jl +++ b/test/controls.jl @@ -7,6 +7,7 @@ using ..DummyModel using JLSO using Serialization using IterationControl +using StatisticalMeasures const IC = IterationControl @@ -62,7 +63,7 @@ end resampler = MLJBase.Resampler(model=DummyIterativeModel(n=0), resampling=Holdout(), - measure=[MLJBase.mae, MLJBase.rms]) + measure=[mae, rms]) @testset "WithEvaluationDo" begin v = Any[] diff --git a/test/core.jl b/test/core.jl index 94c097e..4e75ead 100644 --- a/test/core.jl +++ b/test/core.jl @@ -5,6 +5,7 @@ using MLJIteration using IterationControl using MLJBase using MLJModelInterface +using StatisticalMeasures using ..DummyModel X, y = make_dummy(N=20) @@ -133,7 +134,7 @@ end mach = machine(imodel, X, y) @test_logs((:info, r"Training"), (:info, MLJIteration.info_unspecified_iteration_parameter(:n)), - (:info, MLJIteration.info_unspecified_measure(rms)), + (:info, MLJIteration.info_unspecified_measure(l2)), (:info, r"final loss"), (:info, r"final train"), (:info, r"Stop"), diff --git a/test/ic_model.jl b/test/ic_model.jl index dc0629c..c0a29cf 100644 --- a/test/ic_model.jl +++ b/test/ic_model.jl @@ -4,6 +4,7 @@ using Test using MLJIteration using MLJBase using IterationControl +using StatisticalMeasures using ..DummyModel X, y = make_dummy(N=20) diff --git a/test/traits.jl b/test/traits.jl index de679b9..b63f03f 100644 --- a/test/traits.jl +++ b/test/traits.jl @@ -4,6 +4,7 @@ using MLJBase using Test using MLJIteration using ..DummyModel +using StatisticalMeasures model = DummyIterativeModel() imodel = IteratedModel(model=model, measure=mae) From e9772c3da5a7e0c5c55d57ea2c4d677c49434c65 Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Tue, 26 Sep 2023 09:23:40 +1300 Subject: [PATCH 3/4] bump [compat] MLJBase = "1" --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 8c4af85..8a1dbae 100644 --- a/Project.toml +++ b/Project.toml @@ -11,7 +11,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" [compat] IterationControl = "0.5" -MLJBase = "0.20, 0.21" +MLJBase = "1" julia = "1.6" [extras] From f93e85c29f869447c5ca508d011d348559c538ce Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Tue, 26 Sep 2023 09:24:25 +1300 Subject: [PATCH 4/4] bump 0.6.0 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 8a1dbae..797cac5 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MLJIteration" uuid = "614be32b-d00c-4edb-bd02-1eb411ab5e55" authors = ["Anthony D. Blaom "] -version = "0.5.1" +version = "0.6.0" [deps] IterationControl = "b3c1a2ee-3fec-4384-bf48-272ea71de57c"