Skip to content

Commit 812b5bd

Browse files
committed
Move SymbolicUtils.jl into extension
1 parent 7532e21 commit 812b5bd

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
1919
[weakdeps]
2020
SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
2121

22+
[extensions]
23+
DynamicExpressionsSymbolicUtilsExt = "SymbolicUtils"
24+
2225
[compat]
2326
Compat = "3.37, 4"
2427
LoopVectorization = "0.12"
Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
module InterfaceSymbolicUtilsModule
2-
31
using SymbolicUtils
4-
import ..EquationModule: Node, DEFAULT_NODE_TYPE
5-
import ..OperatorEnumModule: AbstractOperatorEnum
6-
import ..UtilsModule: isgood, isbad, @return_on_false
2+
if isdefined(Base, :get_extension)
3+
import ..DynamicExpressions.EquationModule: Node, DEFAULT_NODE_TYPE
4+
import ..DynamicExpressions.OperatorEnumModule: AbstractOperatorEnum
5+
import ..DynamicExpressions.UtilsModule: isgood, isbad, @return_on_false
6+
else
7+
import .EquationModule: Node, DEFAULT_NODE_TYPE
8+
import .OperatorEnumModule: AbstractOperatorEnum
9+
import .UtilsModule: isgood, isbad, @return_on_false
10+
end
711

812
const SYMBOLIC_UTILS_TYPES = Union{<:Number,SymbolicUtils.Symbolic{<:Number}}
913

@@ -254,5 +258,3 @@ function multiply_powers(
254258
return cumulator, true
255259
end
256260
end
257-
258-
end

src/DynamicExpressions.jl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ include("EvaluationHelpers.jl")
1010
include("SimplifyEquation.jl")
1111
include("OperatorEnumConstruction.jl")
1212

13-
using Requires
13+
if !isdefined(Base, :get_extension)
14+
using Requires
15+
end
1416
using Reexport
1517
@reexport import .EquationModule:
1618
Node, string_tree, print_tree, copy_node, set_node!, tree_mapreduce, filter_map
@@ -34,9 +36,11 @@ using Reexport
3436
@reexport import .EvaluationHelpersModule
3537

3638
function __init__()
37-
@require SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b" @eval begin
38-
include("InterfaceSymbolicUtils.jl")
39-
@reexport import .InterfaceSymbolicUtilsModule: node_to_symbolic, symbolic_to_node
39+
@static if !isdefined(Base, :get_extension)
40+
@require SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b" begin
41+
include("../ext/DynamicExpressionsSymbolicUtilsExt.jl")
42+
export node_to_symbolic, symbolic_to_node
43+
end
4044
end
4145
end
4246

0 commit comments

Comments
 (0)