Skip to content

Fix superoperator thrust compilation #15

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

Merged
chriseclectic merged 2 commits into from
Mar 31, 2021
Merged

Fix superoperator thrust compilation #15

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
2b731fb
Fix superoperator thrust compilation
vvilpas Mar 31, 2021
1f11403
revert allocate to twice num_qubits
vvilpas Mar 31, 2021
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
17 changes: 10 additions & 7 deletions src/controllers/aer_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,19 +1941,20 @@ void Controller::run_circuit_without_sampled_noise(Circuit &circ,
const bool can_sample = check_measure_sampling_opt(circ, method);

// Cache blocking pass
uint_t block_bits = 0;
if (cache_blocking) {
auto cache_block_pass = transpile_cache_blocking(method, circ, dummy_noise, config);
cache_block_pass.set_sample_measure(can_sample);
cache_block_pass.optimize_circuit(circ, dummy_noise, state.opset(), result);
uint_t block_bits = 0;
if (cache_block_pass.enabled()) {
block_bits = cache_block_pass.block_bits();
}
// allocate qubit register
state.allocate(max_qubits_, block_bits);
}

// Check if measure sampler and optimization are valid
// allocate qubit register
state.allocate(max_qubits_, block_bits);

// Check if measure sampler and optimization are valid
if (can_sample) {
// Implement measure sampler
auto& ops = circ.ops;
Expand Down Expand Up @@ -2005,16 +2006,18 @@ void Controller::run_circuit_with_sampled_noise(
result);
fusion_pass.optimize_circuit(noise_circ, dummy_noise, state.opset(),
result);
uint_t block_bits = 0;
if (cache_blocking) {
cache_block_pass.optimize_circuit(noise_circ, dummy_noise, state.opset(),
result);
uint_t block_bits = 0;
if (cache_block_pass.enabled()) {
block_bits = cache_block_pass.block_bits();
}
// allocate qubit register
state.allocate(max_qubits_, block_bits);
}

// allocate qubit register
state.allocate(max_qubits_, block_bits);

run_single_shot(noise_circ, state, result, rng);
}
}
Expand Down
10 changes: 10 additions & 0 deletions src/simulators/superoperator/superoperator_state.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
#include "framework/utils.hpp"
#include "simulators/state.hpp"
#include "superoperator.hpp"
#ifdef AER_THRUST_SUPPORTED
#include "superoperator_thrust.hpp"
#endif

namespace AER {
namespace QubitSuperoperator {
Expand Down Expand Up @@ -100,6 +103,8 @@ class State : public Base::State<data_t> {
// Config: {"omp_qubit_threshold": 3}
virtual void set_config(const json_t &config) override;

virtual void allocate(uint_t num_qubits,uint_t block_bits) override;

//-----------------------------------------------------------------------
// Additional methods
//-----------------------------------------------------------------------
Expand Down Expand Up @@ -348,6 +353,11 @@ template <class data_t> void State<data_t>::initialize_omp() {
BaseState::threads_); // set allowed OMP threads in qubitvector
}

template <class data_t>
void State<data_t>::allocate(uint_t num_qubits, uint_t block_bits){
BaseState::qreg_.chunk_setup(num_qubits * 2, num_qubits * 2, 0, 1);
}

//=========================================================================
// Implementation: Reset
//=========================================================================
Expand Down
16 changes: 8 additions & 8 deletions src/simulators/superoperator/superoperator_thrust.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ class SuperoperatorThrust : public DensityMatrixThrust<data_t> {

SuperoperatorThrust() : SuperoperatorThrust(0) {};
explicit SuperoperatorThrust(size_t num_qubits);
SuperoperatorThrust(const Superoperator& obj) = delete;
Superoperator &operator=(const Superoperator& obj) = delete;
SuperoperatorThrust(const SuperoperatorThrust& obj) = delete;
SuperoperatorThrust &operator=(const SuperoperatorThrust& obj) = delete;

//-----------------------------------------------------------------------
// Utility functions
Expand Down Expand Up @@ -86,7 +86,7 @@ class SuperoperatorThrust : public DensityMatrixThrust<data_t> {
//------------------------------------------------------------------------------

template <typename data_t>
SuperOperatorThrust<data_t>::SuperoperatorThrust(size_t num_qubits) {
SuperoperatorThrust<data_t>::SuperoperatorThrust(size_t num_qubits) {
set_num_qubits(num_qubits);
}

Expand All @@ -95,7 +95,7 @@ SuperOperatorThrust<data_t>::SuperoperatorThrust(size_t num_qubits) {
//------------------------------------------------------------------------------

template <class data_t>
void SuperOperatorThrust<data_t>::set_num_qubits(size_t num_qubits) {
void SuperoperatorThrust<data_t>::set_num_qubits(size_t num_qubits) {
num_qubits_ = num_qubits;
// Superoperator is same size matrix as a unitary matrix
// of twice as many qubits
Expand All @@ -104,15 +104,15 @@ void SuperOperatorThrust<data_t>::set_num_qubits(size_t num_qubits) {


template <typename data_t>
void SuperOperatorThrust<data_t>::initialize() {
void SuperoperatorThrust<data_t>::initialize() {
// Set underlying unitary matrix to identity
BaseUnitary::initialize();
}


template <class data_t>
template <typename T>
void SuperOperatorThrust<data_t>::initialize_from_matrix(const matrix<std::complex<T>> &mat) {
void SuperoperatorThrust<data_t>::initialize_from_matrix(const matrix<std::complex<T>> &mat) {
if (AER::Utils::is_square(mat)) {
const size_t nrows = mat.GetRows();
if (nrows == BaseUnitary::rows_) {
Expand Down Expand Up @@ -140,7 +140,7 @@ void SuperOperatorThrust<data_t>::initialize_from_matrix(const matrix<std::compl
}

template <class data_t>
void SuperOperatorThrust<data_t>::initialize_from_matrix(matrix<std::complex<data_t>> &&mat) {
void SuperoperatorThrust<data_t>::initialize_from_matrix(matrix<std::complex<data_t>> &&mat) {
if (AER::Utils::is_square(mat)) {
const size_t nrows = mat.GetRows();
if (nrows == BaseUnitary::rows_) {
Expand Down Expand Up @@ -176,7 +176,7 @@ void SuperOperatorThrust<data_t>::initialize_from_matrix(matrix<std::complex<dat

// ostream overload for templated qubitvector
template <typename data_t>
inline std::ostream &operator<<(std::ostream &out, const AER::QV::SuperOperatorThrust<data_t>&m) {
inline std::ostream &operator<<(std::ostream &out, const AER::QV::SuperoperatorThrust<data_t>&m) {
out << m.copy_to_matrix();
return out;
}
Expand Down