From 8e878b562e8204c1791fb8f8be0edaa4cb4c77ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jinguo=20Liu=20=28=E5=88=98=E9=87=91=E5=9B=BD=29?= Date: Fri, 12 Apr 2024 11:22:09 +0800 Subject: [PATCH] fix issue 432 (#435) * fix issue 432 * update * Update lib/YaoArrayRegister/src/operations.jl Co-authored-by: Rogerluo --------- Co-authored-by: Rogerluo --- lib/YaoAPI/src/blocks.jl | 2 +- lib/YaoArrayRegister/src/operations.jl | 52 +++++++++++++----------- lib/YaoArrayRegister/test/operations.jl | 6 +-- lib/YaoBlocks/src/YaoBlocks.jl | 1 + lib/YaoBlocks/src/blocktools.jl | 53 +++++++++++++++---------- lib/YaoBlocks/src/utils.jl | 9 +++++ lib/YaoBlocks/test/measure_ops.jl | 6 +-- test/easybuild/hadamardtest.jl | 4 +- 8 files changed, 77 insertions(+), 56 deletions(-) diff --git a/lib/YaoAPI/src/blocks.jl b/lib/YaoAPI/src/blocks.jl index 36ed80c2..f407c273 100644 --- a/lib/YaoAPI/src/blocks.jl +++ b/lib/YaoAPI/src/blocks.jl @@ -521,7 +521,7 @@ chain julia> expect(op, r) -0.7071067811865474 + 0.0im +0.7071067811865474 ``` """ @interface expect diff --git a/lib/YaoArrayRegister/src/operations.jl b/lib/YaoArrayRegister/src/operations.jl index 0f35c450..ca6922cc 100644 --- a/lib/YaoArrayRegister/src/operations.jl +++ b/lib/YaoArrayRegister/src/operations.jl @@ -158,16 +158,28 @@ for op in [:*, :/] end end -function Base.:*(bra::AdjointRegister{D,<:ArrayReg}, ket::ArrayReg{D}) where D - if nremain(bra) == nremain(ket) - return dot(relaxedvec(parent(bra)), relaxedvec(ket)) - elseif nremain(bra) == 0 # |remain> - return ArrayReg{D}(state(bra) * state(ket)) - else - error( - "partially contract ⟨bra|ket⟩ is not supported, expect ⟨bra| to be fully actived. nactive(bra)/nqudits(bra)=$(nactive(bra))/$(nqudits(bra))", +""" +$TYPEDSIGNATURES + +The overlap between `ket` and `bra`, which is only defined for two fully activated equal sized registers. +It is only slightly different from [`inner_product`](@ref) in that it always returns a complex number. + +### Examples +```jldoctest; setup=:(using YaoArrayRegister) +julia> reg1 = ghz_state(3); + +julia> reg2 = uniform_state(3); + +julia> reg1' * reg2 +0.5 + 0.0im +``` +""" +function Base.:*(bra::AdjointRegister{D,<:ArrayReg}, ket::ArrayReg{D})::Number where D + # check the register sizes + nqudits(bra) == nqudits(ket) && nremain(bra) == nremain(ket) || error( + "partially contract ⟨bra|ket⟩ is not supported, expect ⟨bra| and |ket⟩ to have the same size. Got nactive(bra)/nqudits(bra)=$(nactive(bra))/$(nqudits(bra)), nactive(ket)/nqudits(ket)=$(nactive(ket))/$(nqudits(ket))", ) - end + return dot(relaxedvec(parent(bra)), relaxedvec(ket)) end Base.:*(bra::AdjointRegister{D,<:BatchedArrayReg{D}}, ket::BatchedArrayReg{D}) where D = bra .* ket @@ -175,23 +187,15 @@ function Base.:*( bra::AdjointRegister{D,<:BatchedArrayReg{D, T1, <:Transpose}}, ket::BatchedArrayReg{D,T2,<:Transpose}, ) where {D,T1,T2} - if nremain(bra) == nremain(ket) == 0 # all active - A, C = parent(state(parent(bra))), parent(state(ket)) - res = zeros(eltype(promote_type(T1, T2)), nbatch(ket)) - #return mapreduce((x, y) -> conj(x) * y, +, ; dims=2) - for j = 1:size(A, 2) - for i = 1:size(A, 1) - @inbounds res[i] += conj(A[i, j]) * C[i, j] - end - end - res - elseif nremain(bra) == 0 # |remain> - bra .* ket - else - error( - "partially contract ⟨bra|ket⟩ is not supported, expect ⟨bra| to be fully actived. nactive(bra)/nqudits(bra)=$(nactive(bra))/$(nqudits(bra))", + nqudits(bra) == nqudits(ket) && nremain(bra) == nremain(ket) && nbatch(bra) == nbatch(ket) || error( + "partially contract ⟨bra|ket⟩ is not supported, expect ⟨bra| and |ket⟩ to have the same size. Got nactive(bra)/nqudits(bra)/nbatch(bra)=$(nactive(bra))/$(nqudits(bra))/$(nbatch(bra)), nactive(ket)/nqudits(ket)=$(nactive(ket))/$(nqudits(ket))/$(nbatch(ket))", ) + A, C = parent(state(parent(bra))), parent(state(ket)) + res = zeros(eltype(promote_type(T1, T2)), nbatch(ket)) + for j in 1:size(A, 2), i in 1:size(A, 1) + @inbounds res[i] += conj(A[i, j]) * C[i, j] end + return res end # broadcast diff --git a/lib/YaoArrayRegister/test/operations.jl b/lib/YaoArrayRegister/test/operations.jl index d236f9d3..57b3e4bc 100644 --- a/lib/YaoArrayRegister/test/operations.jl +++ b/lib/YaoArrayRegister/test/operations.jl @@ -51,9 +51,7 @@ end ket = arrayreg(bit"100") + 2 * arrayreg(bit"110") + 3 * arrayreg(bit"111") focus!(ket, 2:3) - t = bra' * ket - relax!(t, 1) - @test state(t) ≈ [1, 0] + @test_throws ErrorException bra' * ket relax!(ket, 2:3) focus!(ket, 1) @@ -66,7 +64,7 @@ end reg1 = rand_state(2; nbatch = 10) reg2 = rand_state(5; nbatch = 10) focus!(reg2, 2:3) - @test all(reg1' * reg2 .≈ reg1' .* reg2) + @test_throws ErrorException reg1' * reg2 end @testset "inplace funcs" begin diff --git a/lib/YaoBlocks/src/YaoBlocks.jl b/lib/YaoBlocks/src/YaoBlocks.jl index 28149d8b..eace214e 100644 --- a/lib/YaoBlocks/src/YaoBlocks.jl +++ b/lib/YaoBlocks/src/YaoBlocks.jl @@ -72,6 +72,7 @@ export AbstractBlock, content, dispatch!, dispatch, + sandwich, expect, getiparams, iparams_eltype, diff --git a/lib/YaoBlocks/src/blocktools.jl b/lib/YaoBlocks/src/blocktools.jl index a1d2cd7e..df3bdcfe 100644 --- a/lib/YaoBlocks/src/blocktools.jl +++ b/lib/YaoBlocks/src/blocktools.jl @@ -74,9 +74,9 @@ collect_blocks(::Type{T}, x::AbstractBlock) where {T<:AbstractBlock} = #expect(op::AbstractBlock, dm::DensityMatrix) = mapslices(x->sum(mat(op).*x)[], dm.state, dims=[1,2]) |> vec """ - expect(op::AbstractBlock, reg) -> Vector - expect(op::AbstractBlock, reg => circuit) -> Vector - expect(op::AbstractBlock, density_matrix) -> Vector + expect(op::AbstractBlock, reg) -> Real + expect(op::AbstractBlock, reg => circuit) -> Real + expect(op::AbstractBlock, density_matrix) -> Real Get the expectation value of an operator, the second parameter can be a register `reg` or a pair of input register and circuit `reg => circuit`. @@ -92,13 +92,21 @@ For register input, the return value is a register. For batched register, `expect(op, reg=>circuit)` returns a vector of size number of batch as output. However, one can not differentiate over a vector loss, so `expect'(op, reg=>circuit)` accumulates the gradient over batch, rather than returning a batched gradient of parameters. """ +function expect(op::AbstractBlock, reg::AbstractRegister) + # NOTE: broadcast because the input register can be a batched one + return safe_real.(sandwich(reg, op, reg)) +end +function expect(op, plan::Pair{<:AbstractRegister,<:AbstractBlock}) + expect(op, copy(plan.first) |> plan.second) +end + function expect(op::AbstractBlock, dm::DensityMatrix) # NOTE: we use matrix form here because the matrix size is known to be small, # while applying a circuit on a reduced density matrix might take much more than constructing the matrix. mop = mat(op) # TODO: switch to `IterNz` # sum(x->dm.state[x[2],x[1]]*x[3], IterNz(mop)) - return sum(transpose(dm.state) .* mop) + return safe_real(sum(transpose(dm.state) .* mop)) end function expect(op::AbstractAdd, reg::DensityMatrix) # NOTE: this is faster in e.g. when the op is Heisenberg @@ -108,23 +116,28 @@ function expect(op::Scale, reg::DensityMatrix) factor(op) * expect(content(op), reg) end -# NOTE: assume an register has a bra. Can we define it for density matrix? -expect(op::AbstractBlock, reg::AbstractRegister) = reg' * apply!(copy(reg), op) +""" + sandwich(bra::AbstractRegister, op::AbstractBlock, ket::AbstracRegister) -> Complex + +Compute the sandwich function ⟨bra|op|ket⟩. +""" +sandwich(bra::AbstractArrayReg, op::AbstractBlock, reg::AbstractArrayReg) = bra' * apply!(copy(reg), op) -function expect(op::AbstractBlock, reg::BatchedArrayReg) +function sandwich(bra::BatchedArrayReg, op::AbstractBlock, reg::BatchedArrayReg) + @assert nbatch(bra) == nbatch(reg) B = YaoArrayRegister._asint(nbatch(reg)) ket = apply!(copy(reg), op) - if !(reg.state isa Transpose) # not-transposed storage + if !(bra.state isa Transpose) # not-transposed storage C = reshape(ket.state, :, B) - A = reshape(reg.state, :, B) + A = reshape(bra.state, :, B) # reduce over the 1st dimension conjsumprod1(A, C) - elseif size(reg.state, 2) == B # transposed storage, no environment qubits + elseif size(bra.state, 2) == B # transposed storage, no environment qubits # reduce over the second dimension - conjsumprod2(reg.state.parent, ket.state.parent) + conjsumprod2(bra.state.parent, ket.state.parent) else - C = reshape(ket.state.parent, :, B, size(reg.state, 1)) - A = reshape(reg.state.parent, :, B, size(reg.state, 1)) + C = reshape(ket.state.parent, :, B, size(bra.state, 1)) + A = reshape(bra.state.parent, :, B, size(bra.state, 1)) # reduce over the 1st and 3rd dimension conjsumprod13(A, C) end @@ -161,19 +174,15 @@ function conjsumprod13(A::AbstractArray, C::AbstractArray) res end -for REG in [:AbstractRegister, :BatchedArrayReg] - @eval function expect(op::AbstractAdd, reg::$REG) - sum(opi -> expect(opi, reg), op) +for REG in [:AbstractArrayReg, :BatchedArrayReg] + @eval function sandwich(bra::$REG, op::AbstractAdd, reg::$REG) + sum(opi -> sandwich(bra, opi, reg), op) end - @eval function expect(op::Scale, reg::$REG) - factor(op) * expect(content(op), reg) + @eval function sandwich(bra::$REG, op::Scale, reg::$REG) + factor(op) * sandwich(bra, content(op), reg) end end -function expect(op, plan::Pair{<:AbstractRegister,<:AbstractBlock}) - expect(op, copy(plan.first) |> plan.second) -end - # obtaining Dense Matrix of a block LinearAlgebra.Matrix(blk::AbstractBlock) = Matrix(mat(blk)) diff --git a/lib/YaoBlocks/src/utils.jl b/lib/YaoBlocks/src/utils.jl index e7aac834..af3a8794 100644 --- a/lib/YaoBlocks/src/utils.jl +++ b/lib/YaoBlocks/src/utils.jl @@ -311,3 +311,12 @@ end SparseArrays.sparse(et::EntryTable) = SparseVector(et) Base.vec(et::EntryTable) = Vector(et) + +# convert a (maybe complex) number x to real number. +function safe_real(x) + img = imag(x) + if !(iszero(img) || isapprox(x - im*img, x)) + error("Can not convert number $x to real due to its large imaginary part.") + end + return real(x) +end \ No newline at end of file diff --git a/lib/YaoBlocks/test/measure_ops.jl b/lib/YaoBlocks/test/measure_ops.jl index 6b26682d..9baa6c98 100644 --- a/lib/YaoBlocks/test/measure_ops.jl +++ b/lib/YaoBlocks/test/measure_ops.jl @@ -51,7 +51,7 @@ end @show op @test isapprox( sum(measure(op, reg2; nshots = 100000)) / 100000, - expect(op, reg), + sandwich(reg, op, reg), rtol = 0.1, ) @test reg ≈ reg2 @@ -60,7 +60,7 @@ end reg2 = copy(reg) @test isapprox( dropdims(sum(measure(op, reg2; nshots = 100000), dims = 1), dims = 1) / 100000, - expect(op, reg), + sandwich(reg, op, reg), rtol = 0.1, ) @test reg ≈ reg2 @@ -91,7 +91,7 @@ end @show op @test isapprox( sum(measure(op, reg2, locs; nshots = 100000)) / 100000, - expect(put(Nbit, locs => op), reg), + sandwich(reg, put(Nbit, locs => op), reg), rtol = 0.2, ) @test reg ≈ reg2 diff --git a/test/easybuild/hadamardtest.jl b/test/easybuild/hadamardtest.jl index d7053c02..2c533e52 100644 --- a/test/easybuild/hadamardtest.jl +++ b/test/easybuild/hadamardtest.jl @@ -32,8 +32,8 @@ end U = put(nbit, 2=>Rx(0.2)) reg = rand_state(nbit) - @test hadamard_test(U, reg, 0.0) ≈ real(expect(U, reg)) - @test hadamard_test(U, reg, -π/2) ≈ imag(expect(U, reg)) + @test hadamard_test(U, reg, 0.0) ≈ real(sandwich(reg, U, reg)) + @test hadamard_test(U, reg, -π/2) ≈ imag(sandwich(reg, U, reg)) reg = zero_state(2) |> EasyBuild.singlet_block() @test single_swap_test(reg, 0) ≈ -1