Skip to content

Commit c0936b7

Browse files
timholytkelman
authored andcommitted
Fix PermutedDimsArrays typo
(cherry picked from commit 6ed3bb8) ref #17895
1 parent d5a51e9 commit c0936b7

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

base/permuteddimsarray.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ immutable PermutedDimsArray{T,N,perm,iperm,AA<:AbstractArray} <: AbstractArray{T
1717
end
1818

1919
function PermutedDimsArray{T,N}(data::AbstractArray{T,N}, perm)
20-
length(perm) == N || throw(ArgumentError(string(p, " is not a valid permutation of dimensions 1:", N)))
20+
length(perm) == N || throw(ArgumentError(string(perm, " is not a valid permutation of dimensions 1:", N)))
2121
iperm = invperm(perm)
2222
PermutedDimsArray{T,N,(perm...,),(iperm...,),typeof(data)}(data)
2323
end

test/arrayops.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,12 @@ s = view(a,:,[1,2,4],[1,5])
446446
c = convert(Array, s)
447447
for p in ([1,2,3], [1,3,2], [2,1,3], [2,3,1], [3,1,2], [3,2,1])
448448
@test permutedims(s, p) == permutedims(c, p)
449+
@test Base.PermutedDimsArrays.PermutedDimsArray(s, p) == permutedims(c, p)
449450
end
451+
@test_throws ArgumentError permutedims(a, (1,1,1))
452+
@test_throws ArgumentError permutedims(s, (1,1,1))
453+
@test_throws ArgumentError Base.PermutedDimsArrays.PermutedDimsArray(a, (1,1,1))
454+
@test_throws ArgumentError Base.PermutedDimsArrays.PermutedDimsArray(s, (1,1,1))
450455

451456
## ipermutedims ##
452457

0 commit comments

Comments
 (0)