Merge pull request #54 from ChrisRackauckas-Claude/static-improvements-20260112-064852

Improve type stability in BSpline basis function evaluation

Author: ChrisRackauckas

.github/workflows/Tests.yml

@@ -35,6 +35,9 @@ jobs:
           - "ubuntu-latest"
           - "macos-latest"
           - "windows-latest"
+        exclude:
+          - group: QA
+            version: "pre"
     uses: "SciML/.github/.github/workflows/tests.yml@v1"
     with:
       julia-version: "${{ matrix.version }}"

Project.toml

@@ -17,12 +17,9 @@ DataInterpolationsNDSymbolicsExt = "Symbolics"
 
 [compat]
 Adapt = "4.3.0"
-Aqua = "0.8"
 DataInterpolations = "8"
 EllipsisNotation = "1.8.0"
-ExplicitImports = "1.14.0"
 ForwardDiff = "0"
-JET = "0.9, 0.10, 0.11.2"
 KernelAbstractions = "0.9.34"
 PrecompileTools = "1.0"
 Random = "1"
@@ -33,11 +30,8 @@ Test = "1"
 julia = "1"
 
 [extras]
-Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
-ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
-JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
@@ -46,4 +40,4 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua", "DataInterpolations", "ExplicitImports", "ForwardDiff", "JET", "Pkg", "Random", "SafeTestsets", "Symbolics", "Test", "SymbolicUtils"]
+test = ["DataInterpolations", "ForwardDiff", "Pkg", "Random", "SafeTestsets", "Symbolics", "Test", "SymbolicUtils"]

src/spline_utils.jl

@@ -63,40 +63,54 @@ end
 # The trailing zero is just a convenience for the algorithm and is removed in the output
 function get_basis_function_values(
         itp_dim::BSplineInterpolationDimension,
-        t::Number,
+        t::T_t,
         idx::Integer,
         derivative_order::Integer,
         multi_point_index::Nothing,
         dim_in::Integer
-    )
+    ) where {T_t <: Number}
     (; degree, knots_all) = itp_dim
-    T = promote_type(typeof(t), eltype(itp_dim.basis_function_eval))
+    T_eval = eltype(itp_dim.basis_function_eval)
+    # Use a concrete zero value for type stability
+    _zero = zero(promote_type(T_t, T_eval))
+    _one = one(promote_type(T_t, T_eval))
     degree_plus_1 = degree + 1
 
     if derivative_order > degree
-        return ntuple(_ -> zero(T), degree_plus_1)
+        return ntuple(_ -> _zero, degree_plus_1)
     end
 
     degree_plus_2 = degree + 2
 
     # Degree 0 basis function values
     basis_function_values = ntuple(
-        k -> (k == degree_plus_1) ? one(T) : zero(T),
+        k -> (k == degree_plus_1) ? _one : _zero,
         degree_plus_2
     )
 
     # Higher order basis function values
+    # Use a helper function to avoid capturing mutable variables in closures
+    basis_function_values = _compute_basis_function_values(
+        basis_function_values, knots_all, t, idx, degree, derivative_order, degree_plus_2
+    )
+
+    return basis_function_values[1:degree_plus_1]
+end
+
+# Helper function to avoid type instability from captured variables in closures
+function _compute_basis_function_values(
+        basis_function_values, knots_all, t, idx, degree, derivative_order, degree_plus_2
+    )
     for d in 1:degree
         deriv = d > degree - derivative_order
+        # Create a local copy for the closure to capture
+        bfv = basis_function_values
         basis_function_values = ntuple(
-            k -> cox_de_boor(
-                basis_function_values, knots_all, t, idx, degree, d, k, deriv
-            ),
+            k -> cox_de_boor(bfv, knots_all, t, idx, degree, d, k, deriv),
             degree_plus_2
         )
     end
-
-    return basis_function_values[1:degree_plus_1]
+    return basis_function_values
 end
 
 # Get the basis function values for one point in an

test/qa/Project.toml

@@ -0,0 +1,14 @@
+[deps]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
+DataInterpolationsND = "4f1ef021-621a-47a5-ac8a-95402a2d1ea8"
+ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
+JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[compat]
+Aqua = "0.8"
+DataInterpolationsND = "0.1"
+ExplicitImports = "1.14.0"
+JET = "0.9, 0.10, 0.11.2"
+SafeTestsets = "0.1"

test/aqua.jl test/qa/aqua.jltest/aqua.jl renamed to test/qa/aqua.jl

@@ -0,0 +1,5 @@
+using SafeTestsets
+
+@safetestset "Aqua" include("aqua.jl")
+@safetestset "ExplicitImports" include("explicit_imports.jl")
+@safetestset "JET" include("jet.jl")

test/explicit_imports.jl test/qa/explicit_imports.jltest/explicit_imports.jl renamed to test/qa/explicit_imports.jl

@@ -7,6 +7,12 @@ function activate_gpu_env()
     return Pkg.instantiate()
 end
 
+function activate_qa_env()
+    Pkg.activate("qa")
+    Pkg.develop(PackageSpec(path = dirname(@__DIR__)))
+    return Pkg.instantiate()
+end
+
 if GROUP == "All" || GROUP == "Core"
     @safetestset "Interpolations" include("test_interpolations.jl")
     @safetestset "Derivatives" include("test_derivatives.jl")
@@ -15,9 +21,8 @@ if GROUP == "All" || GROUP == "Core"
 elseif GROUP == "Extensions"
     @safetestset "Symbolics Extension" include("test_symbolics_ext.jl")
 elseif GROUP == "QA"
-    @safetestset "Aqua" include("aqua.jl")
-    @safetestset "ExplicitImports" include("explicit_imports.jl")
-    @safetestset "JET" include("jet.jl")
+    activate_qa_env()
+    include("qa/runtests.jl")
 elseif GROUP == "GPU"
     activate_gpu_env()
     # TODO: Add GPU tests