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
ENH: Enforce Qobj data is fast_csr #609
Merged
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
Is this merge ready? I am looking to make the 4.0.2 release |
Should be
…On Jan 2, 2017 04:35, "Alexander Pitchford" ***@***.***> wrote:
Is this merge ready? I am looking to make the 4.0.2 release
—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub
<#609 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ABMPqSIT-mM87hOq6Snnf_eEVt0_ngKnks5rOOEWgaJpZM4LY4iC>
.
|
I see you did a lot of work here! |
Just something to do while jet lagged. |
I am going to give it a final test on Windows, then build into 4.0.2 |
Hi, I am getting this error on the current master. I guess this will be solved once this PR is merged ?
|
Never mind, I needed a re build. |
ajgpitch
added a commit
that referenced
this pull request
Jan 6, 2017
* bump master branch to 4.1 (#581) * manifest file added for including the .pyx files (#583) * manifest file added for including the .pyx files * tidy up * ENH: unit tests for fast_csr class (#586) * ENH: Allow for using erf function in time-dependent strings (#587) * ini files in tests will now be copied into dist * ini files in tests will now be copied into dist (#589) * Readme included in manifest * Readme included in manifest * Manifest readme (#592) * ini files in tests will now be copied into dist * Readme included in manifest * Corrected typo in documentation (#590) * Corrected typo in documentation * moved all imports to the top, pep8 fixes * Followed pep8 for long if statement * Better breaking of multiple lines * ENH: Faster Obj operators and states (#594) * Speed up basic operators and states Up to an order of magnitude speedup in Qobj creation. * fix indention error * fix errors * ENH: Faster identity csr and faster qeye (identity) Qobj (#595) * fast_identity * fix conflict * fix conflict * remove pointless check * Remove unneeded import in fastsparse (#596) * Qtrl split unitary tests (#600) * The first test from test_control_pulseoptim split Now 6 separate tests. Some other tests also split All tests re-numbered * str cast params filename (#602) * file_name cast as str when passing to parser Also switch to preference for SafeConfigParser * Qtrl increase test tol (#604) * ini files in tests will now be copied into dist * Readme included in manifest * Tolerance for gradient test reduced Also tidied up first control test * Correlation td tidy up (#605) * ini files in tests will now be copied into dist * Readme included in manifest * Cleanup of td files added to correlation functions * Setup updates (#606) * ini files in tests will now be copied into dist * Readme included in manifest * All QuTiP admins now listed in AUTHORS All the files included by the manifest now included in PACKAGE_DATA * BUG: trans and adjoint not returning fast_csr (#608) * ENH: Enforce Qobj data is fast_csr (#609) * fast_csr_safety * changes * fix overlap * updates * remove unnecessary tests * fix operator test name * bumpy version to 4.0.2 * remove the beta status
ajgpitch
added a commit
that referenced
this pull request
Jan 6, 2017
* bump master branch to 4.1 (#581) * manifest file added for including the .pyx files (#583) * manifest file added for including the .pyx files * tidy up * ENH: unit tests for fast_csr class (#586) * ENH: Allow for using erf function in time-dependent strings (#587) * ini files in tests will now be copied into dist * ini files in tests will now be copied into dist (#589) * Readme included in manifest * Readme included in manifest * Manifest readme (#592) * ini files in tests will now be copied into dist * Readme included in manifest * Corrected typo in documentation (#590) * Corrected typo in documentation * moved all imports to the top, pep8 fixes * Followed pep8 for long if statement * Better breaking of multiple lines * ENH: Faster Obj operators and states (#594) * Speed up basic operators and states Up to an order of magnitude speedup in Qobj creation. * fix indention error * fix errors * ENH: Faster identity csr and faster qeye (identity) Qobj (#595) * fast_identity * fix conflict * fix conflict * remove pointless check * Remove unneeded import in fastsparse (#596) * Qtrl split unitary tests (#600) * The first test from test_control_pulseoptim split Now 6 separate tests. Some other tests also split All tests re-numbered * str cast params filename (#602) * file_name cast as str when passing to parser Also switch to preference for SafeConfigParser * Qtrl increase test tol (#604) * ini files in tests will now be copied into dist * Readme included in manifest * Tolerance for gradient test reduced Also tidied up first control test * Correlation td tidy up (#605) * ini files in tests will now be copied into dist * Readme included in manifest * Cleanup of td files added to correlation functions * Setup updates (#606) * ini files in tests will now be copied into dist * Readme included in manifest * All QuTiP admins now listed in AUTHORS All the files included by the manifest now included in PACKAGE_DATA * BUG: trans and adjoint not returning fast_csr (#608) * ENH: Enforce Qobj data is fast_csr (#609) * fast_csr_safety * changes * fix overlap * updates * remove unnecessary tests * fix operator test name * bumpy version to 4.0.2 * remove the beta status * Development status corrected
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.
This pull implements a safety check where the Qobj data class is validated as fast_csr_matrix type everytime the Q.data attribute is set. This guarantees that the Qobj's have the correct data type. This was not always true previously.
In addition, many items are fixed so that the above rule passes. Finally, we no longer need the tests that check for Qobj csr_matrix type. This is now strictly enforced.