From 0b43c2b3712def4e28b1f01521a52112a710e62f Mon Sep 17 00:00:00 2001 From: Vaibhav Kumar Dixit Date: Wed, 15 Jan 2025 23:21:23 -0500 Subject: [PATCH 1/3] Update runtests.jl in OptimizationOptimisers --- lib/OptimizationOptimisers/test/runtests.jl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/OptimizationOptimisers/test/runtests.jl b/lib/OptimizationOptimisers/test/runtests.jl index 953db8960..32e6219b2 100644 --- a/lib/OptimizationOptimisers/test/runtests.jl +++ b/lib/OptimizationOptimisers/test/runtests.jl @@ -74,7 +74,7 @@ end @testset "Minibatching" begin using Optimization, OptimizationOptimisers, Lux, Zygote, MLUtils, Random, - ComponentArrays + ComponentArrays, Printf x = rand(Float32, 10000) y = sin.(x) @@ -87,7 +87,7 @@ end smodel = StatefulLuxLayer{true}(model, nothing, st) function callback(state, l) - state.iter % 25 == 1 && @show "Iteration: %5d, Loss: %.6e\n" state.iter l + state.iter % 25 == 1 && @printf "Iteration: %5d, Loss: %.6e\n" state.iter l return l < 1e-4 end @@ -101,7 +101,6 @@ end res = Optimization.solve(prob, Optimisers.Adam(), epochs = 50) - @test res.objective < 1e-4 @test res.stats.iterations == 50*length(data) @test res.stats.fevals == 50*length(data) @test res.stats.gevals == 50*length(data) From 4792dc9e5cf05b4f5f3e1a947d7737b1862c25be Mon Sep 17 00:00:00 2001 From: Vaibhav Kumar Dixit Date: Thu, 16 Jan 2025 07:01:16 -0500 Subject: [PATCH 2/3] Update lib/OptimizationOptimisers/test/runtests.jl --- lib/OptimizationOptimisers/test/runtests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/OptimizationOptimisers/test/runtests.jl b/lib/OptimizationOptimisers/test/runtests.jl index 32e6219b2..5cf973423 100644 --- a/lib/OptimizationOptimisers/test/runtests.jl +++ b/lib/OptimizationOptimisers/test/runtests.jl @@ -87,7 +87,7 @@ end smodel = StatefulLuxLayer{true}(model, nothing, st) function callback(state, l) - state.iter % 25 == 1 && @printf "Iteration: %5d, Loss: %.6e\n" state.iter l + state.iter % 25 == 1 && Printf.@printf "Iteration: %5d, Loss: %.6e\n" state.iter l return l < 1e-4 end From 6c75ddd541b86303f6638384aa02cc94be9ccae4 Mon Sep 17 00:00:00 2001 From: Vaibhav Kumar Dixit Date: Thu, 16 Jan 2025 07:30:44 -0500 Subject: [PATCH 3/3] Update runtests.jl --- lib/OptimizationOptimisers/test/runtests.jl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/OptimizationOptimisers/test/runtests.jl b/lib/OptimizationOptimisers/test/runtests.jl index 5cf973423..2ee4c9b6c 100644 --- a/lib/OptimizationOptimisers/test/runtests.jl +++ b/lib/OptimizationOptimisers/test/runtests.jl @@ -1,6 +1,7 @@ using OptimizationOptimisers, ForwardDiff, Optimization using Test using Zygote +using Lux, MLUtils, Random, ComponentArrays, Printf, MLDataDevices @testset "OptimizationOptimisers.jl" begin rosenbrock(x, p) = (p[1] - x[1])^2 + p[2] * (x[2] - x[1]^2)^2 @@ -73,9 +74,6 @@ using Zygote end @testset "Minibatching" begin - using Optimization, OptimizationOptimisers, Lux, Zygote, MLUtils, Random, - ComponentArrays, Printf - x = rand(Float32, 10000) y = sin.(x) data = MLUtils.DataLoader((x, y), batchsize = 100) @@ -109,7 +107,6 @@ end @test res.objective < 1e-4 - using MLDataDevices data = CPUDevice()(data) optf = OptimizationFunction(loss, AutoZygote()) prob = OptimizationProblem(optf, ps_ca, data)