Merge branch 'main' into dw/fix_to_composite

Author: devmotion

.github/workflows/CI.yml

@@ -1,7 +1,7 @@
 name: CI
 on:
   push:
-    branches: [master]
+    branches: [main]
     tags: [v*]
   pull_request:
   schedule:

Project.toml

@@ -1,6 +1,6 @@
 name = "ChainRulesTestUtils"
 uuid = "cdddcdb0-9152-4a09-a978-84456f9df70a"
-version = "1.2.4"
+version = "1.3.1"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
@@ -11,7 +11,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
-ChainRulesCore = "1"
+ChainRulesCore = "1.11.2"
 Compat = "3"
 FiniteDifferences = "0.12.12"
 julia = "1"

src/rand_tangent.jl

@@ -7,12 +7,6 @@ Rather it is an arbitary value, that is generated using the `rng`.
 """
 rand_tangent(x) = rand_tangent(Random.GLOBAL_RNG, x)
 
-rand_tangent(rng::AbstractRNG, x::Symbol) = NoTangent()
-rand_tangent(rng::AbstractRNG, x::AbstractChar) = NoTangent()
-rand_tangent(rng::AbstractRNG, x::AbstractString) = NoTangent()
-
-rand_tangent(rng::AbstractRNG, x::Integer) = NoTangent()
-
 # Try and make nice numbers with short decimal representations for good error messages
 # while also not biasing the sample space too much
 function rand_tangent(rng::AbstractRNG, x::T) where {T<:Number}
@@ -24,25 +18,11 @@ function rand_tangent(rng::AbstractRNG, x::ComplexF64)
     return ComplexF64(rand(rng, -9:0.1:9), rand(rng, -9:0.1:9))
 end
 
-#BigFloat/MPFR is finicky about short numbers, this doesn't always work as well as it should
-
+# BigFloat/MPFR is finicky about short numbers, this doesn't always work as well as it should
 # multiply by 9 to give a bigger range of values tested: no so tightly clustered around 0.
 rand_tangent(rng::AbstractRNG, ::BigFloat) = round(big(9 * randn(rng)), digits=5, base=2)
 
-
-rand_tangent(rng::AbstractRNG, x::Array{<:Any, 0}) = _compress_notangent(fill(rand_tangent(rng, x[])))
-rand_tangent(rng::AbstractRNG, x::Array) = _compress_notangent(rand_tangent.(Ref(rng), x))
-
-# All other AbstractArray's can be handled using the ProjectTo mechanics.
-# and follow the same requirements
-function rand_tangent(rng::AbstractRNG, x::AbstractArray)
-    return _compress_notangent(ProjectTo(x)(rand_tangent(rng, collect(x))))
-end
-
-# TODO: arguably ProjectTo should handle this for us for AbstactArrays
-# https://github.com/JuliaDiff/ChainRulesCore.jl/issues/410
-_compress_notangent(::AbstractArray{NoTangent}) = NoTangent()
-_compress_notangent(x) = x
+rand_tangent(rng::AbstractRNG, x::AbstractArray) = ProjectTo(x)(rand_tangent.(Ref(rng), x))
 
 function rand_tangent(rng::AbstractRNG, x::T) where {T}
     if !isstructtype(T)
@@ -65,5 +45,9 @@ function rand_tangent(rng::AbstractRNG, x::T) where {T}
     end
 end
 
+rand_tangent(rng::AbstractRNG, x::Symbol) = NoTangent()
+rand_tangent(rng::AbstractRNG, x::AbstractChar) = NoTangent()
+rand_tangent(rng::AbstractRNG, x::AbstractString) = NoTangent()
+rand_tangent(rng::AbstractRNG, x::Integer) = NoTangent()
 rand_tangent(rng::AbstractRNG, ::Type) = NoTangent()
 rand_tangent(rng::AbstractRNG, ::Module) = NoTangent()