Skip to content

Commit 9dc3119

Browse files
Merge pull request #887 from ven-k/vkb/ext-requires
fix: correct the Requires usage to fix issues with PackageCompiler sysimages
2 parents 79efd5a + 080ed85 commit 9dc3119

8 files changed

+68
-25
lines changed

ext/DiffEqBaseGeneralizedGeneratedExt.jl

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

3-
using DiffEqBase
4-
isdefined(Base, :get_extension) ? (using GeneralizedGenerated) :
5-
(using ..GeneralizedGenerated)
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
using GeneralizedGenerated
6+
else
7+
using ..DiffEqBase
8+
using ..GeneralizedGenerated
9+
end
610

711
function SciMLBase.numargs(::GeneralizedGenerated.RuntimeFn{Args}) where {Args}
812
GeneralizedGenerated.from_type(Args) |> length

ext/DiffEqBaseMPIExt.jl

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

3-
import DiffEqBase
4-
isdefined(Base, :get_extension) ? (import MPI) : (import ..MPI)
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
import MPI
6+
else
7+
using ..DiffEqBase
8+
import ..MPI
9+
end
510

611
if isdefined(MPI, :AbstractMultiRequest)
712
function DiffEqBase.anyeltypedual(::Type{T},

ext/DiffEqBaseMeasurementsExt.jl

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

3-
using DiffEqBase
4-
import DiffEqBase: value
5-
isdefined(Base, :get_extension) ? (using Measurements) : (using ..Measurements)
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
import DiffEqBase: value
6+
using Measurements
7+
else
8+
using ..DiffEqBase
9+
import ..DiffEqBase: value
10+
using ..Measurements
11+
end
612

713
function DiffEqBase.promote_u0(u0::AbstractArray{<:Measurements.Measurement},
814
p::AbstractArray{<:Measurements.Measurement}, t0)

ext/DiffEqBaseMonteCarloMeasurementsExt.jl

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

3-
using DiffEqBase
4-
import DiffEqBase: value
5-
isdefined(Base, :get_extension) ? (using MonteCarloMeasurements) :
6-
(using ..MonteCarloMeasurements)
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
import DiffEqBase: value
6+
using MonteCarloMeasurements
7+
else
8+
using ..DiffEqBase
9+
import ..DiffEqBase: value
10+
using ..MonteCarloMeasurements
11+
end
712

813
function DiffEqBase.promote_u0(u0::AbstractArray{
914
<:MonteCarloMeasurements.AbstractParticles,

ext/DiffEqBaseReverseDiffExt.jl

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

3-
using DiffEqBase
4-
import DiffEqBase: value
5-
isdefined(Base, :get_extension) ? (import ReverseDiff) : (import ..ReverseDiff)
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
import DiffEqBase: value
6+
import ReverseDiff
7+
else
8+
using ..DiffEqBase
9+
import ..DiffEqBase: value
10+
import ..ReverseDiff
11+
end
612

713
DiffEqBase.value(x::Type{ReverseDiff.TrackedReal{V, D, O}}) where {V, D, O} = V
814
function DiffEqBase.value(x::Type{

ext/DiffEqBaseTrackerExt.jl

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

3-
using DiffEqBase
4-
import DiffEqBase: value
5-
isdefined(Base, :get_extension) ? (import Tracker) : (import ..Tracker)
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
import DiffEqBase: value
6+
import Tracker
7+
else
8+
using ..DiffEqBase
9+
import ..DiffEqBase: value
10+
import ..Tracker
11+
end
612

713
DiffEqBase.value(x::Type{Tracker.TrackedReal{T}}) where {T} = T
814
DiffEqBase.value(x::Type{Tracker.TrackedArray{T, N, A}}) where {T, N, A} = Array{T, N}

ext/DiffEqBaseUnitfulExt.jl

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

3-
using DiffEqBase
4-
import DiffEqBase: value
5-
isdefined(Base, :get_extension) ? (using Unitful) : (using ..Unitful)
6-
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
import DiffEqBase: value
6+
using Unitful
7+
else
8+
using ..DiffEqBase
9+
import ..DiffEqBase: value
10+
using ..Unitful
11+
end
712
# Support adaptive errors should be errorless for exponentiation
813
value(x::Type{Unitful.AbstractQuantity{T, D, U}}) where {T, D, U} = T
914
value(x::Unitful.AbstractQuantity) = x.val

ext/DiffEqBaseZygoteExt.jl

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

3-
using DiffEqBase
4-
import DiffEqBase: value
5-
isdefined(Base, :get_extension) ? (import Zygote) : (import ..Zygote)
3+
if isdefined(Base, :get_extension)
4+
using DiffEqBase
5+
import DiffEqBase: value
6+
import Zygote
7+
else
8+
using ..DiffEqBase
9+
import ..DiffEqBase: value
10+
import ..Zygote
11+
end
612

713
function ∇tmap(cx, f, args...)
814
ys_and_backs = SciMLBase.tmap((args...) -> Zygote._pullback(cx, f, args...), args...)

0 commit comments

Comments
 (0)