Skip to content

Commit d1d6548

Browse files
Vaibhavdixit02Vaibhavdixit02
authored
Merge pull request #583 from SciML/Vaibhavdixit02-patch-3
Update extensions to not load packages directly only through Optimization
2 parents 5ec6da7 + 1ca1eb6 commit d1d6548

9 files changed

+29
-29
lines changed

‎ext/OptimizationEnzymeExt.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module OptimizationEnzymeExt
22

3-
import SciMLBase: OptimizationFunction
4-
import Optimization, ArrayInterface
5-
import LinearAlgebra: I
6-
import ADTypes: AutoEnzyme
3+
import Optimization, Optimization.ArrayInterface
4+
import Optimization.SciMLBase: OptimizationFunction
5+
import Optimization.LinearAlgebra: I
6+
import Optimization.ADTypes: AutoEnzyme
77
isdefined(Base, :get_extension) ? (using Enzyme) : (using ..Enzyme)
88

99
function Optimization.instantiate_function(f::OptimizationFunction{true}, x,

‎ext/OptimizationFiniteDiffExt.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module OptimizationFiniteDiffExt
22

3-
import SciMLBase: OptimizationFunction
4-
import Optimization, ArrayInterface
5-
import ADTypes: AutoFiniteDiff
6-
using LinearAlgebra
3+
import Optimization, Optimization.ArrayInterface
4+
import Optimization.SciMLBase: OptimizationFunction
5+
import Optimization.ADTypes: AutoFiniteDiff
6+
using Optimization.LinearAlgebra
77
isdefined(Base, :get_extension) ? (using FiniteDiff) : (using ..FiniteDiff)
88

99
const FD = FiniteDiff

‎ext/OptimizationForwardDiffExt.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module OptimizationForwardDiffExt
22

3-
import SciMLBase: OptimizationFunction
4-
import Optimization, ArrayInterface
5-
import ADTypes: AutoForwardDiff
3+
import Optimization, Optimization.ArrayInterface
4+
import Optimization.SciMLBase: OptimizationFunction
5+
import Optimization.ADTypes: AutoForwardDiff
66
isdefined(Base, :get_extension) ? (using ForwardDiff) : (using ..ForwardDiff)
77

88
function default_chunk_size(len)

‎ext/OptimizationMTKExt.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module OptimizationMTKExt
22

3-
import SciMLBase
4-
import SciMLBase: OptimizationFunction
5-
import Optimization, ArrayInterface
6-
import ADTypes: AutoModelingToolkit
3+
import Optimization, Optimization.ArrayInterface
4+
import Optimization.SciMLBase
5+
import Optimization.SciMLBase: OptimizationFunction
6+
import Optimization.ADTypes: AutoModelingToolkit
77
isdefined(Base, :get_extension) ? (using ModelingToolkit) : (using ..ModelingToolkit)
88

99
function Optimization.instantiate_function(f, x, adtype::AutoModelingToolkit, p,

‎ext/OptimizationReverseDiffExt.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module OptimizationReverseDiffExt
22

3-
import SciMLBase: OptimizationFunction
43
import Optimization
5-
import ADTypes: AutoReverseDiff
4+
import Optimization.SciMLBase: OptimizationFunction
5+
import Optimization.ADTypes: AutoReverseDiff
66
isdefined(Base, :get_extension) ? (using ReverseDiff, ReverseDiff.ForwardDiff) :
77
(using ..ReverseDiff, ..ReverseDiff.ForwardDiff)
88

‎ext/OptimizationSparseFiniteDiffExt.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module OptimizationSparseFiniteDiffExt
22

3-
import SciMLBase: OptimizationFunction
4-
import Optimization, ArrayInterface
5-
import ADTypes: AutoSparseFiniteDiff
3+
import Optimization, Optimization.ArrayInterface
4+
import Optimization.SciMLBase: OptimizationFunction
5+
import Optimization.ADTypes: AutoSparseFiniteDiff
66
import Symbolics
7-
using LinearAlgebra
7+
using Optimization.LinearAlgebra
88
isdefined(Base, :get_extension) ? (using FiniteDiff, SparseDiffTools) :
99
(using ..FiniteDiff, ..SparseDiffTools)
1010

‎ext/OptimizationSparseForwardDiffExt.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module OptimizationSparseForwardDiffExt
22

3-
import SciMLBase: OptimizationFunction
4-
import Optimization, ArrayInterface
5-
import ADTypes: AutoSparseForwardDiff
3+
import Optimization, Optimization.ArrayInterface
4+
import Optimization.SciMLBase: OptimizationFunction
5+
import Optimization.ADTypes: AutoSparseForwardDiff
66
import Symbolics
7-
using LinearAlgebra
7+
using Optimization.LinearAlgebra
88
isdefined(Base, :get_extension) ? (using ForwardDiff, SparseDiffTools) :
99
(using ..ForwardDiff, ..SparseDiffTools)
1010

‎ext/OptimizationTrackerExt.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module OptimizationTrackerExt
22

3-
import SciMLBase: OptimizationFunction
43
import Optimization
5-
import ADTypes: AutoTracker
4+
import Optimization.SciMLBase: OptimizationFunction
5+
import Optimization.ADTypes: AutoTracker
66
isdefined(Base, :get_extension) ? (using Tracker) : (using ..Tracker)
77

88
function Optimization.instantiate_function(f, x, adtype::AutoTracker, p,

‎ext/OptimizationZygoteExt.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module OptimizationZygoteExt
22

3-
import SciMLBase: OptimizationFunction
43
import Optimization
5-
import ADTypes: AutoZygote
4+
import Optimization.SciMLBase: OptimizationFunction
5+
import Optimization.ADTypes: AutoZygote
66
isdefined(Base, :get_extension) ? (using Zygote, Zygote.ForwardDiff) :
77
(using ..Zygote, ..Zygote.ForwardDiff)
88

0 commit comments

Comments
 (0)