Skip to content
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.

Sign up for GitHub

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

fix: Fix indexing to use 1-based and use proper type in tests #9

Merged
merged 2 commits into from
May 1, 2024
Merged

fix: Fix indexing to use 1-based and use proper type in tests #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4bb00a
fix: Use index 1 rather than 0 for PyList
kshyatt-aws May 1, 2024
b2e5709
fix: Use PyList type in Julia tests and fix indexing in extension
kshyatt-aws May 1, 2024
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 ext/BraketSimulatorPythonExt/BraketSimulatorPythonExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ end

function simulate(
simulator::AbstractSimulator,
task_specs::Union{PyList{Any},NTuple{N,PyIterable},Py},
task_specs::Union{PyList{Any},NTuple{N,PyIterable}},
args...;
input::Union{PyList{Any},PyDict{Any,Any},Py}=PyDict{Any,Any}(),
kwargs...,
Expand Down Expand Up @@ -290,7 +290,7 @@ function simulate(
PythonCall.GC.disable()
if length(jl_specs) == 1
result = simulate(simulator, jl_specs[1], args[1:end-1]...; inputs = jl_inputs, shots=shots, kwargs...)
py_result = Py(result, task_specs[0])
py_result = Py(result, task_specs[1])
else # this is a batch! use a Braket.jl LocalSimulator to take advantage of thread migration
local_sim = Braket.LocalSimulator(simulator)
task_batch = simulate(local_sim, jl_specs, args[1:end-1]...; inputs = jl_inputs, shots=shots, kwargs...)
Expand Down
29 changes: 16 additions & 13 deletions test/test_python_ext.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,18 +544,21 @@ using Test, PythonCall, BraketSimulator, Braket
@test pyconvert(Braket.OpenQasmProgram, Py(oq3_program)) == oq3_program
@test pyconvert(Braket.Program, Py(jaqcd_program)) == jaqcd_program
@testset "Full Python circuit execution" begin
sv_simulator = StateVectorSimulator(n_qubits, 0)
oq3_results = simulate(sv_simulator, pylist([Py(oq3_program)]), 0)
@test pyconvert(Bool, oq3_results.resultTypes[0].type == Py(Braket.IR.Probability([9, 5, 6, 7, 8], "probability")))
# test a "batch"
oq3_results = simulate(sv_simulator, pylist([Py(oq3_program), Py(oq3_program)]), 0; input = pylist([pydict(Dict("a_in"=>2, "b_in"=>5)), pydict(Dict("a_in"=>3, "b_in"=>2))]))
@test pyconvert(Vector{Float64}, oq3_results[0].resultTypes[0].value) ≠ pyconvert(Vector{Float64}, oq3_results[0].resultTypes[1].value)

sv_simulator = StateVectorSimulator(n_qubits, 0)
jaqcd_results = simulate(sv_simulator, pylist([Py(jaqcd_program)]), n_qubits, 0)
@test pyconvert(Bool, jaqcd_results.resultTypes[0].type == Py(Braket.IR.Amplitude([repeat("0", n_qubits), repeat("1", n_qubits)], "amplitude")))
@test pyconvert(Bool, jaqcd_results.resultTypes[1].type == Py(Braket.IR.Expectation(["x"], [0], "expectation")))
@test pyconvert(Bool, jaqcd_results.resultTypes[2].type == Py(Braket.IR.DensityMatrix(nothing, "density_matrix")))
@testset "OpenQASM3" begin
sv_simulator = StateVectorSimulator(n_qubits, 0)
oq3_results = simulate(sv_simulator, PyList{Any}([Py(oq3_program)]), 0)
@test pyconvert(Bool, oq3_results.resultTypes[0].type == Py(Braket.IR.Probability([9, 5, 6, 7, 8], "probability")))
# test a "batch"
oq3_results = simulate(sv_simulator, PyList{Any}([Py(oq3_program)]), 0; input = pylist([pydict(Dict("a_in"=>2, "b_in"=>5)), pydict(Dict("a_in"=>3, "b_in"=>2))]))
@test pyconvert(Vector{Float64}, oq3_results.resultTypes[0].value) ≠ pyconvert(Vector{Float64}, oq3_results.resultTypes[1].value)
end
@testset "JAQCD" begin
sv_simulator = StateVectorSimulator(n_qubits, 0)
jaqcd_results = simulate(sv_simulator, PyList{Any}([Py(jaqcd_program)]), n_qubits, 0)
@test pyconvert(Bool, jaqcd_results.resultTypes[0].type == Py(Braket.IR.Amplitude([repeat("0", n_qubits), repeat("1", n_qubits)], "amplitude")))
@test pyconvert(Bool, jaqcd_results.resultTypes[1].type == Py(Braket.IR.Expectation(["x"], [0], "expectation")))
@test pyconvert(Bool, jaqcd_results.resultTypes[2].type == Py(Braket.IR.DensityMatrix(nothing, "density_matrix")))
end
end
end
@testset "Python circuit with measured qubits" begin
Expand All @@ -568,7 +571,7 @@ using Test, PythonCall, BraketSimulator, Braket
"""
simulator = StateVectorSimulator(2, 1000)
oq3_program = Braket.OpenQasmProgram(Braket.braketSchemaHeader("braket.ir.openqasm.program", "1"), qasm, nothing)
result = simulate(simulator, pylist([Py(oq3_program)]), 1000; measured_qubits=pylist([0]))
result = simulate(simulator, PyList{Any}([Py(oq3_program)]), 1000; measured_qubits=pylist([0]))
measurements = [[pyconvert(Int, m) for m in measurement] for measurement in result.measurements]
@test 400 < sum(m[1] for m in measurements) < 600
@test all(length(m) == 1 for m in measurements)
Expand Down
Loading