Fix cuStateVec_enable option (#2146)

* Fix cuStateVec_enable option * fix function name
Qiskit · May 24, 2024 · 83d679e · 83d679e
1 parent ba9eb90
commit 83d679e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/releasenotes/notes/fix_enabling_cuStateVec-1a2f1d3e35f3129d.yaml b/releasenotes/notes/fix_enabling_cuStateVec-1a2f1d3e35f3129d.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    The option `cuStateVec_enable=True` was not set correctly.
+    This fix set this option to statevector, unitary and density_matrix
+    simulator states classes before allocating their memory
diff --git a/src/simulators/density_matrix/densitymatrix_state.hpp b/src/simulators/density_matrix/densitymatrix_state.hpp
@@ -344,6 +344,9 @@ bool State<densmat_t>::allocate(uint_t num_qubits, uint_t block_bits,
     BaseState::qreg_.set_max_sampling_shots(BaseState::max_sampling_shots_);
 
   BaseState::qreg_.set_target_gpus(BaseState::target_gpus_);
+#ifdef AER_CUSTATEVEC
+  BaseState::qreg_.cuStateVec_enable(BaseState::cuStateVec_enable_);
+#endif
   BaseState::qreg_.chunk_setup(block_bits * 2, block_bits * 2, 0, 1);
 
   return true;

diff --git a/src/simulators/parallel_state_executor.hpp b/src/simulators/parallel_state_executor.hpp
@@ -339,13 +339,17 @@ bool ParallelStateExecutor<state_t>::allocate_states(uint_t num_states,
         Base::num_threads_per_group_);
     Base::states_[0].set_num_global_qubits(Base::num_qubits_);
 #ifdef AER_CUSTATEVEC
+    Base::states_[0].enable_cuStateVec(Base::cuStateVec_enable_);
     Base::states_[0].qreg().cuStateVec_enable(Base::cuStateVec_enable_);
 #endif
     Base::states_[0].qreg().set_target_gpus(Base::target_gpus_);
     num_states_allocated = Base::states_[0].qreg().chunk_setup(
         squbits, gqubits, Base::global_state_index_, num_states);
     for (i = 1; i < num_states_allocated; i++) {
       Base::states_[i].set_config(config);
+#ifdef AER_CUSTATEVEC
+      Base::states_[i].enable_cuStateVec(Base::cuStateVec_enable_);
+#endif
       Base::states_[i].qreg().chunk_setup(Base::states_[0].qreg(),
                                           Base::global_state_index_ + i);
       Base::states_[i].qreg().set_num_threads_per_group(

diff --git a/src/simulators/statevector/chunk/cuStateVec_chunk_container.hpp b/src/simulators/statevector/chunk/cuStateVec_chunk_container.hpp
@@ -131,7 +131,6 @@ uint_t cuStateVecChunkContainer<data_t>::Allocate(
   nc = BaseContainer::Allocate(idev, chunk_bits, num_qubits, chunks, buffers,
                                multi_shots, matrix_bit, max_shots,
                                density_matrix);
-
   // initialize custatevevtor handle
   custatevecStatus_t err;
 

diff --git a/src/simulators/statevector/statevector_state.hpp b/src/simulators/statevector/statevector_state.hpp
@@ -439,6 +439,9 @@ bool State<statevec_t>::allocate(uint_t num_qubits, uint_t block_bits,
     BaseState::qreg_.set_max_sampling_shots(BaseState::max_sampling_shots_);
 
   BaseState::qreg_.set_target_gpus(BaseState::target_gpus_);
+#ifdef AER_CUSTATEVEC
+  BaseState::qreg_.cuStateVec_enable(BaseState::cuStateVec_enable_);
+#endif
   BaseState::qreg_.chunk_setup(block_bits, num_qubits, 0, 1);
 
   return true;

diff --git a/src/simulators/unitary/unitary_state.hpp b/src/simulators/unitary/unitary_state.hpp
@@ -383,6 +383,9 @@ bool State<unitary_matrix_t>::allocate(uint_t num_qubits, uint_t block_bits,
     BaseState::qreg_.set_max_matrix_bits(BaseState::max_matrix_qubits_);
 
   BaseState::qreg_.set_target_gpus(BaseState::target_gpus_);
+#ifdef AER_CUSTATEVEC
+  BaseState::qreg_.cuStateVec_enable(BaseState::cuStateVec_enable_);
+#endif
   BaseState::qreg_.chunk_setup(block_bits * 2, num_qubits * 2, 0, 1);
 
   return true;