Update Interpolations compat (#120)

* Add default Inf tol for cornerindices using new point coordinatetype method

* Pass build strictness to composite components

* More BSpline type annotations, update Interpolations.jl compat

* Add CompatHelper and add prerelease to CI matrix

* Add tests

* Remove extra MESHSIZED_PARAMS assignment

Author: gpeairs

.github/workflows/CI.yml

@@ -39,6 +39,7 @@ jobs:
           - '1.10'
           - '1.11'
           - '1.12'
+          - 'pre'
         os:
           - ubuntu-latest
         arch:

.github/workflows/CompatHelper.yaml

@@ -0,0 +1,50 @@
+name: CompatHelper
+on:
+  schedule:
+    - cron: 0 0 * * *
+  workflow_dispatch:
+permissions:
+  contents: write
+  pull-requests: write
+jobs:
+  CompatHelper:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if Julia is already available in the PATH
+        id: julia_in_path
+        run: which julia
+        continue-on-error: true
+      - name: Install Julia, but only if it is not already available in the PATH
+        uses: julia-actions/setup-julia@v2
+        with:
+          version: '1'
+          arch: ${{ runner.arch }}
+        if: steps.julia_in_path.outcome != 'success'
+      - name: "Add the General registry via Git"
+        run: |
+          import Pkg
+          ENV["JULIA_PKG_SERVER"] = ""
+          Pkg.Registry.add("General")
+        shell: julia --color=yes {0}
+      - name: "Install CompatHelper"
+        run: |
+          import Pkg
+          name = "CompatHelper"
+          uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
+          version = "3"
+          Pkg.add(; name, uuid, version)
+        shell: julia --color=yes {0}
+      - name: "Run CompatHelper"
+        run: |
+          import CompatHelper
+          CompatHelper.main()
+        shell: julia --color=yes {0}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # This repo uses Documenter, so we can reuse our [Documenter SSH key](https://documenter.juliadocs.org/stable/man/hosting/walkthrough/).
+          # If we didn't have one of those setup, we could configure a dedicated ssh deploy key `COMPATHELPER_PRIV` following https://juliaregistries.github.io/CompatHelper.jl/dev/#Creating-SSH-Key.
+          # Either way, we need an SSH key if we want the PRs that CompatHelper creates to be able to trigger CI workflows themselves.
+          # That is because GITHUB_TOKEN's can't trigger other workflows (see https://docs.github.com/en/actions/security-for-github-actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow).
+          # Check if you have a deploy key setup using these docs: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/reviewing-your-deploy-keys.
+          COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
+          # COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}

CHANGELOG.md

@@ -14,22 +14,23 @@ The format of this changelog is based on
   - Deprecate `SolidModels.MeshingParameters` in favour of new `mesh_scale`, `mesh_order`,
     `mesh_grading_default` accessed from `SolidModels`.
   - Improvements to `SolidModels.render!` to improve stability and performance.
-    + Change `SolidModels.restrict_to_volume!` to perform a check if the simulation domain
-      already bounds all two and three dimensional objects, if so skips operation.
-    + Change `SolidModels.render!` to incorporate a two stage `_fragment_and_map!` operation,
-      reconciling vertices and segments before reconciling all entities. This improves the
-      robustness of the OpenCascade integration which can error in synchronization if too much
-      reconciliation is required all at once by `fragment`.
-    + These two operations in conjunction with the removal of `MeshSized` entities results in
-      a ~3x performance improvement in rendering the QPU17 example to `SolidModel`, and ~4.5x
-      reduction in time from schematic to mesh.
+    
+      + Change `SolidModels.restrict_to_volume!` to perform a check if the simulation domain
+        already bounds all two and three dimensional objects, if so skips operation.
+      + Change `SolidModels.render!` to incorporate a two stage `_fragment_and_map!` operation,
+        reconciling vertices and segments before reconciling all entities. This improves the
+        robustness of the OpenCascade integration which can error in synchronization if too much
+        reconciliation is required all at once by `fragment`.
+      + These two operations in conjunction with the removal of `MeshSized` entities results in
+        a ~3x performance improvement in rendering the QPU17 example to `SolidModel`, and ~4.5x
+        reduction in time from schematic to mesh.
 
 ## 1.7.0 (2025-11-26)
 
   - Added `xor2d` for polygon XOR
 
   - Improved support for wave port boundaries in a `SolidModel`
-
+    
       + `SolidModelTargets` now take `wave_port_layers`, a list of layer symbols used to define wave port boundary conditions
       + Added support for `LineSegment` in SolidModel
       + Added `add_wave_ports!` to automatically place wave port boundaries where specified paths/routes intersect the simulation area
@@ -46,7 +47,7 @@ For developers, the test suite now uses the TestItem framework, and new benchmar
 ## 1.6.0 (2025-10-16)
 
   - Improved metadata handling for `LayoutTarget` and `SolidModelTarget`
-
+    
       + SolidModelTargets will now ignore `NORENDER_META` (the `:norender` layer)
       + SolidModelTargets now take `ignored_layers`, a list of layer symbols which are not rendered
       + LayoutTargets now allow overriding the mapping of `GDSMeta` by setting `target.map_meta_dict[my_gdsmeta] = my_override`, allowing changes to different `GDSMeta` or `nothing` rather than always mapping a `GDSMeta` to itself
@@ -64,7 +65,7 @@ For developers, the test suite now uses the TestItem framework, and new benchmar
 ## 1.5.0 (2025-10-10)
 
   - Added `auto_speed`, `endpoints_curvature`, and `auto_curvature` keyword options to `bspline!` and `BSplineRouting`
-
+    
       + `auto_speed` sets the speed at endpoints to avoid sharp bends (minimizing the integrated square of the curvature derivative with respect to arclength)
       + `endpoints_curvature` sets boundary conditions on the curvature (by inserting extra waypoints)
       + `auto_curvature` B-spline sets curvature at endpoints to match previous segment (or to zero if there is no previous segment)

Project.toml

@@ -55,7 +55,7 @@ ForwardDiff = "0.10"
 Gmsh = "0.3.1"
 GraphMakie = "0.5"
 Graphs = "1"
-Interpolations = "0.14, 0.15"
+Interpolations = "0.14, 0.15, 0.16"
 IntervalSets = "0.7"
 IntervalTrees = "1"
 LoggingExtras = "1"

docs/src/solidmodels.md

@@ -91,7 +91,7 @@ achieved through addition of custom size fields like this, it is generally sugge
 incorporate this information back into the `MeshSized` style used on the original entities.
 
 !!! info
-
+    
     If [`SolidModels.mesh_control_points`](@ref) is modified, then it is important to call
     [`SolidModels.finalize_size_fields!`](@ref) in order to ensure that the `KDTree` are rebuilt.
     Additionally, to generate a new mesh `SolidModels.gmsh.model.mesh.clear()` must be called

src/DeviceLayout.jl

@@ -191,7 +191,9 @@ Return the coordinate type of the geometry.
 coordinatetype(::Type{S}) where {T, S <: AbstractGeometry{T}} = T
 coordinatetype(::S) where {T, S <: AbstractGeometry{T}} = T
 coordinatetype(::AbstractArray{S}) where {T, S <: AbstractGeometry{T}} = T
-coordinatetype(iterable) = promote_type(coordinatetype.(iterable))
+coordinatetype(iterable) = promote_type(coordinatetype.(iterable)...)
+coordinatetype(::Point{T}) where {T} = T
+coordinatetype(::Type{Point{T}}) where {T} = T
 
 # Entity interface
 include("entities.jl")

src/paths/segments/bspline.jl

@@ -8,6 +8,40 @@ import QuadGK: quadgk
 import ForwardDiff: Dual, partials, value, Partials
 using LinearAlgebra
 
+# Patch in new boundary condition for Interpolations.jl allowing us to specify derivative
+struct NeumannBC{GT <: Interpolations.GridType, T} <: Interpolations.BoundaryCondition
+    gt::GT
+    g0::T
+    g1::T
+end
+NeumannBC(g0, g1) = NeumannBC(Interpolations.OnGrid(), g0, g1)
+
+# Concrete type of interpolation, only used in BSpline struct definition
+const LayoutBSplineItp{T} = Interpolations.ScaledInterpolation{
+    Point{T},
+    1,
+    Interpolations.BSplineInterpolation{
+        Point{T},
+        1,
+        Interpolations.OffsetArrays.OffsetVector{Point{T}, Vector{Point{T}}},
+        Interpolations.BSpline{
+            Interpolations.Cubic{NeumannBC{Interpolations.OnGrid, Point{T}}}
+        },
+        Tuple{Base.OneTo{Int64}}
+    },
+    Interpolations.BSpline{
+        Interpolations.Cubic{NeumannBC{Interpolations.OnGrid, Point{T}}}
+    },
+    Tuple{
+        StepRangeLen{
+            Float64,
+            Base.TwicePrecision{Float64},
+            Base.TwicePrecision{Float64},
+            Int64
+        }
+    }
+}
+
 """
     mutable struct BSpline{T} <: ContinuousSegment{T}
 
@@ -25,9 +59,9 @@ mutable struct BSpline{T} <: ContinuousSegment{T}
     p::Vector{Point{T}}
     t0::Point{T}
     t1::Point{T}
-    r::Paths.Interpolations.AbstractInterpolation{Point{T}} # function of t between 0 and 1
-    p0
-    p1
+    r::LayoutBSplineItp{T} # function of t between 0 and 1
+    p0::Point{T}
+    p1::Point{T}
     α0::typeof(1.0°)
     α1::typeof(1.0°)
     function BSpline{T}(p::Vector{Point{T}}, t0::Point{T}, t1::Point{T}) where {T}
@@ -387,14 +421,6 @@ function _bspline_tangents(scale, dir0, dir1, speed0::Coordinate, speed1=speed0)
     return t0, t1
 end
 
-# Patch in new boundary condition for Interpolations.jl allowing us to specify derivative
-struct NeumannBC{GT <: Interpolations.GridType} <: Interpolations.BoundaryCondition
-    gt::GT
-    g0
-    g1
-end
-NeumannBC(g0, g1) = NeumannBC(Interpolations.OnGrid(), g0, g1)
-
 """
 `Cubic{NeumannBC}` `OnGrid` amounts to setting `y_1'(x) = g0` at `x = 0`
 and  `y_n'(x) = g1` at `x = 1`.
@@ -407,7 +433,7 @@ function prefiltering_system(
     ::Type{T},
     ::Type{TC},
     n::Int,
-    degree::Cubic{NeumannBC{Interpolations.OnGrid}}
+    degree::Cubic{<:NeumannBC{Interpolations.OnGrid}}
 ) where {T, TC}
     dl, d, du = Interpolations.inner_system_diags(T, n, degree)
     d[1] = -oneunit(T) / 2

src/polygons.jl

@@ -655,7 +655,11 @@ end
 cornerindices(p, x) = cornerindices(points(p), x)
 cornerindices(p::Point, x) = cornerindices([p], x)
 cornerindices(p::Vector{<:Point}, p0::Point) = cornerindices(p, [p0])
-function cornerindices(p::Vector{<:Point}, p0::Vector{<:Point}; tol)
+function cornerindices(
+    p::Vector{<:Point},
+    p0::Vector{<:Point};
+    tol=DeviceLayout.coordinatetype(p)(Inf)
+)
     # Pick the closest to p0 satisfying tolerance.
     return filter!(x -> x > 0, map(p0) do px
         idx = findfirst(p_idx -> isapprox(px, p_idx), p)

src/schematics/schematics.jl

@@ -1348,7 +1348,7 @@ function build!(sch::Schematic, geometry_fn=geometry; strict=:error)
             # One of the node cs's references will be its Component
             for (i, subref) in pairs(refs(node_cs)) # Just check all of them
                 if structure(subref) isa AbstractCompositeComponent
-                    build!(schematic(structure(subref)))
+                    build!(schematic(structure(subref)); strict=strict)
                 end
                 if structure(subref) isa AbstractComponent
                     try

src/solidmodels/render.jl

@@ -445,13 +445,6 @@ meshgrading(node::Paths.Node; kwargs...) = -1.0
 sizeandgrading(e::GeometryEntity; kwargs...) =
     (float(meshsize(e; kwargs...)), float(meshgrading(e; kwargs...)))
 
-"""
-    Global defaults for key meshing parameters.
-"""
-MESHSIZE_PARAMS[:mesh_scale] = 1.0
-MESHSIZE_PARAMS[:mesh_order] = 1
-MESHSIZE_PARAMS[:global_α] = 0.9
-
 """
     set_gmsh_option(s, o::Number)
     set_gmsh_option(s, o::AbstractString)