Merge branch 'master' into feature/vinds

Author: mofeing

.github/workflows/CI.yml

@@ -48,7 +48,7 @@ jobs:
           include-all-prereleases: true
       - uses: julia-actions/cache@v1
         with:
-          cache-name: Unit Tests CI - Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
+          cache-name: CI / ${{ matrix.test_group }} / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
       - name: Add Julia registries
         run: |
           using Pkg
@@ -63,6 +63,52 @@ jobs:
       - uses: codecov/codecov-action@v3
         with:
           files: lcov.info
+  python:
+    name: ${{ matrix.test_group }} / Julia ${{ matrix.version }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '1'
+        test_group:
+          - python
+        os:
+          - ubuntu-latest
+        arch:
+          - x64
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+          include-all-prereleases: true
+      - uses: julia-actions/cache@v1
+        with:
+          cache-name: CI / ${{ matrix.test_group }} / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
+      - name: Set and export registry flavor preference
+        run: echo "JULIA_PKG_SERVER_REGISTRY_PREFERENCE=${JULIA_PKG_SERVER_REGISTRY_PREFERENCE:-eager}" >> ${GITHUB_ENV}
+        shell: bash
+      - name: Add Julia registries
+        run: |
+          using Pkg
+          pkg"registry add https://github.com/bsc-quantic/Registry.git"
+          pkg"registry add General"
+        shell: julia --color=yes {0}
+      - name: Run tests
+        run: |
+          julia --color=yes --code-coverage=user --depwarn=yes --project=test/python/ -e '
+            using Pkg
+            Pkg.instantiate()
+            Pkg.resolve()
+            include("test/python/runtests.jl")'
+        shell: bash
+      - uses: julia-actions/julia-buildpkg@v1
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v3
+        with:
+          files: lcov.info
   docs:
     name: Documentation
     runs-on: ubuntu-latest

.gitignore

@@ -420,6 +420,6 @@ dist
 .julia
 *.excalidraw
 archive/
-test/.CondaPkg/
+**/*/.CondaPkg/
 .CondaPkg/
 CondaPkg.toml

src/Ansatz.jl

@@ -165,7 +165,7 @@ function inds(kwargs::NamedTuple{(:bond,)}, tn::AbstractAnsatz)
     return only(inds(tensor1) ∩ inds(tensor2))
 end
 
-# TODO fix this properly when we do the mapping 
+# TODO fix this properly when we do the mapping
 function tensors(kwargs::NamedTuple{(:at,),Tuple{L}}, tn::AbstractAnsatz) where {L<:Lane}
     hassite(tn, Site(kwargs.at)) && return tensors(tn; at=Site(kwargs.at))
     hassite(tn, Site(kwargs.at; dual=true)) && return tensors(tn; at=Site(kwargs.at; dual=true))
@@ -379,7 +379,8 @@ Compute the expectation value of an observable on a [`AbstractAnsatz`](@ref) Ten
 function expect(ψ::AbstractAnsatz, observable; bra=adjoint(ψ))
     @assert socket(ψ) == State() "ψ must be a state"
     @assert socket(bra) == State(; dual=true) "bra must be a dual state"
-    contract(merge(ψ, observable, bra))
+
+    return expect(form(ψ), ψ, observable; bra)
 end
 
 function expect(ψ::AbstractAnsatz, observables::AbstractVecOrTuple; bra=adjoint(ψ))
@@ -388,6 +389,50 @@ function expect(ψ::AbstractAnsatz, observables::AbstractVecOrTuple; bra=adjoint
     end
 end
 
+function expect(::NonCanonical, ψ::AbstractAnsatz, observable; bra=adjoint(ψ))
+    return contract(merge(ψ, observable, bra))
+end
+
+# TODO: Try to find a better way to do this
+function expect(::MixedCanonical, ψ::AbstractAnsatz, observable; bra=adjoint(ψ))
+    return contract(merge(ψ, observable, bra))
+end
+
+function expect(::Canonical, ψ::Tenet.AbstractAnsatz, observable; bra=adjoint(ψ))
+    obs_sites = unique(id.(sites(observable)))
+
+    ket_Λ = []
+    bra_Λ = []
+    ket_tensors = []
+    bra_tensors = []
+    for i in obs_sites
+        replace!(observable, inds(observable; at=Site(i)) => Symbol(:input, i))
+        replace!(observable, inds(observable; at=Site(i; dual=true)) => Symbol(:output, i))
+        replace!(ψ, inds(ψ; at=Site(i)) => Symbol(:input, i))
+        replace!(bra, inds(bra; at=Site(i; dual=true)) => Symbol(:output, i))
+
+        replace!(bra, inds(bra; bond=(Lane(i), Lane(i + 1))) => inds(ψ; bond=(Lane(i), Lane(i + 1))))
+        replace!(bra, inds(bra; bond=(Lane(i - 1), Lane(i))) => inds(ψ; bond=(Lane(i - 1), Lane(i))))
+
+        push!(ket_Λ, tensors(ψ; bond=(Lane(i - 1), Lane(i))))
+        push!(bra_Λ, tensors(bra; bond=(Lane(i - 1), Lane(i))))
+
+        push!(ket_tensors, tensors(ψ; at=Site(i)))
+        push!(bra_tensors, tensors(bra; at=Site(i; dual=true)))
+    end
+
+    push!(ket_Λ, tensors(ψ; bond=(Lane(obs_sites[end]), Lane(obs_sites[end] + 1))))
+    push!(bra_Λ, tensors(bra; bond=(Lane(obs_sites[end]), Lane(obs_sites[end] + 1))))
+
+    t = contract(
+        contract(ket_Λ..., ket_tensors...; dims=[]),
+        contract(bra_Λ..., bra_tensors...; dims=[]),
+        tensors(Quantum(observable))[1],
+    )
+
+    return t
+end
+
 """
     evolve!(ψ::AbstractAnsatz, gate; threshold = nothing, maxdim = nothing, normalize = false)
 

src/TensorNetwork.jl

@@ -507,6 +507,8 @@ function Base.replace!(tn::AbstractTensorNetwork, pair::Pair{<:Tensor,<:Tensor})
     tn = TensorNetwork(tn)
     old_tensor, new_tensor = pair
 
+    old_tensor ∈ tn || throw(ArgumentError("Old tensor not found in TensorNetwork"))
+
     old_tensor === new_tensor && return tn
 
     issetequal(inds(new_tensor), inds(old_tensor)) || throw(ArgumentError("replacing tensor indices don't match"))

test/Project.toml

@@ -5,7 +5,6 @@ BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 ChainRulesTestUtils = "cdddcdb0-9152-4a09-a978-84456f9df70a"
-CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"
 Dagger = "d58978e5-989f-55fb-8d15-ea34adc7bf54"
 DeltaArrays = "10b0fc19-5ccc-4427-889b-d75dd6306188"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
@@ -19,17 +18,13 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 NetworkLayout = "46757867-2c16-5918-afeb-47bfcb05e46a"
 OMEinsum = "ebe7aa44-baf0-506c-a96f-8464559b3922"
-Permutations = "2ae35dd2-176d-5d53-8349-f30d82d94d4f"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
-PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
 Quac = "b9105292-1415-45cf-bff1-d6ccf71e6143"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Reactant = "3c362404-f566-11ee-1572-e11a4b42c853"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Tenet = "85d41934-b9cd-44e1-8730-56d86f15f3ec"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 Yao = "5872b779-8223-5990-8dd0-5abbb0748c8c"
 YaoBlocks = "418bc28f-b43b-5e0b-a6e7-61bbc1a2c1df"
 

test/integration/python/test_cirq.jl

@@ -0,0 +1 @@
+!CondaPkg.toml

test/integration/python/test_qibo.jl

@@ -0,0 +1,9 @@
+[deps]
+CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"
+PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+Tenet = "85d41934-b9cd-44e1-8730-56d86f15f3ec"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[sources]
+Tenet = {path = "../.."}

test/integration/python/test_qiskit.jl

@@ -0,0 +1,30 @@
+using Test
+using Tenet
+using SafeTestsets
+
+# add python test dependencies
+run(`cp $(joinpath(@__DIR__, "CondaPkg.toml")) $(joinpath(@__DIR__, "..", "..", "CondaPkg.toml"))`)
+using CondaPkg
+CondaPkg.update()
+using PythonCall
+
+@testset "Python" verbose = true begin
+    @safetestset "Cirq" begin
+        include("test_cirq.jl")
+    end
+
+    @safetestset "Quimb" begin
+        include("test_quimb.jl")
+    end
+
+    @safetestset "Qiskit" begin
+        include("test_qiskit.jl")
+    end
+
+    @safetestset "Qibo" begin
+        include("test_qibo.jl")
+    end
+end
+
+# cleaning
+run(`rm $(joinpath(@__DIR__, "..", "..", "CondaPkg.toml"))`)

test/integration/python/test_quimb.jl

@@ -0,0 +1,50 @@
+using Test
+using Tenet
+using PythonCall
+cirq = pyimport("cirq")
+
+@testset "LineQubit" begin
+    circuit = cirq.Circuit()
+    qubits = cirq.LineQubit.range(3)
+    circuit.append(cirq.H(qubits[0]))
+    circuit.append(cirq.H(qubits[1]))
+    circuit.append(cirq.CNOT(qubits[1], qubits[2]))
+    circuit.append(cirq.CNOT(qubits[0], qubits[2]))
+    circuit.append(cirq.H(qubits[0]))
+    circuit.append(cirq.H(qubits[1]))
+    circuit.append(cirq.H(qubits[2]))
+
+    circ = convert(Circuit, circuit)
+    @test issetequal(sites(circ; set=:inputs), Site.([0, 1, 2]; dual=true))
+    @test issetequal(sites(circ; set=:outputs), Site.([0, 1, 2]))
+    @test Tenet.ntensors(circ) == 7
+    @test issetequal(
+        moments(circ),
+        [Tenet.Moment.(Ref(Lane(0)), 1:4)..., Tenet.Moment.(Ref(Lane(1)), 1:4)..., Tenet.Moment.(Ref(Lane(2)), 1:4)...],
+    )
+end
+
+@testset "GridQubit" begin
+    circuit = cirq.Circuit()
+    qubits = cirq.GridQubit.rect(3, 1)
+    circuit.append(cirq.H(qubits[0]))
+    circuit.append(cirq.H(qubits[1]))
+    circuit.append(cirq.CNOT(qubits[1], qubits[2]))
+    circuit.append(cirq.CNOT(qubits[0], qubits[2]))
+    circuit.append(cirq.H(qubits[0]))
+    circuit.append(cirq.H(qubits[1]))
+    circuit.append(cirq.H(qubits[2]))
+
+    circ = convert(Circuit, circuit)
+    @test issetequal(sites(circ; set=:inputs), Site.([(0, 0), (1, 0), (2, 0)]; dual=true))
+    @test issetequal(sites(circ; set=:outputs), Site.([(0, 0), (1, 0), (2, 0)]))
+    @test Tenet.ntensors(circ) == 7
+    @test issetequal(
+        moments(circ),
+        [
+            Tenet.Moment.(Ref(Lane(0, 0)), 1:4)...,
+            Tenet.Moment.(Ref(Lane(1, 0)), 1:4)...,
+            Tenet.Moment.(Ref(Lane(2, 0)), 1:4)...,
+        ],
+    )
+end