Merge branch 'NDTensors_avoid_threadid' of github.com:ITensor/ITensors.jl into NDTensors_avoid_threadid

Author: mtfishman

NDTensors/Project.toml

@@ -1,7 +1,7 @@
 name = "NDTensors"
 uuid = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
 authors = ["Matthew Fishman <[email protected]>"]
-version = "0.4.6"
+version = "0.4.8"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"

NDTensors/src/abstractarray/diaginterface.jl

@@ -16,7 +16,11 @@ function diagstride(a::AbstractArray)
 end
 
 function diagindices(a::AbstractArray)
-  maxdiag = LinearIndices(a)[CartesianIndex(ntuple(Returns(diaglength(a)), ndims(a)))]
+  maxdiag = if isempty(a)
+    0
+  else
+    LinearIndices(a)[CartesianIndex(ntuple(Returns(diaglength(a)), ndims(a)))]
+  end
   return 1:diagstride(a):maxdiag
 end
 

NDTensors/test/test_diag.jl

@@ -13,6 +13,7 @@ using NDTensors:
   data,
   dense,
   diaglength,
+  diagindices,
   matrix,
   randomTensor,
   tensor
@@ -79,6 +80,15 @@ using .NDTensorsTestUtils: devices_list, is_supported_eltype
       @test S[i, i] == 2 * D[i, i]
     end
 
+    a = dev(tensor(Dense(randn(elt, 3)), (3,)))
+    @test diagindices(a) == 1:1:3
+    a = dev(tensor(Dense(randn(elt, 9)), (3, 3)))
+    @test diagindices(a) == 1:4:9
+    a = dev(tensor(Dense(randn(elt, 36)), (3, 4, 3)))
+    @test diagindices(a) == 1:16:33
+    a = dev(tensor(Dense(randn(elt, 0)), (3, 0)))
+    @test diagindices(a) == 1:1:0
+
     # Regression test for https://github.com/ITensor/ITensors.jl/issues/1199
     S = dev(tensor(Diag(randn(elt, 2)), (2, 2)))
     ## This was creating a `Dense{ReshapedArray{Adjoint{Matrix}}}` which, in mul!, was

Project.toml

@@ -1,7 +1,7 @@
 name = "ITensors"
 uuid = "9136182c-28ba-11e9-034c-db9fb085ebd5"
 authors = ["Matthew Fishman <[email protected]>", "Miles Stoudenmire <[email protected]>"]
-version = "0.9.4"
+version = "0.9.5"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/itensor.jl

@@ -148,16 +148,16 @@ ITensor(::AliasStyle, args...; kwargs...)::ITensor = error(
 Create a `Tensor` that stores a copy of the storage and
 indices of the input `ITensor`.
 """
-Tensor(T::ITensor)::Tensor = Tensor(NeverAlias(), T)
-Tensor(as::NeverAlias, T::ITensor)::Tensor = Tensor(AllowAlias(), copy(T))
+NDTensors.Tensor(T::ITensor)::Tensor = Tensor(NeverAlias(), T)
+NDTensors.Tensor(as::NeverAlias, T::ITensor)::Tensor = Tensor(AllowAlias(), copy(T))
 
 """
     tensor(::ITensor)
 
 Convert the `ITensor` to a `Tensor` that shares the same
 storage and indices as the `ITensor`.
 """
-Tensor(::AllowAlias, A::ITensor) = A.tensor
+NDTensors.Tensor(::AllowAlias, A::ITensor) = A.tensor
 
 """
     ITensor([::Type{ElT} = Float64, ]inds)