Skip to content

Commit 5be2312

Browse files
Merge pull request #244 from chriselrod/ambiguities
Ambiguity errors and format
2 parents 122eb8c + eb987aa commit 5be2312

File tree

5 files changed

+223
-154
lines changed

5 files changed

+223
-154
lines changed

Project.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "RecursiveArrayTools"
22
uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
33
authors = ["Chris Rackauckas <[email protected]>"]
4-
version = "2.35.0"
4+
version = "2.35.1"
55

66
[deps]
77
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -37,6 +37,7 @@ ZygoteRules = "0.2"
3737
julia = "1.6"
3838

3939
[extras]
40+
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
4041
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
4142
LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
4243
NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
@@ -50,4 +51,4 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
5051
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
5152

5253
[targets]
53-
test = ["ForwardDiff", "LabelledArrays", "NLsolve", "OrdinaryDiffEq", "Pkg", "Test", "Unitful", "Random", "StaticArrays", "StructArrays", "Zygote"]
54+
test = ["Aqua", "ForwardDiff", "LabelledArrays", "NLsolve", "OrdinaryDiffEq", "Pkg", "Test", "Unitful", "Random", "StaticArrays", "StructArrays", "Zygote"]

src/RecursiveArrayTools.jl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,24 @@ include("tabletraits.jl")
3131
include("array_partition.jl")
3232
include("zygote.jl")
3333

34-
Base.show(io::IO, x::Union{ArrayPartition,AbstractVectorOfArray}) = invoke(show, Tuple{typeof(io), Any}, io, x)
34+
function Base.show(io::IO, x::Union{ArrayPartition, AbstractVectorOfArray})
35+
invoke(show, Tuple{typeof(io), Any}, io, x)
36+
end
3537

3638
import GPUArraysCore
3739
Base.convert(T::Type{<:GPUArraysCore.AbstractGPUArray}, VA::AbstractVectorOfArray) = T(VA)
38-
ChainRulesCore.rrule(T::Type{<:GPUArraysCore.AbstractGPUArray}, xs::AbstractVectorOfArray) = T(xs), ȳ -> (NoTangent(),ȳ)
40+
function ChainRulesCore.rrule(T::Type{<:GPUArraysCore.AbstractGPUArray},
41+
xs::AbstractVectorOfArray)
42+
T(xs), ȳ -> (NoTangent(), ȳ)
43+
end
3944

4045
export VectorOfArray, DiffEqArray, AbstractVectorOfArray, AbstractDiffEqArray,
41-
AllObserved, vecarr_to_arr, vecarr_to_vectors, tuples
46+
AllObserved, vecarr_to_vectors, tuples
4247

4348
export recursivecopy, recursivecopy!, recursivefill!, vecvecapply, copyat_or_push!,
4449
vecvec_to_mat, recursive_one, recursive_mean, recursive_bottom_eltype,
4550
recursive_unitless_bottom_eltype, recursive_unitless_eltype
4651

47-
4852
export ArrayPartition
4953

50-
5154
end # module

0 commit comments

Comments
 (0)