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.

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 compiler warnings #2129

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions src/simulators/circuit_executor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -871,9 +871,8 @@ void Executor<state_t>::run_circuit_shots(

// run each shot
auto run_circuit_lambda = [this, &par_results, circ, noise, config, par_shots,
sample_noise, num_shots, shot_begin, &cregs,
init_rng, max_matrix_qubits,
num_local_shots](int_t i) {
sample_noise, shot_begin, &cregs, init_rng,
max_matrix_qubits, num_local_shots](int_t i) {
state_t state;
uint_t i_shot, e_shot;
i_shot = num_local_shots * i / par_shots;
Expand Down Expand Up @@ -1155,7 +1154,7 @@ void Executor<state_t>::measure_sampler(InputIterator first_meas,
Utils::apply_omp_parallel_for((npar > 1), 0, npar, copy_samples_lambda,
npar);

for (int_t i = 0; i < npar; i++) {
for (uint_t i = 0; i < npar; i++) {
result.combine(std::move(par_results[i]));
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/simulators/density_matrix/densitymatrix_executor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1328,8 +1328,8 @@ Executor<densmat_t>::sample_measure(const reg_t &qubits, uint_t shots,
npar = local_samples.size();
std::vector<SampleVector> all_samples(shots, SampleVector(qubits.size()));

auto convert_to_bit_lambda = [this, &local_samples, &all_samples, shots,
qubits, npar](int_t i) {
auto convert_to_bit_lambda = [&local_samples, &all_samples, qubits,
npar](int_t i) {
uint_t ishot, iend;
ishot = local_samples.size() * i / npar;
iend = local_samples.size() * (i + 1) / npar;
Expand Down
4 changes: 2 additions & 2 deletions src/simulators/density_matrix/densitymatrix_state.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1008,8 +1008,8 @@ std::vector<SampleVector> State<densmat_t>::sample_measure(const reg_t &qubits,
npar = shots;
std::vector<SampleVector> all_samples(shots, SampleVector(qubits.size()));

auto convert_to_bit_lambda = [this, &allbit_samples, &all_samples, shots,
qubits, npar](int_t i) {
auto convert_to_bit_lambda = [&allbit_samples, &all_samples, shots, qubits,
npar](int_t i) {
uint_t ishot, iend;
ishot = shots * i / npar;
iend = shots * (i + 1) / npar;
Expand Down
8 changes: 4 additions & 4 deletions src/simulators/matrix_product_state/svd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ void lapack_csvd_wrapper(cmatrix_t &A, cmatrix_t &U, rvector_t &S,
zgesdd_("A", &m, &n, lapackA, &m, lapackS, lapackU, &m, lapackV, &n, work_,
&lwork, rwork, iwork, &info);

delete iwork;
delete[] iwork;
free(rwork);
free(work_);
} else {
Expand All @@ -647,16 +647,16 @@ void lapack_csvd_wrapper(cmatrix_t &A, cmatrix_t &U, rvector_t &S,
V = cmatrix_t::move_from_buffer(n, n, lapackV);

S.clear();
for (int i = 0; i < min_dim; i++)
for (size_t i = 0; i < min_dim; i++)
S.push_back(lapackS[i]);

// Activated by default as requested in the PR
// #ifdef DEBUG
validate_SVdD_result(tempA, U, S, V);
// #endif

delete lapackS;
delete work;
delete[] lapackS;
delete[] work;

if (info == 0) {
return;
Expand Down
2 changes: 1 addition & 1 deletion src/simulators/parallel_state_executor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ void ParallelStateExecutor<state_t>::measure_sampler(InputIterator first_meas,
Utils::apply_omp_parallel_for((npar > 1), 0, npar, copy_samples_lambda,
npar);

for (int_t i = 0; i < npar; i++) {
for (uint_t i = 0; i < npar; i++) {
result.combine(std::move(par_results[i]));
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/simulators/shot_branching.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ bool Branch::apply_runtime_noise_sampling(const ClassicalRegister &creg,

void Branch::remove_empty_branches(void) {
// find first branch that has at least one shot
int_t iroot = -1;
uint_t iroot = 0;
for (uint_t j = 0; j < branches_.size(); j++) {
if (branches_[j]->num_shots() > 0) {
iroot = j;
Expand Down
4 changes: 2 additions & 2 deletions src/simulators/stabilizer/clifford.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,8 @@ bool Clifford::measure_and_update(const uint64_t qubit,
uint_t exponent_h = 0;

auto measure_determinisitic_func =
[this, &accum, &exponent_l, &exponent_lc, &exponent_h, blocks,
blockSize, destabilizer_mask, ii](AER::int_t qq) {
[this, &accum, &exponent_l, &exponent_lc, &exponent_h, blockSize,
destabilizer_mask, ii](AER::int_t qq) {
uint_t qs = qq * blockSize;
uint_t qe = qs + blockSize;
if (qe > num_qubits_)
Expand Down
2 changes: 1 addition & 1 deletion src/simulators/stabilizer/stabilizer_state.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ std::vector<SampleVector> State::sample_measure(const reg_t &qubits,
// table
auto qreg_cache = BaseState::qreg_;
std::vector<SampleVector> samples(shots);
for (int_t ishot = 0; ishot < shots; ishot++) {
for (uint_t ishot = 0; ishot < shots; ishot++) {
samples[ishot].from_vector(apply_measure_and_update(qubits, rng));
BaseState::qreg_ = qreg_cache; // restore pre-measurement data from cache
}
Expand Down
7 changes: 3 additions & 4 deletions src/simulators/statevector/statevector_executor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -607,8 +607,7 @@ double Executor<state_t>::expval_pauli(const reg_t &qubits,
const uint_t mask_u = ~((1ull << (x_max + 1)) - 1);
const uint_t mask_l = (1ull << x_max) - 1;
if (on_same_process) {
auto apply_expval_pauli_chunk = [this, x_mask, z_mask, x_max, mask_u,
mask_l, qubits_in_chunk,
auto apply_expval_pauli_chunk = [this, x_mask, z_mask, qubits_in_chunk,
pauli_in_chunk, phase](int_t iGroup) {
double expval_t = 0.0;
for (uint_t iChunk = Base::top_state_of_group_[iGroup];
Expand Down Expand Up @@ -1246,8 +1245,8 @@ Executor<state_t>::sample_measure(const reg_t &qubits, uint_t shots,
npar = local_samples.size();
std::vector<SampleVector> all_samples(shots, SampleVector(qubits.size()));

auto convert_to_bit_lambda = [this, &local_samples, &all_samples, shots,
qubits, npar](int_t i) {
auto convert_to_bit_lambda = [&local_samples, &all_samples, qubits,
npar](int_t i) {
uint_t ishot, iend;
ishot = local_samples.size() * i / npar;
iend = local_samples.size() * (i + 1) / npar;
Expand Down
4 changes: 2 additions & 2 deletions src/simulators/statevector/statevector_state.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1043,8 +1043,8 @@ std::vector<SampleVector> State<statevec_t>::sample_measure(const reg_t &qubits,
npar = shots;
std::vector<SampleVector> all_samples(shots, SampleVector(qubits.size()));

auto convert_to_bit_lambda = [this, &allbit_samples, &all_samples, shots,
qubits, npar](int_t i) {
auto convert_to_bit_lambda = [&allbit_samples, &all_samples, shots, qubits,
npar](int_t i) {
uint_t ishot, iend;
ishot = shots * i / npar;
iend = shots * (i + 1) / npar;
Expand Down
4 changes: 4 additions & 0 deletions src/transpile/fusion.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ class Fuser {
const std::vector<uint_t> &fusioned_ops_idxs,
const FusionMethod &method,
const bool diagonal = false) const;

virtual ~Fuser() = default;
};

void Fuser::allocate_new_operation(oplist_t &ops, const uint_t idx,
Expand Down Expand Up @@ -360,6 +362,7 @@ class CostBasedFusion : public Fuser {
const int fusion_end,
const uint_t max_fused_qubits,
const FusionMethod &method) const override;
virtual ~CostBasedFusion() = default;

private:
bool is_diagonal(const oplist_t &ops, const uint_t from,
Expand Down Expand Up @@ -392,6 +395,7 @@ class NQubitFusion : public Fuser {

bool exclude_escaped_qubits(std::vector<uint_t> &fusing_qubits,
const op_t &tgt_op) const;
virtual ~NQubitFusion() = default;

private:
bool active = true;
Expand Down