Merge branch 'master' into feature/normalize-for-canonical

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

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

test/python/.gitignore

@@ -0,0 +1,23 @@
+using Test
+using Tenet
+using PythonCall
+qibo = pyimport("qibo")
+
+circuit = qibo.Circuit(3)
+circuit.add(qibo.gates.H(0))
+circuit.add(qibo.gates.H(1))
+circuit.add(qibo.gates.CNOT(1, 2))
+circuit.add(qibo.gates.CNOT(0, 2))
+circuit.add(qibo.gates.H(0))
+circuit.add(qibo.gates.H(1))
+circuit.add(qibo.gates.H(2))
+
+circ = convert(Circuit, circuit)
+@test circ isa 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)...],
+)

test/CondaPkg.toml test/python/CondaPkg.toml

@@ -0,0 +1,23 @@
+using Test
+using Tenet
+using PythonCall
+qiskit = pyimport("qiskit")
+
+circuit = qiskit.QuantumCircuit(3)
+circuit.h(0)
+circuit.h(1)
+circuit.cx(1, 2)
+circuit.cx(0, 2)
+circuit.h(0)
+circuit.h(1)
+circuit.h(2)
+
+tn = convert(Circuit, circuit)
+@test tn isa Circuit
+@test issetequal(sites(tn; set=:inputs), Site.([1, 2, 3]; dual=true))
+@test issetequal(sites(tn; set=:outputs), Site.([1, 2, 3]))
+@test Tenet.ntensors(tn) == 7
+@test issetequal(
+    moments(tn),
+    [Tenet.Moment.(Ref(Lane(1)), 1:4)..., Tenet.Moment.(Ref(Lane(2)), 1:4)..., Tenet.Moment.(Ref(Lane(3)), 1:4)...],
+)

test/python/Project.toml

@@ -0,0 +1,19 @@
+using Test
+using Tenet
+using PythonCall
+qtn = pyimport("quimb.tensor")
+
+# NOTE quimb.circuit.Circuit splits gates by default
+qc = qtn.Circuit(3; gate_opts=Dict(["contract" => false]))
+gates = [("H", 0), ("H", 1), ("CNOT", 1, 2), ("CNOT", 0, 2), ("H", 0), ("H", 1), ("H", 2)]
+qc.apply_gates(gates)
+
+tn = convert(Quantum, qc)
+@test issetequal(sites(tn; set=:inputs), adjoint.(Site.([0, 1, 2])))
+@test issetequal(sites(tn; set=:outputs), Site.([0, 1, 2]))
+@test Tenet.ntensors(tn) == 7
+
+tn = convert(Quantum, qc.psi)
+@test isempty(sites(tn; set=:inputs))
+@test issetequal(sites(tn; set=:outputs), Site.([0, 1, 2]))
+@test Tenet.ntensors(tn) == 10