Skip to content
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
4 changes: 2 additions & 2 deletions lib/YaoBlocks/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ YaoArrayRegister = "e600142f-9330-5003-8abb-0ebd767abc51"

[weakdeps]
OpenQASM = "a8821629-a4c0-4df7-9e00-12969ff383a7"
PauliPropagation = "293282d5-3c99-4fb6-92d0-fd3280a19750"
PauliPropagation = "293282d5-3c99-4fb6-92d0-fd3280a19750"

[extensions]
OpenQASMExt = "OpenQASM"
Expand All @@ -41,7 +41,7 @@ LinearAlgebra = "1"
LuxurySparse = "0.8"
MLStyle = "0.3, 0.4"
OpenQASM = "2"
PauliPropagation = "0.4"
PauliPropagation = "0.4, 0.8"
Random = "1"
SparseArrays = "1"
StaticArrays = "0.12, 1.0"
Expand Down
9 changes: 5 additions & 4 deletions lib/YaoBlocks/ext/PauliPropagationExt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ result = overlapwithzero(psum) # Get expectation value
"""
function YaoBlocks.yao2paulipropagation(circuit::ChainBlock; observable)
circ = YaoBlocks.Optimise.to_basictypes(circuit)
n = nqubits(circ)
n = YaoBlocks.nqubits(circ)
gates = StaticGate[]

# Convert circuit gates
Expand Down Expand Up @@ -181,7 +181,8 @@ function YaoBlocks.paulipropagation2yao(n::Int, circ::AbstractVector{<:Gate}, th
return c
end

YaoBlocks.paulipropagation2yao(pc::PauliPropagationCircuit) = paulipropagation2yao(pc.n, pc.gates, Float64[])
YaoBlocks.paulipropagation2yao(pc::PauliPropagationCircuit) =
YaoBlocks.paulipropagation2yao(pc.n, pc.gates, Float64[])

function yao_to_pauli_gates!(gates::Vector{StaticGate}, g)
@match g.content begin
Expand Down Expand Up @@ -239,11 +240,11 @@ function cast_observable(observable::Scale)
return cast_observable(observable.content) * observable.alpha
end
function cast_observable(observable::KronBlock)
n = nqubits(observable)
n = YaoBlocks.nqubits(observable)
return PauliString(n, [yao_to_symbol(block) for block in observable.blocks], [loc[1] for loc in observable.locs])
end
function cast_observable(observable::PutBlock)
n = nqubits(observable)
n = YaoBlocks.nqubits(observable)
pauli = yao_to_symbol(observable.content)
locs = observable.locs[1]
return PauliString(n, pauli, locs)
Expand Down
21 changes: 11 additions & 10 deletions lib/YaoBlocks/test/pauli_propagation.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using YaoBlocks, PauliPropagation, YaoArrayRegister, Test
import YaoBlocks: nqubits, paulipropagation2yao
using Random

_isequal(a::GA, b::GB) where {GA<:Gate, GB<:Gate} = all([getproperty(a, pn) == getproperty(b, pn) for pn in fieldnames(GA)])
Expand All @@ -16,9 +17,9 @@ _isequal(a::Vector{GA}, b::Vector{GB}) where {GA<:Gate, GB<:Gate} = all(_isequal
# Test that observable is a PauliSum
@test pc.observable isa PauliSum
# Test round-trip conversion
yaocirc2 = paulipropagation2yao(pc)
yaocirc2 = YaoBlocks.paulipropagation2yao(pc)
println(pc)
@test nqubits(yaocirc) == nqubits(yaocirc2)
@test YaoBlocks.nqubits(yaocirc) == YaoBlocks.nqubits(yaocirc2)
end

@testset "expectation value" begin
Expand Down Expand Up @@ -289,8 +290,8 @@ end
@test pc.observable isa PauliSum

# Test back conversion
yaocirc2 = paulipropagation2yao(pc)
@test nqubits(yaocirc) == nqubits(yaocirc2)
yaocirc2 = YaoBlocks.paulipropagation2yao(pc)
@test YaoBlocks.nqubits(yaocirc) == YaoBlocks.nqubits(yaocirc2)

# Test propagation works
psum = propagate(pc)
Expand Down Expand Up @@ -331,8 +332,8 @@ end
@test getfield(pc_cz.gates[2], :symbol) == :CZ

# Test round-trip for controlled gates
circ_back = paulipropagation2yao(pc_cnot)
@test nqubits(circ_back) == n
circ_back = YaoBlocks.paulipropagation2yao(pc_cnot)
@test YaoBlocks.nqubits(circ_back) == n
@test length(circ_back) == 3

# Test propagation with control gates
Expand Down Expand Up @@ -410,8 +411,8 @@ end
@test exp_val isa Real

# Test round-trip conversion
circ_back = paulipropagation2yao(pc_zz)
@test nqubits(circ_back) == n
circ_back = YaoBlocks.paulipropagation2yao(pc_zz)
@test YaoBlocks.nqubits(circ_back) == n
@test length(circ_back) == 3
end

Expand Down Expand Up @@ -443,8 +444,8 @@ end
@test exp_val isa Real

# Test round-trip
circ_back = paulipropagation2yao(pc)
@test nqubits(circ_back) == n
circ_back = YaoBlocks.paulipropagation2yao(pc)
@test YaoBlocks.nqubits(circ_back) == n
@test length(circ_back) == 7
end

Expand Down
Loading