Fix OpenMP nested parallel #1880
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hhorii
added
automerge
doichanj
added a commit
to doichanj/qiskit-aer
that referenced
this pull request
Aug 9, 2023
* Fix OpenMP nested parallel * add comment in release note * fix true and false * fix format --------- Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com>
hhorii
added a commit
to hhorii/qiskit-aer
that referenced
this pull request
Aug 9, 2023
* Fix OpenMP nested parallel * add comment in release note * fix true and false * fix format --------- Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com>
hhorii
added a commit
that referenced
this pull request
Aug 9, 2023
* adding executor classes for parallel simulations * fix merge conflicts * simplify sub-classes * fix unformatted code * fix unformatted code again * Fix MPI code * Fix shot-branching was not enabled with noise sampling * Fix clang format * set_num_qubits to virtual function to set correct num qubits on matrix * reflecting review comments * reuse of random number generator * recover save_data_per_shot * add missed omp threads setting in statevector, change class hieralchy * Fix performance issue of GPU shot-branching * move fusion outside of loop for non noise dynamic circuits * fix shot-branching options in aer_compiler.py * save codes before merge * Fix format * Fix multi-chunk with cuStateVec * format * format * add better multi-GPU distribution for shot-branching * fix format * Changed option shot_branching_enable=False by default, add shot_branching_sampling_enable (False by default), add test cases for shot-branching * format * format test_shot_branching.py * Changed OpenMP threading for shot-branching * mutable to matrix and param buffer * format * add target_gpus option * Remove Python 3.7 from Github actions (#1819) Since 0.13.0, Aer does not support Python 3.7. This commit removes github actions for CI. * Removing python 3.7 from test workflow * Removing python 3.7 from build workflow * Removing python 3.7 from deploy workflow * Removing python 3.7 from tox * revert * Remove python 3.7 from pyproject.toml * Remove python 3.7 from pyproject.toml - tool --------- Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com> * Fix missing dynamic link path for CUDA runtime and cuQuantum libraries (#1877) Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com> * Fix OpenMP nested parallel (#1880) * Fix OpenMP nested parallel * add comment in release note * fix true and false * fix format --------- Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com> * Support u3 gate application in Aer runtime API (#1876) * Support u3 gate application * Apply clang-format * Revert clang-format for aer_runtime_api.h * Add release note --------- Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Fix required_memory_mb (#1881) * Fix required_memory_mb * add release note --------- Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com> * format * format * format * comment out target_gpu setting for non-GPU * comment out target_gpu setting for non-GPU * Remove `PulseSimulator` (#1884) Since 0.12, Qiskit-Aer notices deprecation warnings to use of PulseSimulato. Because 0.13 will be released after +3 months since 0.12 was released, Qiskit-Aer will stop supports of pulse simulation. * first pass at removing pulse simulator * autoformat with black * remove ref to aer pulse in docs * fix lint issues * remove pulse rst * remove pulse tests * add release note * remove open pulse from CMakeLists.txt * remove pulse tests * remove remaining pulse codes --------- Co-authored-by: AngeloDanducci <angelo.danducci.ii@ibm.com> * Fix an issue in `aer_state_initialize()` of C API (#1885) Correct C API `aer_state_initialize` to take an argument of `handler`. * update aer_state_initialize API * add reno * fix MPI shot-branching sampling * fix unmerged file * remove conflict * rerun tests * recover files * remove conflict * fix non-gpu * update release note --------- Co-authored-by: Tung Bui (Leo) <85242618+tungbq@users.noreply.github.com> Co-authored-by: Hiroshi Horii <hhorii@users.noreply.github.com> Co-authored-by: Ryo Wakizaka <135729070+ibm-wakizaka@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: AngeloDanducci <angelo.danducci.ii@ibm.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This is fix for issue #1873
Details and comments
OpenMP parallel nested was not correctly set when number of input circuits is less than number of threads.
Also parallel state update was not correctly set if number of input circuits is more than 1.
For single circuit with multiple-shots run, when nested parallel is used
omp_nested=Truewas not set in the metadata of result for a circuit, so this is added.