tweak @⌛, sparse matrix adapt

Author: marius311

src/gpu.jl

@@ -36,7 +36,6 @@ end
 ### misc
 # the generic versions of these trigger scalar indexing of CUDA, so provide
 # specialized versions: 
-
 pinv(D::Diagonal{T,<:CuBaseField}) where {T} = Diagonal(@. ifelse(isfinite(inv(D.diag)), inv(D.diag), $zero(T)))
 inv(D::Diagonal{T,<:CuBaseField}) where {T} = any(Array((D.diag.==0)[:])) ? throw(SingularException(-1)) : Diagonal(inv.(D.diag))
 fill!(f::CuBaseField, x) = (fill!(f.arr,x); f)
@@ -51,12 +50,15 @@ CUDA.sqrt(x::Complex) = CUDA.sqrt(CUDA.abs(x)) * CUDA.exp(im*CUDA.angle(x)/2)
 CUDA.culiteral_pow(::typeof(^), x::Complex, ::Val{2}) = x * x
 CUDA.pow(x::Complex, p) = x^p
 
-# until https://github.com/JuliaGPU/CUDA.jl/pull/618
+# until https://github.com/JuliaGPU/CUDA.jl/pull/618 (CUDA 2.5)
 CUDA.cufunc(::typeof(angle)) = CUDA.angle
 
-# this makes cu(::SparseMatrixCSC) return a CuSparseMatrixCSR rather than a
-# dense CuArray
-adapt_structure(::Type{<:CuArray}, L::SparseMatrixCSC) = CuSparseMatrixCSR(L)
+# adapting of SparseMatrixCSC ↔ CuSparseMatrixCSR (otherwise dense arrays created)
+adapt_structure(::Type{<:CuArray}, L::SparseMatrixCSC)   = CuSparseMatrixCSR(L)
+adapt_structure(::Type{<:Array},   L::CuSparseMatrixCSR) = SparseMatrixCSC(L)
+adapt_structure(::Type{<:CuArray}, L::CuSparseMatrixCSR) = L
+adapt_structure(::Type{<:Array},   L::SparseMatrixCSC)   = L
+
 
 # CUDA somehow missing this one
 # see https://github.com/JuliaGPU/CuArrays.jl/issues/103

src/util.jl

@@ -369,12 +369,13 @@ _isdef(ex) = @capture(ex, function f_(arg__) body_ end)
 
 """
 
-    @⌛ code ...
-    @⌛ function_definition() = .... 
+    @⌛ [label] code ...
+    @⌛ [label] function_definition() = .... 
 
-Label a section of code to be timed. The first form uses the code
-itselfs as a label, the second uses the function name, and its the
-body of the function which is timed. 
+Label a section of code to be timed. If a label string is not
+provided, the first form uses the code itselfs as a label, the second
+uses the function name, and its the body of the function which is
+timed. 
 
 To run the timer and print output, returning the result of the
 calculation, use
@@ -383,16 +384,27 @@ calculation, use
 
 Timing uses `TimerOutputs.get_defaulttimer()`. 
 """
-macro ⌛(ex)
+macro ⌛(args...)
+    if length(args)==1
+        label, ex = nothing, args[1]
+    else
+        label, ex = esc(args[1]), args[2]
+    end
     source_str = last(splitpath(string(__source__.file)))*":"*string(__source__.line)
     if _isdef(ex)
         sdef = splitdef(ex)
+        if isnothing(label)
+            label = "$(string(sdef[:name]))(…)  ($source_str)"
+        end
         sdef[:body] = quote
-            CMBLensing.@timeit $("$(string(sdef[:name]))(…)  ($source_str)") $(sdef[:body])
+            CMBLensing.@timeit $label $(sdef[:body])
         end
         esc(combinedef(sdef))
     else
-        :(@timeit $("$(Base._truncate_at_width_or_chars(string(prewalk(rmlines,ex)),26))  ($source_str)") $(esc(ex)))
+        if isnothing(label)
+            label = "$(Base._truncate_at_width_or_chars(string(prewalk(rmlines,ex)),26))  ($source_str)"
+        end
+        :(@timeit $label $(esc(ex)))
     end
 end