fix errors

Author: prbzrg

examples/usage.jl

@@ -55,7 +55,7 @@ model = ICNFModel(
     optimizers = (Adam(),),
     adtype = AutoZygote(),
     batchsize = 512,
-    sol_kwargs = (; progress = true, epochs = 300), # pass to the solver
+    sol_kwargs = (; epochs = 300), # pass to the solver
 )
 mach = machine(model, df)
 fit!(mach)

src/exts/mlj_ext/core.jl

@@ -22,13 +22,7 @@ function make_dataloader(
     ::Int,
     data::Tuple,
 )
-    return MLUtils.DataLoader(
-        data;
-        batchsize = -1,
-        shuffle = true,
-        partial = true,
-        rng = icnf.rng,
-    )
+    return MLUtils.DataLoader(data; batchsize = -1, shuffle = true, partial = true)
 end
 
 function make_dataloader(
@@ -45,6 +39,5 @@ function make_dataloader(
         end,
         shuffle = true,
         partial = true,
-        rng = icnf.rng,
     )
 end

test/Project.toml

@@ -10,15 +10,13 @@ Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
 ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
-Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Lux = "b2108857-7c20-44ae-9111-449ecde12c47"
 LuxCore = "bb33d45b-7691-41d6-9220-0943567d0623"
 MLDataDevices = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40"
 MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
 OrdinaryDiffEqDefault = "50262376-6c5a-4cf5-baba-aaf4f84d72d7"
 SciMLSensitivity = "1ed8b502-d754-442c-8d5d-10ac956f44a1"
 StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
-TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
@@ -34,15 +32,13 @@ Enzyme = "0.13"
 ExplicitImports = "1"
 ForwardDiff = "1"
 JET = "0.9, 0.10"
-Logging = "1"
 Lux = "1"
 LuxCore = "1"
 MLDataDevices = "1"
 MLJBase = "1"
 OrdinaryDiffEqDefault = "1"
 SciMLSensitivity = "7"
 StableRNGs = "1"
-TerminalLoggers = "0.1"
 Test = "1"
 Zygote = "0.7"
 julia = "1.10"

test/ci_tests/regression_tests.jl

@@ -35,7 +35,7 @@ Test.@testset verbose = true showtiming = true failfast = false "Regression Test
     model = ContinuousNormalizingFlows.ICNFModel(
         icnf;
         batchsize = 0,
-        sol_kwargs = (; progress = true, epochs = 300),
+        sol_kwargs = (; epochs = 300),
     )
 
     mach = MLJBase.machine(model, df)

test/ci_tests/smoke_tests.jl

@@ -207,7 +207,6 @@ Test.@testset verbose = true showtiming = true failfast = false "Smoke Tests" be
 
         Test.@testset verbose = true showtiming = true failfast = false "$adtype on loss" for adtype in
                                                                                               adtypes
-
             Test.@test !isnothing(DifferentiationInterface.gradient(diff_loss, adtype, ps)) broken =
                 compute_mode.adback isa ADTypes.AutoEnzyme{<:Enzyme.ForwardMode} && (
                     omode isa ContinuousNormalizingFlows.TrainMode || (
@@ -228,7 +227,7 @@ Test.@testset verbose = true showtiming = true failfast = false "Smoke Tests" be
                     icnf;
                     adtype,
                     batchsize = 0,
-                    sol_kwargs = (; progress = true, epochs = 2),
+                    sol_kwargs = (; epochs = 2),
                 )
                 mach = MLJBase.machine(model, (df, df2))
 
@@ -249,7 +248,7 @@ Test.@testset verbose = true showtiming = true failfast = false "Smoke Tests" be
                     icnf;
                     adtype,
                     batchsize = 0,
-                    sol_kwargs = (; progress = true, epochs = 2),
+                    sol_kwargs = (; epochs = 2),
                 )
                 mach = MLJBase.machine(model, df)
 

test/runtests.jl

@@ -9,28 +9,19 @@ import ADTypes,
     ExplicitImports,
     ForwardDiff,
     JET,
-    Logging,
     Lux,
     LuxCore,
     MLDataDevices,
     MLJBase,
     OrdinaryDiffEqDefault,
     SciMLSensitivity,
     StableRNGs,
-    TerminalLoggers,
     Test,
     Zygote,
     ContinuousNormalizingFlows
 
 GROUP = get(ENV, "GROUP", "All")
 
-if GROUP == "All"
-    GC.enable_logging(true)
-
-    debuglogger = TerminalLoggers.TerminalLogger(stderr, Logging.Debug)
-    Logging.global_logger(debuglogger)
-end
-
 Test.@testset verbose = true showtiming = true failfast = false "Overall" begin
     if GROUP == "All" || GROUP in ["SmokeXOut", "SmokeXIn", "SmokeXYOut", "SmokeXYIn"]
         include(joinpath("ci_tests", "smoke_tests.jl"))