Merge branch 'master' into compathelper/new_version/2024-05-29-01-06-39-039-00781124978

Author: MilesCranmer

.github/workflows/CI.yml

@@ -61,8 +61,8 @@ jobs:
           path-to-lcov: lcov.info
           flag-name: julia-${{ matrix.julia-version }}-${{ matrix.os }}-main-${{ github.event_name }}
 
-  integration_tests:
-    name: Integration test - ${{ matrix.test_name }} - ${{ matrix.os }}
+  additional_tests:
+    name: test ${{ matrix.test_name }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     strategy:
@@ -74,6 +74,7 @@ jobs:
           - "1"
         test_name:
           - "enzyme"
+          - "jet"
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
@@ -100,7 +101,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - test
-      - integration_tests
+      - additional_tests
     steps:
       - name: Finish
         uses: coverallsapp/github-action@v2

Project.toml

@@ -1,11 +1,12 @@
 name = "DynamicExpressions"
 uuid = "a40a106e-89c9-4ca8-8020-a735e8728b6b"
 authors = ["MilesCranmer <miles.cranmer@gmail.com>"]
-version = "0.17.0"
+version = "0.18.0-alpha.1"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
+DispatchDoctor = "8d63f2c5-f18a-4cf2-ba9d-b3f60fc568c8"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
 PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
@@ -28,11 +29,10 @@ DynamicExpressionsSymbolicUtilsExt = "SymbolicUtils"
 DynamicExpressionsZygoteExt = "Zygote"
 
 [compat]
-Aqua = "0.7"
 Bumper = "0.6"
 ChainRulesCore = "1"
 Compat = "3.37, 4"
-Enzyme = "^0.11.12"
+DispatchDoctor = "0.4"
 LoopVectorization = "0.12"
 MacroTools = "0.4, 0.5"
 Optim = "0.19, 1"
@@ -44,20 +44,8 @@ Zygote = "0.6"
 julia = "1.6"
 
 [extras]
-Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 Bumper = "8ce10254-0962-460f-a3d8-1f77fea1446e"
-Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
-ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
-LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
 Optim = "429524aa-4258-5aef-a3af-852621145aeb"
-SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
-SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
-StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
-Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
-
-[targets]
-test = ["Test", "SafeTestsets", "Aqua", "Bumper", "Enzyme", "ForwardDiff", "LinearAlgebra", "LoopVectorization", "Optim", "SpecialFunctions", "StaticArrays", "Suppressor", "SymbolicUtils", "Zygote"]

README.md

@@ -30,8 +30,8 @@ using DynamicExpressions
 
 operators = OperatorEnum(; binary_operators=[+, -, *], unary_operators=[cos])
 
-x1 = Node(; feature=1)
-x2 = Node(; feature=2)
+x1 = Node{Float64}(feature=1)
+x2 = Node{Float64}(feature=2)
 
 expression = x1 * cos(x2 - 3.2)
 

src/ChainRules.jl

@@ -38,10 +38,10 @@ function ChainRulesCore.rrule(
         dtree = let X = X, dY = dY, tree = tree, operators = operators
             @thunk(
                 let
-                    _, gradient, complete = eval_grad_tree_array(
+                    _, gradient, complete2 = eval_grad_tree_array(
                         tree, X, operators; variable=Val(false)
                     )
-                    if !complete
+                    if !complete2
                         gradient .= NaN
                     end
 
@@ -55,14 +55,14 @@ function ChainRulesCore.rrule(
         dX = let X = X, dY = dY, tree = tree, operators = operators
             @thunk(
                 let
-                    _, gradient, complete = eval_grad_tree_array(
+                    _, gradient2, complete3 = eval_grad_tree_array(
                         tree, X, operators; variable=Val(true)
                     )
-                    if !complete
-                        gradient .= NaN
+                    if !complete3
+                        gradient2 .= NaN
                     end
 
-                    gradient .* reshape(dY, 1, length(dY))
+                    gradient2 .* reshape(dY, 1, length(dY))
                 end
             )
         end

src/DynamicExpressions.jl

@@ -1,21 +1,29 @@
 module DynamicExpressions
 
-include("Utils.jl")
-include("ExtensionInterface.jl")
-include("OperatorEnum.jl")
-include("Node.jl")
-include("NodeUtils.jl")
-include("Strings.jl")
-include("Evaluate.jl")
-include("EvaluateDerivative.jl")
-include("ChainRules.jl")
-include("EvaluationHelpers.jl")
-include("Simplify.jl")
-include("OperatorEnumConstruction.jl")
-include("Random.jl")
+using DispatchDoctor: @stable, @unstable
+
+@stable default_mode = "disable" begin
+    include("Utils.jl")
+    include("ExtensionInterface.jl")
+    include("OperatorEnum.jl")
+    include("Node.jl")
+    include("NodeUtils.jl")
+    include("Strings.jl")
+    include("Evaluate.jl")
+    include("EvaluateDerivative.jl")
+    include("ChainRules.jl")
+    include("EvaluationHelpers.jl")
+    include("Simplify.jl")
+    include("OperatorEnumConstruction.jl")
+    include("Random.jl")
+    include("Expression.jl")
+    include("Parse.jl")
+end
 
 import PackageExtensionCompat: @require_extensions
 import Reexport: @reexport
+macro ignore(args...) end
+
 @reexport import .NodeModule:
     AbstractNode,
     AbstractExpressionNode,
@@ -26,7 +34,16 @@ import Reexport: @reexport
     tree_mapreduce,
     filter_map,
     filter_map!
-import .NodeModule: constructorof, preserve_sharing
+import .NodeModule:
+    constructorof,
+    with_type_parameters,
+    preserve_sharing,
+    leaf_copy,
+    branch_copy,
+    leaf_hash,
+    branch_hash,
+    leaf_equal,
+    branch_equal
 @reexport import .NodeUtilsModule:
     count_nodes,
     count_constants,
@@ -48,6 +65,11 @@ import .NodeModule: constructorof, preserve_sharing
 @reexport import .EvaluationHelpersModule
 @reexport import .ExtensionInterfaceModule: node_to_symbolic, symbolic_to_node
 @reexport import .RandomModule: NodeSampler
+@reexport import .ExpressionModule: AbstractExpression, Expression
+# Not for export; just for overloading
+import .ExpressionModule: get_tree, get_operators, get_variable_names, Metadata
+@reexport import .ParseModule: @parse_expression, parse_expression
+import .ParseModule: parse_leaf
 
 function __init__()
     @require_extensions
@@ -57,16 +79,22 @@ include("deprecated.jl")
 
 import TOML: parsefile
 
-const PACKAGE_VERSION = let
-    project = parsefile(joinpath(pkgdir(@__MODULE__), "Project.toml"))
-    VersionNumber(project["version"])
+const PACKAGE_VERSION = let d = pkgdir(@__MODULE__)
+    try
+        if d isa String
+            project = parsefile(joinpath(d, "Project.toml"))
+            VersionNumber(project["version"])
+        else
+            v"0.0.0"
+        end
+    catch
+        v"0.0.0"
+    end
 end
 
-macro ignore(args...) end
 # To get LanguageServer to register library within tests
 @ignore include("../test/runtests.jl")
 
 include("precompile.jl")
 do_precompilation(; mode=:precompile)
-
 end

src/Evaluate.jl

@@ -1,5 +1,7 @@
 module EvaluateModule
 
+using DispatchDoctor: @unstable
+
 import ..NodeModule: AbstractExpressionNode, constructorof
 import ..StringsModule: string_tree
 import ..OperatorEnumModule: OperatorEnum, GenericOperatorEnum
@@ -657,7 +659,7 @@ function eval(current_node)
     A `false` complete means an operator was called on input types
     that it was not defined for.
 """
-function eval_tree_array(
+@unstable function eval_tree_array(
     tree::AbstractExpressionNode,
     cX::AbstractArray,
     operators::GenericOperatorEnum;
@@ -680,7 +682,7 @@ function eval_tree_array(
     end
 end
 
-function _eval_tree_array_generic(
+@unstable function _eval_tree_array_generic(
     tree::AbstractExpressionNode{T1},
     cX::AbstractArray{T2,N},
     operators::GenericOperatorEnum,
@@ -707,7 +709,7 @@ function _eval_tree_array_generic(
     end
 end
 
-function deg1_eval_generic(
+@unstable function deg1_eval_generic(
     tree, cX, op::F, operators::GenericOperatorEnum, ::Val{throw_errors}
 ) where {F,throw_errors}
     left, complete = eval_tree_array(tree.l, cX, operators)
@@ -716,7 +718,7 @@ function deg1_eval_generic(
     return op(left), true
 end
 
-function deg2_eval_generic(
+@unstable function deg2_eval_generic(
     tree, cX, op::F, operators::GenericOperatorEnum, ::Val{throw_errors}
 ) where {F,throw_errors}
     left, complete = eval_tree_array(tree.l, cX, operators)

src/EvaluateDerivative.jl

@@ -80,7 +80,9 @@ end
         end
     end
     deg2_branch = if nbin > OPERATOR_LIMIT_BEFORE_SLOWDOWN
-        diff_deg2_eval(tree, cX, operators.binops[op_idx], operators, direction)
+        quote
+            diff_deg2_eval(tree, cX, operators.binops[op_idx], operators, direction)
+        end
     else
         quote
             Base.Cartesian.@nif(