Update VectorInterface 0.4

Jutho · Sep 8, 2023 · f2b6ff0 · f2b6ff0
1 parent 868d1df
commit f2b6ff0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/Project.toml b/Project.toml
@@ -26,7 +26,7 @@ LRUCache = "1.0.2"
 Strided = "2"
 TensorOperations = "4.0.2"
 TupleTools = "1.1"
-VectorInterface = "0.3"
+VectorInterface = "0.4"
 WignerSymbols = "1,2"
 julia = "1.6"
 

diff --git a/src/TensorKit.jl b/src/TensorKit.jl
@@ -92,7 +92,6 @@ using TupleTools: StaticLength
 using Strided
 
 using VectorInterface
-using VectorInterface: _zero, _one
 
 using TensorOperations: TensorOperations, @tensor, @tensoropt, @ncon, ncon
 using TensorOperations: IndexTuple, Index2Tuple, linearize, Backend

diff --git a/src/tensors/tensoroperations.jl b/src/tensors/tensoroperations.jl
@@ -188,11 +188,7 @@ function trace_permute!(tdst::AbstractTensorMap{S,N₁,N₂},
         cod = codomain(tsrc)
         dom = domain(tsrc)
         n = length(cod)
-        if iszero(β)
-            fill!(tdst, β)
-        elseif β != 1
-            mul!(tdst, β, tdst)
-        end
+        VectorInterface.scale!(tdst, β)
         r₁ = (p₁..., q₁...)
         r₂ = (p₂..., q₂...)
         for (f₁, f₂) in fusiontrees(tsrc)
@@ -209,7 +205,7 @@ function trace_permute!(tdst::AbstractTensorMap{S,N₁,N₂},
                 C = tdst[f₁′′, f₂′′]
                 A = tsrc[f₁, f₂]
                 α′ = α * coeff
-                TO.tensortrace!(C, (p₁, p₂), A, (q₁, q₂), :N, α′, true, backend...)
+                TO.tensortrace!(C, (p₁, p₂), A, (q₁, q₂), :N, α′, One(), backend...)
             end
         end
     end

diff --git a/src/tensors/vectorinterface.jl b/src/tensors/vectorinterface.jl
@@ -18,7 +18,7 @@ VectorInterface.zerovector!!(t::AbstractTensorMap) = zerovector!(t)
 # scale, scale! & scale!!
 #-------------------------
 function VectorInterface.scale(t::AbstractTensorMap, α::Number)
-    T = Base.promote_op(scale, scalartype(t), scalartype(α))
+    T = VectorInterface.promote_scale(t, α)
     return scale!(similar(t, T), t, α)
 end
 function VectorInterface.scale!(t::AbstractTensorMap, α::Number)
@@ -28,12 +28,10 @@ function VectorInterface.scale!(t::AbstractTensorMap, α::Number)
     return t
 end
 function VectorInterface.scale!!(t::AbstractTensorMap, α::Number)
-    α === _one && return t
-    α === _zero && return zerovector!!(t)
-    T = Base.promote_op(scale, scalartype(t), scalartype(α))
+    α === One() && return t
+    T = VectorInterface.promote_scale(t, α)
     return T <: scalartype(t) ? scale!(t, α) : scale(t, α)
 end
-
 function VectorInterface.scale!(ty::AbstractTensorMap, tx::AbstractTensorMap, α::Number)
     space(ty) == space(tx) || throw(SpaceMismatch("$(space(ty)) ≠ $(space(tx))"))
     for c in blocksectors(tx)
@@ -42,7 +40,7 @@ function VectorInterface.scale!(ty::AbstractTensorMap, tx::AbstractTensorMap, α
     return ty
 end
 function VectorInterface.scale!!(ty::AbstractTensorMap, tx::AbstractTensorMap, α::Number)
-    T = Base.promote_op(scale, scalartype(tx), scalartype(α))
+    T = VectorInterface.promote_scale(tx, α)
     if T <: scalartype(ty)
         return scale!(ty, tx, α)
     else
@@ -54,23 +52,23 @@ end
 #-------------------
 # TODO: remove VectorInterface from calls to `add!` when `TensorKit.add!` is renamed
 function VectorInterface.add(ty::AbstractTensorMap, tx::AbstractTensorMap,
-                             α::Number=_one, β::Number=_one)
+                             α::Number, β::Number)
     space(ty) == space(tx) || throw(SpaceMismatch("$(space(ty)) ≠ $(space(tx))"))
-    T = Base.promote_op(VectorInterface.add, scalartype(ty), scalartype(tx), scalartype(α), scalartype(β))
+    T = VectorInterface.promote_add(ty, tx, α, β)
     return VectorInterface.add!(scale!(similar(ty, T), ty, β), tx, α)
 end
 function VectorInterface.add!(ty::AbstractTensorMap, tx::AbstractTensorMap,
-                              α::Number=_one, β::Number=_one)
+                              α::Number, β::Number)
     space(ty) == space(tx) || throw(SpaceMismatch("$(space(ty)) ≠ $(space(tx))"))
     for c in blocksectors(tx)
         VectorInterface.add!(block(ty, c), block(tx, c), α, β)
     end
     return ty
 end
 function VectorInterface.add!!(ty::AbstractTensorMap, tx::AbstractTensorMap,
-                               α::Number=_one, β::Number=_one)
-    T = Base.promote_op(VectorInterface.add, scalartype(ty), scalartype(tx), scalartype(α),
-                        scalartype(β))
+                               α::Number, β::Number)
+    # spacecheck is done in add(!)
+    T = VectorInterface.promote_add(ty, tx, α, β)
     if T <: scalartype(ty)
         return VectorInterface.add!(ty, tx, α, β)
     else
@@ -84,7 +82,7 @@ function VectorInterface.inner(tx::AbstractTensorMap, ty::AbstractTensorMap)
     space(tx) == space(ty) || throw(SpaceMismatch("$(space(tx)) ≠ $(space(ty))"))
     InnerProductStyle(tx) === EuclideanProduct() ||
         throw(ArgumentError("dot requires Euclidean inner product"))
-    T = Base.promote_op(VectorInterface.inner, scalartype(tx), scalartype(ty))
+    T = VectorInterface.promote_inner(tx, ty)
     s = zero(T)
     for c in blocksectors(tx)
         s += convert(T, dim(c)) * dot(block(tx, c), block(ty, c))