Upgrade to NamedDimsArrays.jl v0.14 (#106)

Author: mtfishman

Project.toml

@@ -1,7 +1,7 @@
 name = "ITensorBase"
 uuid = "4795dd04-0d67-49bb-8f44-b89c448a1dc7"
 authors = ["ITensor developers <support@itensor.org> and contributors"]
-version = "0.4.5"
+version = "0.5.0"
 
 [deps]
 Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
@@ -13,7 +13,7 @@ TensorAlgebra = "68bd88dc-f39d-4e12-b2ca-f046b68fcc6a"
 [compat]
 Accessors = "0.1.39"
 ConstructionBase = "1.6.0"
-NamedDimsArrays = "0.13"
+NamedDimsArrays = "0.14"
 Random = "1.10"
 TensorAlgebra = "0.3, 0.4, 0.5, 0.6"
 julia = "1.10"

docs/Project.toml

@@ -9,6 +9,6 @@ ITensorBase = {path = ".."}
 
 [compat]
 Documenter = "1"
-ITensorBase = "0.4"
+ITensorBase = "0.5"
 Literate = "2"
-NamedDimsArrays = "0.13"
+NamedDimsArrays = "0.14"

examples/Project.toml

@@ -7,6 +7,6 @@ NamedDimsArrays = "60cbd0c0-df58-4cb7-918c-6f5607b73fde"
 ITensorBase = {path = ".."}
 
 [compat]
-ITensorBase = "0.4"
+ITensorBase = "0.5"
 LinearAlgebra = "1.10"
-NamedDimsArrays = "0.13"
+NamedDimsArrays = "0.14"

src/abstractitensor.jl

@@ -1,5 +1,5 @@
-using NamedDimsArrays: NamedDimsArrays, AbstractNamedDimsArray, NamedDimsArray, denamed,
-    dimnames, inds, mapinds
+using NamedDimsArrays: NamedDimsArrays, AbstractNamedDimsArray, LittleSet, NamedDimsArray,
+    denamed, dimnames, inds, mapinds
 
 abstract type AbstractITensor <: AbstractNamedDimsArray{Any, Any} end
 
@@ -8,21 +8,16 @@ NamedDimsArrays.nameddimsconstructor(::Type{<:IndexName}) = ITensor
 Base.ndims(::Type{<:AbstractITensor}) = Any
 
 struct ITensor <: AbstractITensor
-    parent::AbstractArray
-    inds
-    function ITensor(parent::AbstractArray, dims)
-        # This checks the shapes of the inputs.
-        inds = NamedDimsArrays.to_inds(parent, dims)
-        return new(parent, inds)
+    denamed::AbstractArray
+    dimnames
+    function ITensor(denamed::AbstractArray, dimnames)
+        ndims(denamed) == length(dimnames) ||
+            throw(ArgumentError("Number of named dims must match ndims."))
+        all(dimname -> dimname isa IndexName, dimnames) ||
+            throw(ArgumentError("All dimnames must be of type IndexName."))
+        return new(denamed, dimnames)
     end
 end
-Base.parent(a::ITensor) = getfield(a, :parent)
-NamedDimsArrays.inds(a::ITensor) = getfield(a, :inds)
-NamedDimsArrays.denamed(a::ITensor) = parent(a)
-
-function ITensor(parent::AbstractArray, i1::Index, i_rest::Index...)
-    return ITensor(parent, (i1, i_rest...))
-end
-function ITensor(parent::AbstractArray)
-    return ITensor(parent, ())
-end
+NamedDimsArrays.dimnames(a::ITensor) = LittleSet(a.dimnames)
+NamedDimsArrays.denamed(a::ITensor) = a.denamed
+Base.parent(a::ITensor) = denamed(a)

test/Project.toml

@@ -12,9 +12,9 @@ ITensorBase = {path = ".."}
 
 [compat]
 Aqua = "0.8.9"
-ITensorBase = "0.4"
+ITensorBase = "0.5"
 LinearAlgebra = "1.10"
-NamedDimsArrays = "0.13"
+NamedDimsArrays = "0.14"
 SafeTestsets = "0.1"
 Suppressor = "0.2"
 Test = "1.10"

test/test_basics.jl

@@ -70,18 +70,21 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64})
         elt = Float64
         i, j = Index.((2, 2))
         x = randn(elt, 2, 2)
-        for a in (ITensor(x, i, j), ITensor(x, (i, j)))
-            @test denamed(a) == x
-            @test plev(i) == 0
-            @test plev(prime(i)) == 1
-            @test length(tags(i)) == 0
-            a′ = mapinds(prime, a)
-            @test denamed(a′) == x
-            @test issetequal(inds(a′), (prime(i), prime(j)))
-        end
+        a = x[i, j]
+        @test denamed(a) == x
+        @test plev(i) == 0
+        @test plev(prime(i)) == 1
+        @test length(tags(i)) == 0
+        a′ = mapinds(prime, a)
+        @test denamed(a′) == x
+        @test issetequal(inds(a′), (prime(i), prime(j)))
 
-        @test_throws ErrorException ITensor(randn(elt, 2, 2), Index.((2, 3)))
-        @test_throws ErrorException ITensor(randn(elt, 4), Index.((2, 2)))
+        # For now, the `ITensor` constructor is strict and only accepts a collection of
+        # `IndexName` as dimnames.
+        @test_throws ArgumentError ITensor(randn(elt, 2, 2), Index.((2, 2)))
+        @test_throws ArgumentError ITensor(randn(elt, 2, 2), Index.((2, 3)))
+        @test_throws ArgumentError ITensor(randn(elt, 4), Index.((2, 2)))
+        @test_throws MethodError ITensor(randn(elt, 2, 2), Index(2), Index(2))
 
         i, j = Index.((3, 4))
         a = randn(elt, i, j)