Skip to content

site[s] convenient constructors for unit ranges/axes #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "QuantumOperatorDefinitions"
uuid = "826dd319-6fd5-459a-a990-3a4f214664bf"
authors = ["ITensor developers <[email protected]> and contributors"]
version = "0.1.5"
version = "0.1.6"

[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
end

function (rangetype::Type{<:Index})(t::SiteType)
return settag(rangetype(AbstractUnitRange(t)), "sitetype", String(name(t)))
i = rangetype(AbstractUnitRange(t))
i = settag(i, "sitetype", String(name(t)))
if haskey(t, :site)
i = settag(i, "site", string(t.site))

Check warning on line 29 in ext/QuantumOperatorDefinitionsITensorBaseExt/QuantumOperatorDefinitionsITensorBaseExt.jl

View check run for this annotation

Codecov / codecov/patch

ext/QuantumOperatorDefinitionsITensorBaseExt/QuantumOperatorDefinitionsITensorBaseExt.jl#L26-L29

Added lines #L26 - L29 were not covered by tests
end
return i

Check warning on line 31 in ext/QuantumOperatorDefinitionsITensorBaseExt/QuantumOperatorDefinitionsITensorBaseExt.jl

View check run for this annotation

Codecov / codecov/patch

ext/QuantumOperatorDefinitionsITensorBaseExt/QuantumOperatorDefinitionsITensorBaseExt.jl#L31

Added line #L31 was not covered by tests
end

# TODO: Define in terms of `OpName` directly, and define a generic
Expand Down
23 changes: 23 additions & 0 deletions src/sitetype.jl
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,26 @@
# TODO: Decide on this.
# TODO: Move to `sitetype.jl`.
default_sitetype() = SiteType"Qubit"()

# TODO: Do we want to define this?
# (t::SiteType)() = AbstractUnitRange(t)

function site(rangetype::Type{<:AbstractUnitRange}, name::String; kwargs...)
return rangetype(SiteType(name; kwargs...))

Check warning on line 103 in src/sitetype.jl

View check run for this annotation

Codecov / codecov/patch

src/sitetype.jl#L102-L103

Added lines #L102 - L103 were not covered by tests
end
site(name::String; kwargs...) = site(AbstractUnitRange, name; kwargs...)

Check warning on line 105 in src/sitetype.jl

View check run for this annotation

Codecov / codecov/patch

src/sitetype.jl#L105

Added line #L105 was not covered by tests

function sites(rangetype::Type{<:AbstractUnitRange}, name::String, positions; kwargs...)
return map(position -> site(rangetype, name; site=position, kwargs...), positions)

Check warning on line 108 in src/sitetype.jl

View check run for this annotation

Codecov / codecov/patch

src/sitetype.jl#L107-L108

Added lines #L107 - L108 were not covered by tests
end
function sites(

Check warning on line 110 in src/sitetype.jl

View check run for this annotation

Codecov / codecov/patch

src/sitetype.jl#L110

Added line #L110 was not covered by tests
rangetype::Type{<:AbstractUnitRange}, name::String, npositions::Integer; kwargs...
)
return sites(rangetype, name, Base.OneTo(npositions); kwargs...)

Check warning on line 113 in src/sitetype.jl

View check run for this annotation

Codecov / codecov/patch

src/sitetype.jl#L113

Added line #L113 was not covered by tests
end
function sites(name::String, positions; kwargs...)
return sites(AbstractUnitRange, name, positions; kwargs...)

Check warning on line 116 in src/sitetype.jl

View check run for this annotation

Codecov / codecov/patch

src/sitetype.jl#L115-L116

Added lines #L115 - L116 were not covered by tests
end
function sites(name::String, npositions::Integer; kwargs...)
return sites(AbstractUnitRange, name, Base.OneTo(npositions); kwargs...)

Check warning on line 119 in src/sitetype.jl

View check run for this annotation

Codecov / codecov/patch

src/sitetype.jl#L118-L119

Added lines #L118 - L119 were not covered by tests
end
32 changes: 31 additions & 1 deletion test/test_basics.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using QuantumOperatorDefinitions: OpName, SiteType, ⊗, expand, op, opexpr, state, nsites
using QuantumOperatorDefinitions:
OpName, SiteType, ⊗, expand, nsites, op, opexpr, site, sites, state
using LinearAlgebra: Diagonal, I
using Test: @test, @testset

Expand Down Expand Up @@ -217,6 +218,35 @@ const elts = (real_elts..., complex_elts...)
@test op("X", 2) == op("X", Base.OneTo(2))
@test op("X", 3) == op("X", Base.OneTo(3))
end
@testset "site, sites" begin
s = site("Qudit"; dim=3)
@test s === Base.OneTo(3)

s = site(AbstractUnitRange{Int32}, "Qudit"; dim=3)
@test s === Base.OneTo(Int32(3))

for ss in (sites("Qudit", 4; dim=3), sites("Qudit", 2:5; dim=3))
@test length(ss) == 4
@test ss == map(Returns(Base.OneTo(3)), 1:4)
for s in ss
@test s === Base.OneTo(3)
end
end

for ss in (
sites(AbstractUnitRange{Int32}, "Qudit", 4; dim=3),
sites(AbstractUnitRange{Int32}, "Qudit", 2:5; dim=3),
)
@test length(ss) == 4
@test ss == map(Returns(Base.OneTo(3)), 1:4)
for s in ss
@test s === Base.OneTo(Int32(3))
end
end

ss = sites("Qudit", (1, 2, 3); dim=3)
@test ss === (Base.OneTo(3), Base.OneTo(3), Base.OneTo(3))
end
@testset "Electron/tJ" begin
for (ns, x) in (
(("0", "Emp"), [1, 0, 0, 0]),
Expand Down
31 changes: 29 additions & 2 deletions test/test_itensorbaseext.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using ITensorBase: ITensor, Index, gettag, prime, settag
using QuantumOperatorDefinitions: OpName, SiteType, StateName, op, state
using ITensorBase: ITensor, Index, gettag, hastag, prime, settag
using NamedDimsArrays: dename
using QuantumOperatorDefinitions: OpName, SiteType, StateName, op, site, sites, state
using Test: @test, @testset

@testset "ITensorBaseExt" begin
Expand Down Expand Up @@ -61,4 +62,30 @@ using Test: @test, @testset
@test a[i1′[2], i2′, i1[1], i2] == zeros(i2′, i2)
@test a[i1′[1], i2′, i1[2], i2] == zeros(i2′, i2)
@test a[i1′[2], i2′, i1[2], i2] == op("X", i2)

i = site(Index, "Qudit"; dim=3)
@test dename(i) == Base.OneTo(3)
@test gettag(i, "sitetype") == "Qudit"
@test !hastag(i, "site")

for is in (
sites(Index, "Qudit", 3; dim=3),
sites(Index, "Qudit", 1:3; dim=3),
sites(Index, "Qudit", (1, 2, 3); dim=3),
)
@test length(is) == 3
for (pos, i) in pairs(is)
@test dename(i) == Base.OneTo(3)
@test gettag(i, "sitetype") == "Qudit"
@test gettag(i, "site") == "$pos"
end
end

is = sites(Index, "Qudit", 2:4; dim=3)
@test dename(is[1]) == Base.OneTo(3)
@test gettag(is[1], "site") == "2"
@test dename(is[2]) == Base.OneTo(3)
@test gettag(is[2], "site") == "3"
@test dename(is[3]) == Base.OneTo(3)
@test gettag(is[3], "site") == "4"
end