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

Pulse sim refactor #2

Merged
merged 59 commits into from
Mar 19, 2020
Merged

Pulse sim refactor #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
452cc75
initial restructure, moved digest into controllers, models into syste…
DanPuzzuoli Feb 21, 2020
781f3a5
removed models from pulse folder and corrected imports
DanPuzzuoli Feb 21, 2020
ce33bc8
moving qobj digesting into separate files
DanPuzzuoli Feb 21, 2020
4f038f9
added return statement. About to try to eliminate functionality from …
DanPuzzuoli Feb 21, 2020
67d78cc
one last change before attempting to migrate
DanPuzzuoli Feb 21, 2020
c2de6f4
corrected minor errors to get tests to work (miraculously)
DanPuzzuoli Feb 21, 2020
84f2d42
minor changes to comments
DanPuzzuoli Feb 24, 2020
f46ea05
renaming some things
DanPuzzuoli Feb 24, 2020
56a9db7
missed a renaming change in previous commit
DanPuzzuoli Feb 24, 2020
09478be
initial attempts to compartmentalize Hamiltonian/Noise string parsing
DanPuzzuoli Feb 24, 2020
128192b
starting to compartmentalize what is necessary for string parsing
DanPuzzuoli Feb 24, 2020
1249aa3
trying to isolate pieces of qutip required for parsing/digest
DanPuzzuoli Feb 24, 2020
8b688c0
attempting to clearly separate the part that directly depends on quti…
DanPuzzuoli Feb 26, 2020
7e55f87
attempting to clearly separate the part that directly depends on quti…
DanPuzzuoli Feb 26, 2020
165a05d
some more renaming
DanPuzzuoli Feb 26, 2020
509da29
moved old folders into pulse0/, and changed references for files stil…
DanPuzzuoli Feb 26, 2020
062b1f6
successfully updated all imports for moving old sim folders into puls…
DanPuzzuoli Feb 26, 2020
bca022c
(I think) last update to totally contain old files in pulse0/
DanPuzzuoli Feb 26, 2020
80e2668
attempting to organize/provide more explanation for file location and…
DanPuzzuoli Feb 26, 2020
23310cd
renaming to attempt to clean up a bit
DanPuzzuoli Feb 26, 2020
15ddd35
attempting to isolate relevant functionality in the unitary solver
DanPuzzuoli Feb 26, 2020
0816c04
Moved OPoptions into de_solvers/
DanPuzzuoli Feb 27, 2020
8dbd817
minor change, but commiting to attempt rebase on master
DanPuzzuoli Feb 27, 2020
b0e9c06
removed direct dependence of pulse_controller on opsolve
DanPuzzuoli Feb 27, 2020
cfb30c5
bringing data_config.py into the current structure, about to begin el…
DanPuzzuoli Feb 27, 2020
543cf09
decided to not eliminate the cython references for now
DanPuzzuoli Feb 28, 2020
9716d5d
beginning move of non-DE solving pieces out of unitary_solver and int…
DanPuzzuoli Feb 28, 2020
6f2fd28
moving more out of qutip_unitary_solver to pulse_controller, and re-e…
DanPuzzuoli Feb 28, 2020
49070b9
about to try moving measurement into pulse_controller
DanPuzzuoli Feb 28, 2020
4c9ed4c
moved measurement out, first tests passed
DanPuzzuoli Feb 28, 2020
067a201
verified cython still works with recent changes, plus some small changes
DanPuzzuoli Feb 28, 2020
1bd6a7e
moved op_data_config to pulse_controller to consolidate simulation da…
DanPuzzuoli Feb 28, 2020
ddbcb55
extracting only the data required by the unitary solver works
DanPuzzuoli Mar 2, 2020
12a106c
Figured out how to get noise into C++ solver when playing wiht existi…
DanPuzzuoli Mar 2, 2020
5a1efd0
I believe all use_cpp tags eliminated, aside from the one before the …
DanPuzzuoli Mar 2, 2020
2cf72d9
monte carlo solver successfully brought into new structure
DanPuzzuoli Mar 2, 2020
f5751eb
minor renaming
DanPuzzuoli Mar 2, 2020
ea2c099
moving some stuff around to attempt to simplify directory structure
DanPuzzuoli Mar 4, 2020
9d47d04
added a test for using noise models
DanPuzzuoli Mar 4, 2020
3800c65
fixed hack for getting noise to be correctly used in the numeric inte…
DanPuzzuoli Mar 4, 2020
addd25c
moving qiskit zvode
DanPuzzuoli Mar 5, 2020
063cc06
attempting to pull qutip qobj
DanPuzzuoli Mar 5, 2020
c805d53
trimmed various qutip files and moved into qutip_extra_lite
DanPuzzuoli Mar 5, 2020
9844c33
updated __init__ file
DanPuzzuoli Mar 5, 2020
7e33c06
moving dimensions over
DanPuzzuoli Mar 6, 2020
07e3cab
moving import in test_duffing_model_generators to qutip_extra_lite
DanPuzzuoli Mar 6, 2020
d35fd29
bringing over fastsparse.py and the qutip_lite/cy folder
DanPuzzuoli Mar 6, 2020
e96bb09
moved cy/measure over, about to try deleting pulse0
DanPuzzuoli Mar 6, 2020
8cf1075
attempting initial delete of pulse0
DanPuzzuoli Mar 6, 2020
0e7507c
successful deletion of pulse0 (tests pass)
DanPuzzuoli Mar 6, 2020
e1b5403
changing travis.yml to get it to skip lint just to run remote tests
DanPuzzuoli Mar 6, 2020
2a30d9d
fixed importing for some cpp/cython test cases I had missed
DanPuzzuoli Mar 6, 2020
e516682
attempting to fix test errors
DanPuzzuoli Mar 6, 2020
28b0905
further attempts to fix build issues
DanPuzzuoli Mar 6, 2020
43d00bd
updating Manifest.in to reflect folder restructure
DanPuzzuoli Mar 6, 2020
f0d74f0
reverting travis.yml to undo hack to skip travis lint testing
DanPuzzuoli Mar 6, 2020
f745d88
Removed unused qutip cython code
vvilpas Mar 13, 2020
90930e6
Merge branch 'pulse-sim-initial-refactor' into pulse-sim-refactor
DanPuzzuoli Mar 19, 2020
1eea198
Missed deletion of file not needed anymore
vvilpas Mar 19, 2020
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
2 changes: 0 additions & 2 deletions qiskit/providers/aer/pulse/qutip_extra_lite/cy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ include(cython_utils)
string(REPLACE " -static " "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

set(CYTHON_INSTALL_DIR "qiskit/providers/aer/pulse/qutip_extra_lite/cy")
add_cython_module(spconvert src/zspmv.cpp)
add_cython_module(spmath src/zspmv.cpp)
add_cython_module(sparse_utils src/zspmv.cpp)
add_cython_module(spmatfuncs src/zspmv.cpp)
add_cython_module(measure)
add_cython_module(utils)
Loading