Merge pull request #9 from alan-turing-institute/dev

For a 0.1.2 release
JuliaAI · Feb 4, 2020 · b2033e4 · b2033e4
2 parents 2812db0 + 22e7f3c
commit b2033e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MLJTuning"
 uuid = "03970b2e-30c4-11ea-3135-d1576263f10f"
 authors = ["Anthony D. Blaom <[email protected]>"]
-version = "0.1.1"
+version = "0.1.2"
 
 [deps]
 ComputationalResources = "ed09eef8-17a6-5b46-8889-db040fac31e3"

diff --git a/test/learning_curves.jl b/test/learning_curves.jl
@@ -26,19 +26,15 @@ y = 2*x1 .+ 5*x2 .- 3*x3 .+ 0.2*rand(100);
     r_lambda = range(ensemble, :(atom.lambda),
                      lower=0.0001, upper=0.1, scale=:log10)
 
-    # Something wrong with @test_logs in julia 1.1.1 and
-    # 1.0.5. Getting "Internal error: encountered unexpected error in
-    # runtime: MethodError(f=typeof(Core.Compiler.fieldindex)(),
-    # args=(MLJTuning.DeterministicTunedModel{T, M, R} where R,
-    # :acceleration, false), world=0x0000000000000eb9)"
-    if accel == CPU1() && VERSION > v"1.2"
-            curve = @test_logs((:info, r"No measure"),
-                               (:info, r"Training"),
-                               learning_curve(mach; range=r_lambda,
-                                               acceleration=accel))
+    if accel == CPU1()
+        curve = @test_logs((:info, r"No measure"),
+                           (:info, r"Training"),
+                           (:info, r"Attempting"),
+                           learning_curve(mach; range=r_lambda,
+                                          acceleration=accel))
     else
         curve = learning_curve(mach; range=r_lambda,
-                                acceleration=accel)
+                               acceleration=accel)
     end
     @test curve isa NamedTuple{(:parameter_name,
                                 :parameter_scale,