Skip to content

Added new api and fixed type errors in cuStateVec #2728

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Added new api and fixed type errors in cuStateVec #2728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aec8f6
Update libcustatevec.jl
LeeQY1996 Mar 31, 2025
4aa93a9
Update statevec.jl
LeeQY1996 Mar 31, 2025
1207c36
Update statevec.jl
LeeQY1996 Mar 31, 2025
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
10 changes: 5 additions & 5 deletions lib/custatevec/src/libcustatevec.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ end
nIndexBits::UInt32,
nSVs::UInt32,
svStride::custatevecIndex_t,
matrices::Ptr{Cvoid},
matrices::PtrOrCuPtr{Cvoid},
matrixDataType::cudaDataType_t,
layout::custatevecMatrixLayout_t,
nMatrices::UInt32,
Expand All @@ -1018,20 +1018,20 @@ end
extraWorkspaceSizeInBytes)
initialize_context()
@gcsafe_ccall libcustatevec.custatevecComputeExpectationBatched(handle::custatevecHandle_t,
batchedSv::Ptr{Cvoid},
batchedSv::CuPtr{Cvoid},
svDataType::cudaDataType_t,
nIndexBits::UInt32,
nSVs::UInt32,
svStride::custatevecIndex_t,
expectationValues::Ptr{ComplexF64},
matrices::Ptr{Cvoid},
expectationValues::PtrOrCuPtr{ComplexF64},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes need to be replicated in the res/wrap logic too

matrices::PtrOrCuPtr{Cvoid},
matrixDataType::cudaDataType_t,
layout::custatevecMatrixLayout_t,
nMatrices::UInt32,
basisBits::Ptr{Int32},
nBasisBits::UInt32,
computeType::custatevecComputeType_t,
extraWorkspace::Ptr{Cvoid},
extraWorkspace::CuPtr{Cvoid},
extraWorkspaceSizeInBytes::Csize_t)::custatevecStatus_t
end

Expand Down
24 changes: 24 additions & 0 deletions lib/custatevec/src/statevec.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ function batchMeasure!(sv::CuStateVec, bitordering::Vector{<:Integer}, randnum::
return sv, bitstring
end

function measureBatched!(sv::CuStateVec, n_svs::Int, bitordering::Vector{<:Integer},randnums::Vector{<:Integer}, collapse::custatevecCollapseOp_t=CUSTATEVEC_COLLAPSE_NONE)
all(0.0 .<= randnums .< 1.0) && length(randnums) == n_svs || throw(ArgumentError("randnums must have length $nsvs and all elements must be in the interval [0, 1)."))
bitStrings = zeros(Int32, length(bitordering)*n_svs)
sv_stride = div(length(sv.data), n_svs)
n_index_bits = Int(log2(div(length(sv.data), n_svs)))
custatevecMeasureBatched(handle(), sv.data, eltype(sv), n_index_bits, n_svs, sv_stride, bitStrings, convert(Vector{Int32}, bitordering), length(bitstring), randnums, collapse)
return sv, bitstrings
end

function batchMeasureWithOffset!(sv::CuStateVec, bitordering::Vector{<:Integer}, randnum::Float64, offset::Float64, abs2sum::Float64, collapse::custatevecCollapseOp_t=CUSTATEVEC_COLLAPSE_NONE)
0.0 <= randnum < 1.0 || throw(ArgumentError("randnum $randnum must be in the interval [0, 1)."))
bitstring = zeros(Int32, length(bitordering))
Expand All @@ -128,6 +137,21 @@ function expectation(sv::CuStateVec, matrix::Union{Matrix, CuMatrix}, basis_bits
return expVal[], residualNorm[]
end

function expectationBatched(sv::CuStateVec, n_svs::Int, matrix::Union{CuVector, Vector}, n_matrices::Int, basis_bits::Vector{<:Integer})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add some tests for these new functions?

sv_stride = div(length(sv.data), n_svs)
n_index_bits = Int(log2(div(length(sv.data), n_svs)))
function bufferSize()
out = Ref{Csize_t}()
custatevecComputeExpectationBatchedGetWorkspaceSize(handle(), eltype(sv), n_index_bits, n_svs, sv_stride, matrix, eltype(matrix), CUSTATEVEC_MATRIX_LAYOUT_COL, n_matrices, length(basis_bits), compute_type(eltype(sv), eltype(matrix)), out)
out[]
end
expVals = zeros(ComplexF64, n_matrices*n_svs)
with_workspace(handle().cache, bufferSize) do buffer
custatevecComputeExpectationBatched(handle(), sv.data, eltype(sv), n_index_bits, n_svs, sv_stride, expVals, matrix, eltype(matrix), CUSTATEVEC_MATRIX_LAYOUT_COL, n_matrices, convert(Vector{Int32}, basis_bits), length(basis_bits), compute_type(eltype(sv), eltype(matrix)), buffer, sizeof(buffer))
end
return expVals
end

function expectationsOnPauliBasis(sv::CuStateVec, pauliOps::Vector{Vector{Pauli}}, basisInds::Vector{Vector{Int}})
exp_vals = zeros(Float64, length(pauliOps))
cupaulis = [[CuStateVecPauli(O) for O in op] for op in pauliOps]
Expand Down