More fixes

Author: kshyatt

Project.toml

@@ -36,16 +36,12 @@ TensorKitMooncakeExt = "Mooncake"
 [workspace]
 projects = ["test"]
 
-[extras]
-GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
-
 [compat]
 Adapt = "4"
 CUDA = "5.9"
 ChainRulesCore = "1"
 Dictionaries = "0.4"
 FiniteDifferences = "0.12"
-GPUArrays = "<11.5.0"
 LRUCache = "1.0.2"
 LinearAlgebra = "1"
 MatrixAlgebraKit = "0.6.5"

src/tensors/braidingtensor.jl

@@ -17,7 +17,7 @@ struct BraidingTensor{T, S, A} <: AbstractTensorMap{T, S, 2, 2}
     V1::S
     V2::S
     adjoint::Bool
-    function BraidingTensor{T, S, A}(V1::S, V2::S, ::Type{A}, adjoint::Bool = false) where {T, S <: IndexSpace, A <: DenseVector{T}}
+    function BraidingTensor{T, S, A}(V1::S, V2::S, adjoint::Bool = false) where {T, S <: IndexSpace, A <: DenseVector{T}}
         for a in sectors(V1), b in sectors(V2), c in (a ⊗ b)
             Nsymbol(a, b, c) == Nsymbol(b, a, c) ||
                 throw(ArgumentError("Cannot define a braiding between $a and $b"))
@@ -26,45 +26,27 @@ struct BraidingTensor{T, S, A} <: AbstractTensorMap{T, S, 2, 2}
         # partial construction: only construct rowr and colr when needed
     end
 end
-function BraidingTensor{T, S}(V1::S, V2::S, ::Type{A}, adjoint::Bool = false) where {T, S <: IndexSpace, A}
-    return BraidingTensor{T, S, A}(V1, V2, A, adjoint)
-end
-function BraidingTensor{T}(V1::S, V2::S, A, adjoint::Bool = false) where {T, S <: IndexSpace}
-    return BraidingTensor{T, S}(V1, V2, A, adjoint)
-end
 function BraidingTensor{T}(V1::S, V2::S, adjoint::Bool = false) where {T, S <: IndexSpace}
-    return BraidingTensor{T, S}(V1, V2, Vector{T}, adjoint)
-end
-function BraidingTensor{T}(V1::IndexSpace, V2::IndexSpace, A, adjoint::Bool = false) where {T}
-    return BraidingTensor{T}(promote(V1, V2)..., A, adjoint)
+    return BraidingTensor{T, S, Vector{T}}(V1, V2, adjoint)
 end
-function BraidingTensor{T}(V1::IndexSpace, V2::IndexSpace, adjoint::Bool = false) where {T}
-    return BraidingTensor{T}(V1, V2, Vector{T}, adjoint)
-end
-function BraidingTensor(V1::IndexSpace, V2::IndexSpace, ::Type{A}, adjoint::Bool = false) where {T, A <: DenseVector{T}}
-    return BraidingTensor{T}(promote(V1, V2)..., A, adjoint)
+function BraidingTensor(V1::S, V2::S, adjoint::Bool = false) where {S <: IndexSpace}
+    T = BraidingStyle(sectortype(S)) isa SymmetricBraiding ? Float64 : ComplexF64
+    return BraidingTensor{T, S, Vector{T}}(V1, V2, Vector{T}, adjoint)
 end
-function BraidingTensor(V1::IndexSpace, V2::IndexSpace, ::Type{T}, adjoint::Bool = false) where {T}
-    return BraidingTensor{T}(promote(V1, V2)..., Vector{T}, adjoint)
+# necessary due to HomSpace ctor below
+function BraidingTensor(V1::S, V2::S, A, adjoint::Bool = false) where {S <: IndexSpace}
+    T = eltype(A)
+    return BraidingTensor{T, S, A}(V1, V2, adjoint)
 end
 function BraidingTensor(V1::IndexSpace, V2::IndexSpace, adjoint::Bool = false)
     return BraidingTensor(promote(V1, V2)..., adjoint)
 end
-function BraidingTensor(V1::S, V2::S, adjoint::Bool = false) where {S <: IndexSpace}
-    T = BraidingStyle(sectortype(S)) isa SymmetricBraiding ? Float64 : ComplexF64
-    return BraidingTensor{T, S}(V1, V2, Vector{T}, adjoint)
-end
-function BraidingTensor(V1::S, V2::S, ::Type{A}, adjoint::Bool = false) where {S <: IndexSpace, A <: AbstractArray}
-    T = BraidingStyle(sectortype(S)) isa SymmetricBraiding ? Float64 : ComplexF64
-    A′ = similarstoragetype(A, T)
-    return BraidingTensor{T, S}(V1, V2, A′, adjoint)
-end
 function BraidingTensor(V::HomSpace, adjoint::Bool = false)
     domain(V) == reverse(codomain(V)) ||
         throw(SpaceMismatch("Cannot define a braiding on $V"))
     return BraidingTensor(V[2], V[1], adjoint)
 end
-function BraidingTensor(V::HomSpace, ::Type{A}, adjoint::Bool = false) where {A}
+function BraidingTensor(V::HomSpace, A, adjoint::Bool = false)
     domain(V) == reverse(codomain(V)) ||
         throw(SpaceMismatch("Cannot define a braiding on $V"))
     return BraidingTensor(V[2], V[1], A, adjoint)
@@ -75,7 +57,7 @@ function BraidingTensor{T}(V::HomSpace, adjoint::Bool = false) where {T}
     return BraidingTensor{T}(V[2], V[1], adjoint)
 end
 function Base.adjoint(b::BraidingTensor{T, S, A}) where {T, S, A}
-    return BraidingTensor{T, S, A}(b.V1, b.V2, A, !b.adjoint)
+    return BraidingTensor{T, S, A}(b.V1, b.V2, !b.adjoint)
 end
 
 storagetype(::Type{BraidingTensor{T, S, A}}) where {T, S, A} = A
@@ -113,7 +95,7 @@ end
 
 function _set_subblock!(data, val)
     f(I) = ((I[1] == I[4]) & (I[2] == I[3])) * val
-    data .= f.(CartesianIndices(data))
+    @. data = f(CartesianIndices(data))
 end
 
 

test/cuda/planar.jl

@@ -27,9 +27,7 @@ for V in spacelist
         t3 = @testinferred adapt(storagetype(t2), t1)
         @test storagetype(t3) == storagetype(t2)
         # allowscalar needed for the StridedView comparison
-        CUDA.@allowscalar begin
-            @test t3 == t2
-        end
+        @test t3 ≈ t2
 
         W2 = reverse(codomain(W)) ← domain(W)
         @test_throws SpaceMismatch BraidingTensor(W2)
@@ -41,9 +39,7 @@ for V in spacelist
         t3 = @inferred TensorMap(t2)
         @test storagetype(t3) == CuVector{ComplexF64, CUDA.DeviceMemory}
         t4 = braid(adapt(CuArray, id(scalartype(t2), domain(t2))), ((2, 1), (3, 4)), (1, 2, 3, 4))
-        CUDA.@allowscalar begin
-            @test t1 ≈ t4
-        end
+        @test t1 ≈ t4
         for (c, b) in blocks(t1)
             @test block(t1, c) ≈ b ≈ block(t3, c)
         end