Merge GPU simulator feature branch into master #544
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
chriseclectic
force-pushed
the
gpu-rebase
branch
8 times, most recently
from
c4bb032
to
cd3fc11
Compare
|
@atilag Something is wrong with the build system and the Thrust OpenMP is not being installed in CI with the appropriate flag (you can see in the travis that are supposed to test the Thrust OpenMP backend that the GPU tests are being skipped) |
|
Also mac travis jobs are failing because build log is too long (see issue #548 ) |
chriseclectic
force-pushed
the
gpu-rebase
branch
3 times, most recently
from
29d3da2
to
6406211
Compare
chriseclectic
force-pushed
the
gpu-rebase
branch
7 times, most recently
from
377198e
to
3aadf28
Compare
|
@atilag This still needs to be updated with:
|
chriseclectic
force-pushed
the
gpu-rebase
branch
from
803a624
to
c5aaec5
Compare
chriseclectic
changed the title
|
@atilag The OpenMP with Thrust on mac remains. I'm going to remove Thrust tests from travis for mac and make an issue so this PR can be merged and you can fix thrust CMake build as a followup |
chriseclectic
force-pushed
the
gpu-rebase
branch
from
c5aaec5
to
584d0e5
Compare
* Fix a build error with no Thrust support at all * Simplify flags so AER_DEBUG and AER_TIMING are both implicit to alredy existing DEBUG flag * No default Thrust backend. The Thrust backend needs to be explicitly specified via AER_THRUST_BACKEND build variable, e.g: ``` python ./setup.py bdist_wheel -- -DAER_THRUST_BACKEND=CUDA ``` * Some minor class renaming to comply with the CamelCase standard. * Adding missing symbols for libomp hack on MacOS, with older versions of clang (9) * Add Thrust cloning from github for the CIs * Add Thrust to CI tests stages to test Thrust CPU backends * Document new CMake variable to enable GPU support (and other CPU methods) Co-authored-by: Hiroshi Horii <horii@jp.ibm.com> Co-authored-by: Christopher J. Wood <cjwood@us.ibm.com>
Co-authored-by: Hiroshi Horii <horii@jp.ibm.com>
* Add method to statevector controller for cpu/gpu/thrust * Add explicit thrust cpu to qasm, statevector and unitary simulator * add AER_THRUST_CPU flag to cmake to distinguish between cuda and cpu thrust * avoid nested omp for single-gpu env and enable omp threshold for thrust-omp env Co-authored-by: Jun Doi <doichan@jp.ibm.com> Co-authored-by: Christopher J. Wood <cjwood@us.ibm.com>
* Added decorator for skipping test based on unavailable method * Add tests for Thrust GPU/CPU statevector simulator methods * Add tests for Thrust GPU/CPU unitary simulator methods * Add tests for Thrust GPU/CPU qasm simulator methods * Renamed test files to be consistent Co-authored-by: Hiroshi Horii <horii@jp.ibm.com>
…of nvcc The one provided by RedHat (CUDA 10) is affected. The problem was related to a bug in the compiler when dealing with const variables passed by reference to lambdas.
* Move controller headers to src/controllers * Move base State header to src/simulator * move src/simualtors/open_pulse to src/open_pulse * Update changelog for GPU backends
|
@atilag I fixed missing clang omp symbols on mac. This is ready to merge now. Cleaning up the CMakelists for CUDA and Thrust will still need to be done after merging. |
chriseclectic
force-pushed
the
gpu-rebase
branch
from
6269e8a
to
4550206
Compare
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 a rebase of the
gpufeature branch to cleanup the commit history for merging into master.NOTE: It should be merge committed to preserve history from multiple authors rather than squashed.
Details and comments
Closes #511
Closes #512
Closes #513