fix: stop reexporting Lux

SciML · Aug 20, 2024 · 7c8d9a1 · 7c8d9a1
1 parent 3f0ace0
commit 7c8d9a1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/Project.toml b/Project.toml
@@ -13,7 +13,6 @@ LuxCore = "bb33d45b-7691-41d6-9220-0943567d0623"
 LuxLib = "82251201-b29d-42c6-8e01-566dec8acb11"
 NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 WeightInitializers = "d49dbf32-c5c2-4618-8acc-27bb2598ef2d"
 
 [compat]
@@ -26,6 +25,5 @@ LuxCore = "0.1.21"
 LuxLib = "0.3.40"
 NNlib = "0.9.21"
 Random = "1.10"
-Reexport = "1.2.2"
 WeightInitializers = "1"
 julia = "1.10"
diff --git a/src/NeuralOperators.jl b/src/NeuralOperators.jl
@@ -9,12 +9,9 @@ using LuxCore: LuxCore, AbstractExplicitLayer, AbstractExplicitContainerLayer
 using LuxLib: batched_matmul
 using NNlib: NNlib, batched_adjoint
 using Random: Random, AbstractRNG
-using Reexport: @reexport
 
 const CRC = ChainRulesCore
 
-@reexport using Lux
-
 include("utils.jl")
 include("transform.jl")
 

diff --git a/test/layers_tests.jl b/test/layers_tests.jl
@@ -14,7 +14,7 @@
         @testset "$(op) $(length(setup.m))D: permuted = $(setup.permuted)" for setup in setups,
             op in opconv
 
-            p = Lux.__unwrap_val(setup.permuted)
+            p = Lux.Utils.unwrap_val(setup.permuted)
             in_chs = ifelse(p, setup.x_size[end - 1], first(setup.x_size))
             out_chs = ifelse(p, setup.y_size[end - 1], first(setup.y_size))
             ch = 64 => out_chs

diff --git a/test/qa_tests.jl b/test/qa_tests.jl
@@ -1,8 +1,8 @@
 @testitem "doctests: Quality Assurance" tags=[:qa] begin
     using Documenter, NeuralOperators
 
-    DocMeta.setdocmeta!(
-        NeuralOperators, :DocTestSetup, :(using NeuralOperators, Random); recursive=true)
+    DocMeta.setdocmeta!(NeuralOperators, :DocTestSetup,
+        :(using Lux, NeuralOperators, Random); recursive=true)
     doctest(NeuralOperators; manual=false)
 end
 
@@ -14,7 +14,7 @@ end
 end
 
 @testitem "Explicit Imports: Quality Assurance" tags=[:qa] begin
-    using ExplicitImports
+    using ExplicitImports, Lux
 
     # Skip our own packages
     @test check_no_implicit_imports(NeuralOperators; skip=(Base, Core, Lux)) === nothing