Merge pull request #499 from ChrisRackauckas-Claude/fix-ci-tests

Fix CI tests: disable Downgrade, move AllocCheck to QA

Author: ChrisRackauckas

.github/workflows/Downgrade.yml

@@ -12,6 +12,7 @@ on:
       - 'docs/**'
 jobs:
   test:
+    if: false  # Temporarily disabled - see https://github.com/SciML/DataInterpolations.jl/issues/498
     runs-on: ubuntu-latest
     strategy:
       matrix:

.github/workflows/Tests.yml

@@ -34,6 +34,10 @@ jobs:
           - Extensions
           - Misc
           - QA
+        exclude:
+          # AllocCheck doesn't work on pre-release Julia versions
+          - version: "pre"
+            group: QA
     uses: "SciML/.github/.github/workflows/tests.yml@v1"
     with:
       julia-version: "${{ matrix.version }}"

test/alloc_tests.jl

@@ -0,0 +1,95 @@
+using DataInterpolations
+using AllocCheck: @check_allocs
+using StaticArrays: SVector
+
+@check_allocs(test_allocs(itp, x) = itp(x)) # Reuse function definition to save on compilation time
+
+@testset "Allocation-free interpolation tests" begin
+    @testset "LinearInterpolation" begin
+        t = 1.0collect(1:10)
+        x = 1:10
+        y = 2:4
+        u_ = x' .* y
+        u = [u_[:, i] for i in 1:size(u_, 2)]
+        u_s = [convert(SVector{length(y), eltype(u_)}, i) for i in u]
+        A_s = LinearInterpolation(u_s, t; extrapolation = ExtrapolationType.Extension)
+        @test_nowarn test_allocs(A_s, 0)
+    end
+
+    @testset "QuadraticInterpolation" begin
+        t = [1.0, 2.0, 3.0, 4.0]
+        u_ = [1.0, 4.0, 9.0, 16.0]' .* ones(5)
+        u = [u_[:, i] for i in 1:size(u_, 2)]
+        u_s = [convert(SVector{length(u[1])}, i) for i in u]
+        A_s = QuadraticInterpolation(u_s, t; extrapolation = ExtrapolationType.Extension)
+        @test_nowarn test_allocs(A_s, 0)
+    end
+
+    @testset "ConstantInterpolation" begin
+        t = [1.0, 2.0, 3.0, 4.0]
+        u = [[1.0, 2.0], [0.0, 1.0], [1.0, 2.0], [0.0, 1.0]]
+        u_s = [convert(SVector{length(first(u))}, i) for i in u]
+        A_s = ConstantInterpolation(u_s, t; extrapolation = ExtrapolationType.Extension)
+        @test_nowarn test_allocs(A_s, 0)
+    end
+
+    @testset "SmoothedConstantInterpolation" begin
+        u = [0.0, 2.0, 1.0, 3.0]
+        t = [1.2, 2.5, 5.7, 8.7]
+        d_max = 0.5
+        u_ = u' .* ones(5)
+        uv = [u_[:, i] for i in 1:size(u_, 2)]
+        u_s = [convert(SVector{length(uv[1])}, i) for i in uv]
+        A_s = SmoothedConstantInterpolation(u_s, t; d_max)
+        @test_nowarn test_allocs(A_s, 1.9)
+    end
+
+    @testset "QuadraticSpline" begin
+        t = [-1.0, 0.0, 1.0]
+        u_ = [0.0, 1.0, 3.0]' .* ones(4)
+        u = [u_[:, i] for i in 1:size(u_, 2)]
+        u_s = [convert(SVector{length(u[1])}, i) for i in u]
+        A_s = QuadraticSpline(u_s, t; extrapolation = ExtrapolationType.Extension)
+        @test_nowarn test_allocs(A_s, 0.7)
+    end
+
+    @testset "CubicSpline" begin
+        t = [-1.0, 0.0, 1.0]
+        u_ = [0.0, 1.0, 3.0]' .* ones(4)
+        u = [u_[:, i] for i in 1:size(u_, 2)]
+        u_s = [convert(SVector{length(first(u))}, i) for i in u]
+        A_s = CubicSpline(u_s, t; extrapolation = ExtrapolationType.Extension)
+        @test_nowarn test_allocs(A_s, 0)
+    end
+
+    @testset "CubicHermiteSpline" begin
+        du = [-0.047, -0.058, 0.054, 0.012, -0.068, 0.0]
+        u = [14.7, 11.51, 10.41, 14.95, 12.24, 11.22]
+        t = [0.0, 62.25, 109.66, 162.66, 205.8, 252.3]
+        u2 = [[u[i], u[i] + 1] for i in eachindex(u)]
+        du2 = [[du[i], du[i]] for i in eachindex(du)]
+        u2_s = [convert(SVector{length(u2[1])}, i) for i in u2]
+        du2_s = [convert(SVector{length(du2[1])}, i) for i in du2]
+        A2_s = CubicHermiteSpline(
+            du2_s, u2_s, t; extrapolation = ExtrapolationType.Extension
+        )
+        @test_nowarn test_allocs(A2_s, 0.7)
+    end
+
+    @testset "QuinticHermiteSpline" begin
+        ddu = [0.0, -0.00033, 0.0051, -0.0067, 0.0029, 0.0]
+        du = [-0.047, -0.058, 0.054, 0.012, -0.068, 0.0]
+        u = [14.7, 11.51, 10.41, 14.95, 12.24, 11.22]
+        t = [0.0, 62.25, 109.66, 162.66, 205.8, 252.3]
+        u2 = [[u[i], u[i] + 1] for i in eachindex(u)]
+        du2 = [[du[i], du[i]] for i in eachindex(du)]
+        ddu2 = [[ddu[i], ddu[i]] for i in eachindex(ddu)]
+        u2_s = [convert(SVector{length(u2[1])}, i) for i in u2]
+        du2_s = [convert(SVector{length(du2[1])}, i) for i in du2]
+        ddu2_s = [convert(SVector{length(du2[1])}, i) for i in ddu2]
+        A2_s = QuinticHermiteSpline(
+            ddu2_s, du2_s, u2_s, t; extrapolation = ExtrapolationType.Extension
+        )
+        @test_nowarn test_allocs(A2_s, 0.7)
+    end
+end

test/interpolation_tests.jl

@@ -6,11 +6,8 @@ using BenchmarkTools
 using Unitful
 using LinearAlgebra
 using Symbolics
-using AllocCheck: @check_allocs
 using StaticArrays: SVector, @SVector
 
-@check_allocs(test_allocs(itp, x) = itp(x)) # Reuse function definition to save on compilation time
-
 function test_interpolation_type(T)
     @test T <: DataInterpolations.AbstractInterpolation
     @test hasfield(T, :u)
@@ -111,7 +108,6 @@ end
             @test A(x) == A_s(x)
         end
         @test A_s(0) isa SVector{length(y)}
-        @test_nowarn test_allocs(A_s, 0)
     end
 
     x = 1:10
@@ -380,7 +376,6 @@ end
         @test A(x) == A_s(x)
     end
     @test A_s(0) isa SVector{length(u[1])}
-    @test_nowarn test_allocs(A_s, 0)
 
     # Vector{Matrix} interpolation test
     u = [repeat(u[i], 1, 3) for i in 1:4]
@@ -643,7 +638,6 @@ end
             @test A(x) == A_s(x)
         end
         @test A_s(0) isa SVector{length(first(u))}
-        @test_nowarn test_allocs(A_s, 0)
     end
 
     @testset "Vector of Matrices case" for u in [
@@ -754,7 +748,6 @@ end
         @test A(x) == A_s(x)
     end
     @test A_s(1.9) isa SVector{length(uv[1])}
-    @test_nowarn test_allocs(A_s, 1.9)
     # Test Vector{Matrix} interpolation
     um = [repeat(uv[i], 1, 3) for i in 1:length(t)]
     A = SmoothedConstantInterpolation(um, t; d_max)
@@ -802,7 +795,6 @@ end
         @test A(x) == A_s(x)
     end
     @test A_s(0.7) isa SVector{length(u[1])}
-    @test_nowarn test_allocs(A_s, 0.7)
 
     # Test Vector{Matrix} interpolation
     u = [repeat(u[i], 1, 3) for i in 1:3]
@@ -876,7 +868,6 @@ end
         @test A(x) == A_s(x)
     end
     @test A_s(0) isa SVector{length(first(u))}
-    @test_nowarn test_allocs(A_s, 0)
 
     # Test Vector{Matrix} interpolation
     u = [repeat(u[i], 1, 3) for i in 1:3]
@@ -1122,7 +1113,6 @@ end
         @test A2_s(100.0) == A2(100.0)
         @test A2_s(300.0) == A2(300.0)
         @test A2_s(0.7) isa SVector{length(u2[1])}
-        @test_nowarn test_allocs(A2_s, 0.7)
     end
     @testset "Vector of Matrices case" begin
         u3 = [[u[i] u[i] + 1] for i in eachindex(u)]
@@ -1193,7 +1183,6 @@ end
         @test A2_s(100.0) == A2(100.0)
         @test A2_s(300.0) == A2(300.0)
         @test A2_s(0.7) isa SVector{length(u2[1])}
-        @test_nowarn test_allocs(A2_s, 0.7)
     end
     @testset "Vector of Matrices case" begin
         u3 = [[u[i] u[i] + 1] for i in eachindex(u)]

test/runtests.jl

@@ -37,5 +37,6 @@ const GROUP = get(ENV, "GROUP", "All")
 
     if GROUP == "QA"
         @safetestset "Quality Assurance" include("qa.jl")
+        @safetestset "Allocation Tests" include("alloc_tests.jl")
     end
 end