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

Removed some code that is never executed and an unused parameter #2314

Merged
merged 2 commits into from
Feb 9, 2025
+3 −7
Merged

Removed some code that is never executed and an unused parameter #2314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9714c0
For https://github.com/Qiskit/qiskit-aer/issues/2305
aromanro Feb 8, 2025
bb8bc75
Removed the release notes for the change
aromanro Feb 9, 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
14 changes: 14 additions & 0 deletions releasenotes/notes/removed-useless-code-MPS-simulator-98ca4717e0612ac2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't think release notes are needed here, as this change is not user-facing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I removed them.

prelude: >
Removed code that was never executed in ``MPS::sample_measure``, also removed
the ``shots`` parameter as it wasn't used.
features:
- |
Probably the compiler can optimize out those things, but the code is cleaner
this way. The ``params`` parameter was removed from ``MPS::sample_measure``
as it's not used, also a check and unreacheable code from the same function
is removed.
- |
There is no change in behaviour, just code cleanup.
Refer to `#2305 <https://github.com/Qiskit/qiskit-aer/issues/2305>`
for more details.
2 changes: 1 addition & 1 deletion src/simulators/matrix_product_state/matrix_product_state.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ std::vector<SampleVector> State::sample_measure_all(uint_t shots,

#pragma omp parallel for if (getenv("PRL_PROB_MEAS"))
for (int_t i = 0; i < static_cast<int_t>(shots); i++) {
auto single_result = qreg_.sample_measure(shots, rng);
auto single_result = qreg_.sample_measure(rng);
all_samples[i].from_vector(single_result);
}
return all_samples;
Expand Down
6 changes: 1 addition & 5 deletions src/simulators/matrix_product_state/matrix_product_state_internal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1637,7 +1637,7 @@ reg_t MPS::sort_measured_values(const reg_t &input_outcome,
// probability. We then update 'mat' by contracting it with the suitable
// matrix (0 or 1).

reg_t MPS::sample_measure(uint_t shots, RngEngine &rng) const {
reg_t MPS::sample_measure(RngEngine &rng) const {
double prob = 1;
reg_t current_measure(num_qubits_);
cmatrix_t mat;
Expand Down Expand Up @@ -1683,10 +1683,6 @@ uint_t MPS::sample_measure_single_qubit(uint_t qubit, double &prob, double rnd,
// measurement outcome
if (qubit == 0) {
mat = q_reg_[qubit].get_data(measurement);
if (qubit != 0) // multiply mat by left lambda
for (uint_t col = 0; col < mat.GetColumns(); col++)
for (uint_t row = 0; row < mat.GetRows(); row++)
mat(row, col) *= lambda_reg_[qubit - 1][row];
} else {
mat = mat * q_reg_[qubit].get_data(measurement);
}
Expand Down
2 changes: 1 addition & 1 deletion src/simulators/matrix_product_state/matrix_product_state_internal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ class MPS {

reg_t apply_measure(const reg_t &qubits, const rvector_t &rnds);
reg_t apply_measure_internal(const reg_t &qubits, const rvector_t &rands);
reg_t sample_measure(uint_t shots, RngEngine &rng) const;
reg_t sample_measure(RngEngine &rng) const;

//----------------------------------------------------------------
// Function name: initialize_from_statevector_internal
Expand Down