More performant solution for transpose! with Vectors (see JuliaLang#8726

)
jaak-s · Oct 27, 2014 · 7f91ee1 · 7f91ee1
1 parent 7a7110b
commit 7f91ee1
Showing 1 changed file with 25 additions and 4 deletions.
diff --git a/base/array.jl b/base/array.jl
@@ -1237,7 +1237,7 @@ end
 
 ## Transpose ##
 const transposebaselength=64
-function transpose!(B::StridedVecOrMat,A::StridedMatrix)
+function transpose!(B::StridedMatrix,A::StridedMatrix)
     m, n = size(A)
     size(B,1) == n && size(B,2) == m || throw(DimensionMismatch("transpose"))
 
@@ -1254,7 +1254,15 @@ function transpose!(B::StridedVecOrMat,A::StridedMatrix)
     end
     return B
 end
-function transposeblock!(B::StridedVecOrMat,A::StridedMatrix,m::Int,n::Int,offseti::Int,offsetj::Int)
+function transpose!(B::StridedVector, A::StridedMatrix)
+    length(B) == length(A) && size(A,1) == 1 || throw(DimensionMismatch("transpose"))
+    copy!(B, A)
+end
+function transpose!(B::StridedMatrix, A::StridedVector)
+    length(B) == length(A) && size(B,1) == 1 || throw(DimensionMismatch("transpose"))
+    copy!(B, A)
+end
+function transposeblock!(B::StridedMatrix,A::StridedMatrix,m::Int,n::Int,offseti::Int,offsetj::Int)
     if m*n<=transposebaselength
         @inbounds begin
             for j = offsetj+(1:n)
@@ -1274,7 +1282,7 @@ function transposeblock!(B::StridedVecOrMat,A::StridedMatrix,m::Int,n::Int,offse
     end
     return B
 end
-function ctranspose!(B::StridedVecOrMat,A::StridedMatrix)
+function ctranspose!(B::StridedMatrix,A::StridedMatrix)
     m, n = size(A)
     size(B,1) == n && size(B,2) == m || throw(DimensionMismatch("transpose"))
 
@@ -1291,7 +1299,15 @@ function ctranspose!(B::StridedVecOrMat,A::StridedMatrix)
     end
     return B
 end
-function ctransposeblock!(B::StridedVecOrMat,A::StridedMatrix,m::Int,n::Int,offseti::Int,offsetj::Int)
+function ctranspose!(B::StridedVector, A::StridedMatrix)
+    length(B) == length(A) && size(A,1) == 1 || throw(DimensionMismatch("transpose"))
+    ccopy!(B, A)
+end
+function ctranspose!(B::StridedMatrix, A::StridedVector)
+    length(B) == length(A) && size(B,1) == 1 || throw(DimensionMismatch("transpose"))
+    ccopy!(B, A)
+end
+function ctransposeblock!(B::StridedMatrix,A::StridedMatrix,m::Int,n::Int,offseti::Int,offsetj::Int)
     if m*n<=transposebaselength
         @inbounds begin
             for j = offsetj+(1:n)
@@ -1311,6 +1327,11 @@ function ctransposeblock!(B::StridedVecOrMat,A::StridedMatrix,m::Int,n::Int,offs
     end
     return B
 end
+function ccopy!(B, A)
+    for i = 1:length(A)
+        B[i] = ctranspose(A[i])
+    end
+end
 
 function transpose(A::StridedMatrix)
     B = similar(A, size(A, 2), size(A, 1))