Fix some tests and bump version (#706)

* Fix some tests

- Fix doctests
- Refactor _zeroed_backing()
- Use `mergewith(f)` instead of the deprecated `merge(f)`

* Fix CI

* Bump version

Author: JamesWrigley

.github/workflows/CI.yml

@@ -29,28 +29,21 @@ jobs:
           - "pre"  # Pre-release/nightly
         os:
           - ubuntu-latest
-          - macOS-13 # Intel
+          - macOS-latest
           - windows-latest
         arch:
-          - x64
-          - x86
-        exclude:
-          # Test 32-bit only on Linux
-          - os: macOS-13
-            arch: x86
-          - os: windows-latest
-            arch: x86
+          - default
         include:
-          - os: macOS-latest # Apple Silicon
+          - os: ubuntu-latest
             version: "1"          
-            arch: aarch64
+            arch: x86
     steps:
       - uses: actions/checkout@v6
       - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: julia-actions/cache@v2
+      - uses: julia-actions/cache@v3
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1

.github/workflows/IntegrationTest.yml

@@ -13,53 +13,54 @@ concurrency:
 
 jobs:
   test:
-    name: ${{ matrix.package.repo }}
+    name: ${{ matrix.package.name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         julia-version: [1]
         os: [ubuntu-latest]
         package:
-          - {user: JuliaDiff, repo: ChainRules.jl}
-          - {user: JuliaDiff, repo: ChainRulesTestUtils.jl}
-          - {user: JuliaDiff, repo: ChainRulesOverloadGeneration.jl}
-          - {user: JuliaMath, repo: SpecialFunctions.jl}
-          - {user: invenia, repo: BlockDiagonals.jl}
-          - {user: invenia, repo: PDMatsExtras.jl}
-          - {user: chrisbrahms, repo: Hankel.jl}
-          - {user: SciML, repo: DiffEqBase.jl}
-          - {user: SciML, repo: DataInterpolations.jl}
-          - {user: dfdx, repo: Yota.jl}
-          - {user: JuliaStats, repo: StatsFuns.jl}
-          - {user: JuliaStats, repo: LogExpFunctions.jl}
+          - {user: JuliaDiff, name: ChainRules}
+          - {user: JuliaDiff, name: ChainRulesTestUtils}
+          - {user: JuliaDiff, name: ChainRulesOverloadGeneration}
+          - {user: JuliaMath, name: SpecialFunctions}
+          - {user: invenia, name: BlockDiagonals}
+          - {user: invenia, name: PDMatsExtras}
+          - {user: chrisbrahms, name: Hankel}
+          - {user: SciML, name: DiffEqBase}
+          - {user: SciML, name: DataInterpolations}
+          - {user: dfdx, name: Yota}
+          - {user: JuliaStats, name: StatsFuns}
+          - {user: JuliaStats, name: LogExpFunctions}
         # Diffractor needs to run on Julia nightly
         include:
           - julia-version: nightly
             os: ubuntu-latest
-            package: {user: JuliaDiff, repo: Diffractor.jl}
+            package: {user: JuliaDiff, name: Diffractor}
 
     steps:
       - uses: actions/checkout@v6
       - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.julia-version }}
           arch: x64
+      - uses: julia-actions/cache@v3
       - uses: julia-actions/julia-buildpkg@v1
       - name: Clone Downstream
         uses: actions/checkout@v6
         with:
-          repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
+          repository: ${{ matrix.package.user }}/${{ matrix.package.name }}.jl
           path: downstream
       - name: Load this and run the downstream tests
-        shell: julia --project=downstream {0}
+        shell: julia --project=@temp {0}
         run: |
           using Pkg
           try
             # force it to use this PR's version of the package
-            Pkg.develop(PackageSpec(path="."))  # resolver may fail with main deps
+            Pkg.develop([PackageSpec(path="."), PackageSpec(path="downstream")])  # resolver may fail with main deps
             Pkg.update()
-            Pkg.test()  # resolver may fail with test time deps 
+            Pkg.test("${{ matrix.package.name }}")  # resolver may fail with test time deps
           catch err
             err isa Pkg.Resolve.ResolverError || rethrow()
             # If we can't resolve that means this is incompatible by SemVer and this is fine

.github/workflows/JuliaNightly.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: julia-actions/setup-julia@v2
         with:
           version: nightly
-      - uses: julia-actions/cache@v2
+      - uses: julia-actions/cache@v3
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1

Project.toml

@@ -1,6 +1,6 @@
 name = "ChainRulesCore"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "1.26.0"
+version = "1.26.1"
 
 [deps]
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"

src/rules.jl

@@ -18,11 +18,10 @@ unary input, unary output scalar function:
 ```jldoctest frule
 julia> dself = NoTangent();
 
-julia> x = rand()
-0.8236475079774124
+julia> x = 1.23456;
 
 julia> sinx, Δsinx = frule((dself, 1), sin, x)
-(0.7336293678134624, 0.6795498147167869)
+(0.9440031218347901, 0.3299365180851773)
 
 julia> sinx == sin(x)
 true
@@ -51,7 +50,7 @@ that return a single output that is iterable, like a `Tuple`.
 So this is actually a [`Tangent`](@ref):
 ```jldoctest frule
 julia> Δsincosx
-Tangent{Tuple{Float64, Float64}}(0.6795498147167869, -0.7336293678134624)
+Tangent{Tuple{Float64, Float64}}(0.3299365180851773, -0.9440031218347901)
 ```
 
 The optional [`RuleConfig`](@ref) option allows specifying frules only for AD systems that

src/tangent_arithmetic.jl

@@ -142,7 +142,7 @@ function Base.:+(a::P, d::StructuralTangent{P}) where {P}
         return construct(P, net_backing)
     end
 end
-Base.:+(a::Dict, d::Tangent{P}) where {P} = merge(+, a, backing(d))
+Base.:+(a::Dict, d::Tangent{P}) where {P} = mergewith(+, a, backing(d))
 Base.:+(a::StructuralTangent{P}, b::P) where {P} = b + a
 
 Base.:-(tangent::StructuralTangent{P}) where {P} = map(-, tangent)

src/tangent_types/structural_tangent.jl

@@ -208,16 +208,9 @@ function backing(x::T)::NamedTuple where {T}
     end
 end
 
-"""
-    _zeroed_backing(P)
-
-Returns a NamedTuple with same fields as `P`, and all values `ZeroTangent()`.
-"""
-@generated function _zeroed_backing(::Type{P}) where {P}
-    nil_base = ntuple(fieldcount(P)) do i
-        (fieldname(P, i), ZeroTangent())
-    end
-    return (; nil_base...)
+# Returns a NamedTuple with same fields as `P`, and all values `ZeroTangent()`
+function _zeroed_backing(::Type{T}) where {T}
+    return NamedTuple{fieldnames(T)}(ntuple(_ -> ZeroTangent(), fieldcount(T)))
 end
 
 """
@@ -299,7 +292,7 @@ function elementwise_add(a::NamedTuple{an}, b::NamedTuple{bn}) where {an,bn}
     end
 end
 
-elementwise_add(a::Dict, b::Dict) = merge(+, a, b)
+elementwise_add(a::Dict, b::Dict) = mergewith(+, a, b)
 
 struct PrimalAdditionFailedException{P} <: Exception
     primal::P

src/tangent_types/thunks.jl

@@ -179,8 +179,7 @@ To evaluate the wrapped closure, call [`unthunk`](@ref) which is a no-op when th
 argument is not a `Thunk`.
 
 ```jldoctest
-julia> t = @thunk(3)
-Thunk(var"#4#5"())
+julia> t = @thunk(3);
 
 julia> unthunk(t)
 3

test/projection.jl

@@ -457,7 +457,12 @@ struct NoSuperType end
         @test 0 == @ballocated $pdiag(dx) setup = (dx = Diagonal(rand(10^3)))
 
         psymm = ProjectTo(Symmetric(rand(10^3, 10^3)))
-        @test_broken 0 == @ballocated $psymm(dx) setup = (dx = Symmetric(rand(10^3, 10^3)))  # 64
+        allocs = @ballocated $psymm(dx) setup = (dx = Symmetric(rand(10^3, 10^3)))  # 64
+        if VERSION > v"1.13"
+            @test 0 == allocs
+        else
+            @test_broken 0 == allocs
+        end
     end
 
     @testset "#685" begin