From c5f8119f3a23503140f312f5ff86abeacd42cb7f Mon Sep 17 00:00:00 2001 From: mtfishman Date: Thu, 8 Jan 2026 17:16:30 -0500 Subject: [PATCH] Upgrade to NamedDimsArrays.jl v0.13 --- Project.toml | 4 ++-- README.md | 6 +++--- docs/Project.toml | 2 +- examples/Project.toml | 2 +- examples/README.jl | 6 +++--- src/abstractitensor.jl | 12 ++++++------ src/index.jl | 10 +++++----- test/Project.toml | 2 +- test/test_basics.jl | 18 +++++++++--------- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Project.toml b/Project.toml index a1fbb95..e85ef7e 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ITensorBase" uuid = "4795dd04-0d67-49bb-8f44-b89c448a1dc7" authors = ["ITensor developers and contributors"] -version = "0.4.3" +version = "0.4.4" [deps] Accessors = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697" @@ -22,7 +22,7 @@ ConstructionBase = "1.6.0" FillArrays = "1.13" LinearAlgebra = "1.10" MapBroadcast = "0.1.5" -NamedDimsArrays = "0.11.1, 0.12" +NamedDimsArrays = "0.13" Random = "1.10" TensorAlgebra = "0.3, 0.4, 0.5, 0.6" UnallocatedArrays = "0.1.1" diff --git a/README.md b/README.md index a49e881..f89d849 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ julia> Pkg.add("ITensorBase") ````julia using ITensorBase: ITensorBase, ITensor, Index using LinearAlgebra: qr -using NamedDimsArrays: aligndims, unname +using NamedDimsArrays: aligndims, dename using Test: @test i = Index(2) j = Index(2) @@ -55,9 +55,9 @@ a = randn(i, j) a′ = randn(j, i) b = randn(j, k) c = a * b -@test unname(c, (i, k)) ≈ unname(a, (i, j)) * unname(b, (j, k)) +@test dename(c, (i, k)) ≈ dename(a, (i, j)) * dename(b, (j, k)) d = a + a′ -@test unname(d, (i, j)) ≈ unname(a, (i, j)) + unname(a′, (i, j)) +@test dename(d, (i, j)) ≈ dename(a, (i, j)) + dename(a′, (i, j)) @test a ≈ aligndims(a, (j, i)) q, r = qr(a, (i,)) @test q * r ≈ a diff --git a/docs/Project.toml b/docs/Project.toml index 8f93d07..9dc08e4 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -11,4 +11,4 @@ ITensorBase = {path = ".."} Documenter = "1" ITensorBase = "0.4" Literate = "2" -NamedDimsArrays = "0.11, 0.12" +NamedDimsArrays = "0.13" diff --git a/examples/Project.toml b/examples/Project.toml index 4e52ed3..c69ee2c 100644 --- a/examples/Project.toml +++ b/examples/Project.toml @@ -9,4 +9,4 @@ ITensorBase = {path = ".."} [compat] ITensorBase = "0.4" LinearAlgebra = "1.10" -NamedDimsArrays = "0.11, 0.12" +NamedDimsArrays = "0.13" diff --git a/examples/README.jl b/examples/README.jl index a965586..27e2dd2 100644 --- a/examples/README.jl +++ b/examples/README.jl @@ -45,7 +45,7 @@ julia> Pkg.add("ITensorBase") using ITensorBase: ITensorBase, ITensor, Index using LinearAlgebra: qr -using NamedDimsArrays: aligndims, unname +using NamedDimsArrays: aligndims, dename using Test: @test i = Index(2) j = Index(2) @@ -56,9 +56,9 @@ a = randn(i, j) a′ = randn(j, i) b = randn(j, k) c = a * b -@test unname(c, (i, k)) ≈ unname(a, (i, j)) * unname(b, (j, k)) +@test dename(c, (i, k)) ≈ dename(a, (i, j)) * dename(b, (j, k)) d = a + a′ -@test unname(d, (i, j)) ≈ unname(a, (i, j)) + unname(a′, (i, j)) +@test dename(d, (i, j)) ≈ dename(a, (i, j)) + dename(a′, (i, j)) @test a ≈ aligndims(a, (j, i)) q, r = qr(a, (i,)) @test q * r ≈ a diff --git a/src/abstractitensor.jl b/src/abstractitensor.jl index fe45e4d..8757331 100644 --- a/src/abstractitensor.jl +++ b/src/abstractitensor.jl @@ -1,5 +1,5 @@ using MapBroadcast: Mapped -using NamedDimsArrays: NamedDimsArrays, AbstractNamedDimsArray, NamedDimsArray, dename, +using NamedDimsArrays: NamedDimsArrays, AbstractNamedDimsArray, NamedDimsArray, denamed, dimnames, inds, mapinds abstract type AbstractITensor <: AbstractNamedDimsArray{Any, Any} end @@ -21,7 +21,7 @@ specify_eltype(a::AbstractArray, elt::Type) = a # TODO: Use `adapt` to reach down into the storage. function specify_eltype!(a::AbstractITensor, elt::Type) - setdenamed!(a, specify_eltype(dename(a), elt)) + setdenamed!(a, specify_eltype(denamed(a), elt)) return a end @@ -30,7 +30,7 @@ allocate!(a::AbstractArray) = a # TODO: Use `adapt` to reach down into the storage. function allocate!(a::AbstractITensor) - setdenamed!(a, allocate(dename(a))) + setdenamed!(a, allocate(denamed(a))) return a end @@ -64,7 +64,7 @@ mutable struct ITensor <: AbstractITensor end Base.parent(a::ITensor) = getfield(a, :parent) NamedDimsArrays.inds(a::ITensor) = getfield(a, :inds) -NamedDimsArrays.dename(a::ITensor) = parent(a) +NamedDimsArrays.denamed(a::ITensor) = parent(a) function ITensor(parent::AbstractArray, i1::Index, i_rest::Index...) return ITensor(parent, (i1, i_rest...)) @@ -80,12 +80,12 @@ setdenamed!(a::ITensor, denamed) = (a.parent = denamed) function ITensor(elt::Type, I1::Index, I_rest::Index...) I = (I1, I_rest...) # TODO: Use `FillArrays.Zeros`. - return ITensor(zeros(elt, length.(dename.(I))...), I) + return ITensor(zeros(elt, length.(denamed.(I))...), I) end function ITensor(I1::Index, I_rest::Index...) I = (I1, I_rest...) - return ITensor(Zeros{UnspecifiedZero}(length.(dename.(I))...), I) + return ITensor(Zeros{UnspecifiedZero}(length.(denamed.(I))...), I) end function ITensor() diff --git a/src/index.jl b/src/index.jl index 1e06555..06cee98 100644 --- a/src/index.jl +++ b/src/index.jl @@ -1,6 +1,6 @@ using Accessors: @set using NamedDimsArrays: NamedDimsArrays, AbstractName, AbstractNamedInteger, - AbstractNamedUnitRange, AbstractNamedVector, dename, name, randname, setname + AbstractNamedUnitRange, AbstractNamedVector, denamed, name, randname, setname using Random: Random, AbstractRNG tagpairstring(pair::Pair) = repr(first(pair)) * "=>" * repr(last(pair)) @@ -87,7 +87,7 @@ struct IndexVal{Value <: Integer} <: AbstractNamedInteger{Value, IndexName} end # Interface -NamedDimsArrays.dename(i::IndexVal) = i.value +NamedDimsArrays.denamed(i::IndexVal) = i.value NamedDimsArrays.name(i::IndexVal) = i.name # Constructor @@ -136,7 +136,7 @@ noprime(i::Index) = setname(i, noprime(name(i))) # Interface # TODO: Overload `Base.parent` instead. -NamedDimsArrays.dename(i::Index) = i.value +NamedDimsArrays.denamed(i::Index) = i.value NamedDimsArrays.name(i::Index) = i.name # Constructor @@ -156,7 +156,7 @@ function primestring(plev) end function Base.show(io::IO, i::Index) - lenstr = "length=$(dename(length(i)))" + lenstr = "length=$(denamed(length(i)))" idstr = "|id=$(id(i) % 1000)" tagsstr = !isempty(tags(i)) ? "|$(tagsstring(tags(i)))" : "" primestr = primestring(plev(i)) @@ -173,7 +173,7 @@ end # Interface # TODO: Overload `Base.parent` instead. -NamedDimsArrays.dename(i::NoncontiguousIndex) = i.value +NamedDimsArrays.denamed(i::NoncontiguousIndex) = i.value NamedDimsArrays.name(i::NoncontiguousIndex) = i.name # Constructor diff --git a/test/Project.toml b/test/Project.toml index c9c3379..d519f62 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -14,7 +14,7 @@ ITensorBase = {path = ".."} Aqua = "0.8.9" ITensorBase = "0.4" LinearAlgebra = "1.10" -NamedDimsArrays = "0.11, 0.12" +NamedDimsArrays = "0.13" SafeTestsets = "0.1" Suppressor = "0.2" Test = "1.10" diff --git a/test/test_basics.jl b/test/test_basics.jl index fd6f38e..0f5f088 100644 --- a/test/test_basics.jl +++ b/test/test_basics.jl @@ -1,6 +1,6 @@ using ITensorBase: ITensorBase, ITensor, Index, IndexName, gettag, hastag, plev, prime, setplev, settag, tags, unsettag -using NamedDimsArrays: dename, inds, mapinds, name, named +using NamedDimsArrays: dename, denamed, inds, mapinds, name, named using LinearAlgebra: factorize using Test: @test, @test_broken, @test_throws, @testset @@ -47,8 +47,8 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64}) i = Index(Base.OneTo(2)) @test length(i) == named(2, name(i)) - @test dename(length(i)) == 2 - @test dename(i) == 1:2 + @test denamed(length(i)) == 2 + @test denamed(i) == 1:2 @test plev(i) == 0 @test length(tags(i)) == 0 @@ -71,12 +71,12 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64}) i, j = Index.((2, 2)) x = randn(elt, 2, 2) for a in (ITensor(x, i, j), ITensor(x, (i, j))) - @test dename(a) == x + @test denamed(a) == x @test plev(i) == 0 @test plev(prime(i)) == 1 @test length(tags(i)) == 0 a′ = mapinds(prime, a) - @test dename(a′) == x + @test denamed(a′) == x @test issetequal(inds(a′), (prime(i), prime(j))) end @@ -88,14 +88,14 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64}) a′ = Array(a) @test eltype(a′) === elt @test a′ isa Matrix{elt} - @test a′ == dename(a) + @test a′ == denamed(a) i, j = Index.((3, 4)) a = randn(elt, i, j) for a′ in (Array{Float32}(a), Matrix{Float32}(a)) @test eltype(a′) === Float32 @test a′ isa Matrix{Float32} - @test a′ == Float32.(dename(a)) + @test a′ == Float32.(denamed(a)) end i, j, k = Index.((2, 2, 2)) @@ -103,8 +103,8 @@ const elts = (Float32, Float64, Complex{Float32}, Complex{Float64}) b = randn(elt, k, i, j) copyto!(a, b) @test a == b - @test dename(a) == dename(b, (i, j, k)) - @test dename(a) == permutedims(dename(b), (2, 3, 1)) + @test denamed(a) == dename(b, (i, j, k)) + @test denamed(a) == permutedims(denamed(b), (2, 3, 1)) end @testset "show" begin id = rand(UInt64)