This repository was archived by the owner on Dec 7, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 376
Operator Flow #852
Merged
dongreenberg
merged 423 commits into
qiskit-community:master
from
dongreenberg:operator_refactor
Apr 27, 2020
Merged
Operator Flow #852
Changes from all commits
Commits
Show all changes
423 commits
Select commit
Hold shift + click to select a range
ba9681b
Add abelian property to opvecs and AbelianGrouper to operator init.
dongreenberg 8465f42
Break up PauliCoB big clifford synthesis function into smaller ones.
dongreenberg 8fe8636
Add AbelianGrouper test.
dongreenberg e24ce6f
Add better input checking in primitives and remove unnecessary print.
dongreenberg 81c744b
Fix coeffs bugs in pauli_cob.py.
dongreenberg 5f1da2c
Reorganize pauli_cob. All tests pass, with grouping on and off.
dongreenberg a439d79
Change expectation_value backends to work through setters.
dongreenberg d0953c4
Reorganize local_simulator_sampler.py a bit to use it in a test.
dongreenberg 13fa919
Grouping Paulis works!! All tests pass.
dongreenberg 414caf4
Add "compute TPB pauli" function to pauli_cob.
dongreenberg 3cb26ee
Add WIP attempt at evolution over Abelian paulis.
dongreenberg 0cc52ee
Merge branch 'operator_refactor_evolve_abelian' into operator_refactor
dongreenberg 86623a6
Fix trotter bug.
dongreenberg 061d635
Fix some other Trotter bugs.
dongreenberg 47cd06f
Add parameters to OpPaulis and test. Parameterized evolution passes!!!
dongreenberg a8fcd9c
Add parameter binding for Op coefficients.
dongreenberg 9cd8692
Add parameter binding, and binding tests. Tests pass.
dongreenberg 136a7fa
Add division to Operators to make normalization convenient.
dongreenberg 7851aae
Finish merging MinEigenSolver PR. All tests pass.
dongreenberg 633fadc
Update QAOA, all tests pass!!
dongreenberg f8d159f
Update some QAOA imports and typehints.
dongreenberg b6c5097
Add QDrift trotterization method. All tests pass.
dongreenberg ca33087
Start migrating QPE, tests fail.
dongreenberg b1cc11d
Merge remote-tracking branch 'upstream/master' into operator_refactor
dongreenberg e27df71
fix spell
manoelmarques 9dbed2c
fix almost all style errors
manoelmarques d12a3fc
fix copyright
manoelmarques 9c585d3
fix import cycles, changed to relative imports when possible
manoelmarques bb51bf5
relative imports
manoelmarques d4a5ec9
Add bind_params to state_fn_circuit.py and op_circuit.py, and tests. …
dongreenberg 19b6704
Add param list handling for all Op types.
dongreenberg 25075b9
Make OpVec printing nicer.
dongreenberg db18820
Add op_converter to imports for better backwards compatibility.
dongreenberg 66c58b1
Add AerPauliExpectation tests. Tests pass. Issue with Aer though.
dongreenberg c215463
Fix a few AerPauliExpectation bugs
dongreenberg ecc7cd5
Start building toward parameterized Qobj.
dongreenberg a1a1e36
fix some lint errors
manoelmarques 2f92748
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 01a798a
fix some lint errors
manoelmarques 5602559
fix style
manoelmarques dfc5db0
fix copyright
manoelmarques 5229bef
Merge branch 'master' into operator_refactor
manoelmarques bc5bebc
set style to defaults, fix aqua unit test loading
manoelmarques 04affa0
change loading tests qpe/iqpe
manoelmarques 3b2a337
Fix OpPrimitive lint errors.
dongreenberg 9163ada
Fix operator_base.py lint errors.
dongreenberg 5dd9d51
Fix state_fn.py lint errors.
dongreenberg fa0fc2b
Fix OpVec lint errors.
dongreenberg a1ed0b0
Fix state_fn_circuit.py lint errors.
dongreenberg 23388b4
Fix state_fn_dict.py lint errors.
dongreenberg 5e2f3db
Fix state_fn_operator.py lint errors.
dongreenberg 8287335
Fix state_fn_vector.py lint errors. Tests pass.
dongreenberg aeb6c00
Fix QDrift test to deal with first Op in trotterization list being Op…
dongreenberg 449023f
Fix op_circuit.py lint errors.
dongreenberg fa1ad62
Fix op_pauli.py lint errors.
dongreenberg df87ef2
Fix op_composition.py lint errors.
dongreenberg f985713
Fix op_kron.py lint errors.
dongreenberg cb84606
Fix abelian_grouper.py lint errors. Tests pass.
dongreenberg d51d587
Fix pauli_cob.py lint errors. Tests pass.
dongreenberg ef0707e
Fix Expectation lint errors. Tests pass.
dongreenberg 5625281
Fix circuit sampler lint errors. Tests pass.
dongreenberg 424d088
Fix other expectation lint errors. Tests pass.
dongreenberg cede1da
Fix trotterization lint errors. Tests pass.
dongreenberg 1df2d64
Add MatrixEvolution shell, fix evolution lint errors.
dongreenberg 879d92a
Fix bug in evolution tests after fixing lint errors.
dongreenberg 2a7c748
Fix cyclic import for lint.
dongreenberg 4616a7b
fix pylint cyclic import error
manoelmarques 6099d42
merge master fix conflicts
manoelmarques d776285
Make tests pass. Add aux_ops back to VQE, and make VQE and QAOA take …
dongreenberg f92fb91
fix spell and lint
manoelmarques 3b2e866
Merge branch 'master' into operator_refactor
manoelmarques 48cd8e2
Fix swapping issue in evolution.
dongreenberg 634a1d1
Fix composition in OpEvolution.
dongreenberg 3adf879
Fix add OpSum and kron OpKron in OpEvolution.
dongreenberg c982215
Add to_opflow to legacy base_operator
dongreenberg 6027f1f
merge master and fix conflicts
manoelmarques 4adc038
Clean OpCircuit and StateFnCircuit __str__
dongreenberg fabb82f
Fix qaoa mixer.
dongreenberg e18e7b7
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg ebdc008
fix spell,style
manoelmarques 18a7c0f
Ok now really all tests pass.
dongreenberg 0ffd33b
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg c1469ed
Merge branch 'master' into operator_refactor
manoelmarques 5d4be06
merge master fix conflicts
manoelmarques 880686a
add to_matrix_op() methods to ops.
dongreenberg 055338c
Start migrating NumpyEigensolver for Opflow
dongreenberg 64961d9
Start removing back from op_primitive eval functions. All tests pass.
dongreenberg 2532e2b
Update eval logic (to be able to remove back) for operator_combos.
dongreenberg 76ff777
Add to_matrix_op for OpMatrix and StateFnVector, and change some `if …
dongreenberg 4682560
Finish decoupling back args from evals. All tests pass.
dongreenberg c3f6900
Remove back from eval logic.
dongreenberg fc0386d
Remove back from eval. All tests pass.
dongreenberg 0e752de
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 25ee5e5
Change matrix_expectation.py to rely on to_matrix_op.
dongreenberg 8a892eb
Merge branch 'operator_refactor_numpyeigen' into operator_refactor
dongreenberg daf751f
Migrate numpy_eigen_solver.py and numpy_minimum_eigen_solver.
dongreenberg 3254319
Remove ToMatrixOp converter.
dongreenberg f3ce481
merge fix conflicts,spell, lint
manoelmarques ab27697
set VQE _auto_conversion to False for now
manoelmarques 3c5f5ce
Merge branch 'master' into operator_refactor
manoelmarques 7c485cb
Add sampling and tests. Fix a rounding error in a test. Fix a not non…
dongreenberg b2efda0
Merge branch 'master' into operator_refactor
manoelmarques 73f3107
Add array methods to OpVec. Fix typo in OpPauli. Allow reverse_endian…
dongreenberg 76653a3
Make NumpyEigensolver return a StateFn in result.eigenstate.
dongreenberg cf1f4c3
Fix flaky optimization tests. Fix OpVec so iterator interface works.
dongreenberg 5011ae2
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg e7f8f07
Merge master and fix conflicts
manoelmarques d524a5e
Fix StateFnVector sampling. Fix sparse NumpyEigensolution. Fix some a…
dongreenberg 1fd24bc
Change some sparsity stuff.
dongreenberg 984db57
fix spelling
manoelmarques 2a7b7b7
Merge branch 'master' into operator_refactor
manoelmarques 7cfc817
Typehints.
dongreenberg eac3426
More typehints
dongreenberg 3673e27
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg e8353b6
fix copyright
manoelmarques cca2074
fix spelling
manoelmarques b211a61
More typehints, make globals immutable.
dongreenberg 5c57050
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 2f85392
fix style
manoelmarques 008c515
Rearrange tests, Add CZ to globals.
dongreenberg 9b376a7
Refactor some names.
dongreenberg 2e74b58
Rename OpEvolution to EvolutionOp. Tests pass.
dongreenberg 618afb4
Rename primitive ops. All tests pass.
dongreenberg 7fd9336
Finish renamings.
dongreenberg aebaa8b
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 95ca132
Test IBMQ Pauli expectation. All tests pass.
dongreenberg c6c363d
Update spelling.
dongreenberg 194e38e
Update Pauli to num_qubits.
dongreenberg c288207
Updating some naming.
dongreenberg 63c73c0
Merge branch 'master' of https://github.com/QISKit/qiskit-aqua into o…
manoelmarques 8c7ed98
Merge branch 'master' into operator_refactor
manoelmarques d5dc200
Merge branch 'master' into operator_refactor
manoelmarques 9fd8457
Merge branch 'master' into operator_refactor
manoelmarques 4a2334a
Add diag support to fix knapsack issue.
dongreenberg 2169b6c
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 5f4178e
Merge branch 'master' into operator_refactor
manoelmarques aae7c86
merge fix conflicts
manoelmarques 6d3000c
fix unit test
manoelmarques c5c3260
fix unit test
manoelmarques 8048bd7
fix travis
manoelmarques 19b3182
Merge branch 'master' into operator_refactor
manoelmarques 2d69054
Turn half of Steve's comments.
dongreenberg d72e138
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 09b6898
Merge branch 'master' of https://github.com/QISKit/qiskit-aqua into o…
manoelmarques 99d9e91
Merge branch 'master' of https://github.com/QISKit/qiskit-aqua into o…
manoelmarques 27ea89c
merge fix conflicts
manoelmarques c0a13d0
merge flix conflicts
manoelmarques 52f3b8b
Merge branch 'master' into operator_refactor
manoelmarques 8230a08
Merge branch 'master' into operator_refactor
dongreenberg 3a562b4
Fix some exponentiation things.
dongreenberg 407f4f9
Fix some exponentiation things.
dongreenberg 4be96bc
Add trotterization_factory. All tests pass.
dongreenberg 8a481f1
Add evolution_factory. All tests pass.
dongreenberg dfb1ce6
Add circuit_sampler_factory. All tests pass.
dongreenberg 257c673
Rename get_primitives to primitive_strings. Turn some of Julien's cha…
dongreenberg 3aa4934
Only allow sample_circuits to accept circuit_ops. Tests pass.
dongreenberg a3b93ab
Turn more review changes
dongreenberg a366057
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 79a9523
Merge branch 'master' into operator_refactor
manoelmarques 3282377
fix spell, style
manoelmarques 0b48d15
Merge branch 'master' into operator_refactor
manoelmarques 4ba2eeb
merge fix conflicts
manoelmarques e36f5cb
Add matrix_op exp_i() into HamiltonianGate. Tests fail due to Circuit…
dongreenberg 76ee9f1
Change CircuitOp and StateFnCircuit to rely on QuantumCircuit instead…
dongreenberg fd44f94
Add matrix_evolution and update QAOA to test matrix_op for cost opera…
dongreenberg 8fb7f52
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 608e921
Delete PauliToInstruction, as it's obsolete.
dongreenberg 95ae6ec
Add to_pauli_op and tests. Tests pass.
dongreenberg fe7a0f5
Fix composed_op.py eval bug
dongreenberg 556ca92
Add sig digit rounding. VQE tests fail.
dongreenberg feb3957
better precision for sig digit rounding. Tests pass.
dongreenberg 531474e
Fix pep8, add comment
dongreenberg 77266af
Add to_circuit_op to statefns, making DictToCircuit mostly obsolete. …
dongreenberg 8944361
Merge branch 'master' into operator_refactor
manoelmarques 48d3e98
fix cyclic imports
manoelmarques bb45f6a
Merge branch 'master' of https://github.com/QISKit/qiskit-aqua into o…
manoelmarques a779932
fix numpy boolean to string coercion
manoelmarques d1f6865
Update repr and a docstring.
dongreenberg ec8fd85
Make ExpectationValues into converters. Test pass.
dongreenberg d8235f2
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 3c60790
Fix bug from merge.
dongreenberg 376bee8
Fix bugs, make Minus just a CircuitStateFn and not a ComposedOp.
dongreenberg 2a381b8
Uncomment HamiltonianGate
manoelmarques 0f36996
Merge branch 'master' into operator_refactor
manoelmarques e15efcf
Update lots of docstrings part I. Tests pass.
dongreenberg 88b0a11
fix docstring
manoelmarques c59998d
More docstrings. Change class.rst so docs are generated for some pyth…
dongreenberg cfd1cc4
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 5ecf5c8
Add navigation structure for docs to init files
woodsp-ibm 507f51b
Merge native circuits PR with Operator flow. Tests pass.
dongreenberg 7af0d05
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 941d9bb
Merge branch 'master' of https://github.com/QISKit/qiskit-aqua into o…
manoelmarques bd1af37
More docs.
dongreenberg d4f6f6d
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg cb949f9
fix doctrings
manoelmarques 7341fb2
Merge branch 'master' of https://github.com/QISKit/qiskit-aqua into o…
manoelmarques b87b7ac
1) Change local_simulator_sampler.py to circuit_sampler.py
dongreenberg 48bb49d
1) Delete circuit_samplers.
dongreenberg 689f044
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 58b5674
Update Operator init
dongreenberg f9de11b
Change Operator directory names. Tests pass.
dongreenberg 1ec3a41
fix spell, docs
manoelmarques e76c52a
Turn Expectations purely into converters. Tests pass.
dongreenberg 9bac121
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg d206ff6
fix docs
manoelmarques ae26558
skip IBMQ test
manoelmarques 597b224
Add Converters docs. Tests pass.
dongreenberg f2efefe
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg c4f7896
fix spell
manoelmarques 8e39a2b
Add Evolutions docs. Tests pass.
dongreenberg 5a2e664
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg f8d19ba
Add Expectation docs. Tests pass.
dongreenberg 5088388
fix spell
manoelmarques b278a08
Add StateFn docs. Tests pass.
dongreenberg 619b00a
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg f7fa545
Fix typo.
dongreenberg c2a2b0c
Add ListOp init docs.
dongreenberg ccd1dad
Fix some ordering
dongreenberg dc559e8
Little docs edits.
dongreenberg 7afe292
fix spell
manoelmarques c121525
Merge branch 'master' into operator_refactor
manoelmarques a303d7a
Little docs edits.
dongreenberg 28813d2
1) Add to_legacy_op to OperatorBase to allow non-migrated algos to ac…
dongreenberg 495d0fc
Fix typehints for minimum_eigen_solvers
dongreenberg eb1764c
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg e94d251
Make sure expectations can handle mixed observables.
dongreenberg cf463cb
fix spell
manoelmarques 125ba7e
Turn some more of Steve's comments. Tests pass.
dongreenberg 0868f7f
Turn some more of Steve's comments. Fix a buncha parameter stuff, and…
dongreenberg 4761213
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 4bd1d4d
Turn some more of Steve's comments. Tests pass.
dongreenberg 13c540f
Turn some comments, fix a QAOA bug.
dongreenberg 04203d6
Try collapsing ListOp to_matrix a bit.
dongreenberg fcb1d32
Turn more comments, fix some bugs.
dongreenberg 73bfb6a
Turn more comments, fix some bugs.
dongreenberg 42d1dbf
Update ListOp docs.
dongreenberg 87d971f
Update ListOp docs.
dongreenberg 85c69cc
Update ListOp docs.
dongreenberg 62c251c
fix docstring
manoelmarques b38db3a
Update minimum_eigen_solvers setter typehints.
dongreenberg f3bdf2b
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg a23215f
Add Changelog and tests for DictToCircuitSum.
dongreenberg d56f7e2
Update VQE's construct_circuit and some changelog elements.
dongreenberg 72c3ef7
fix spell
manoelmarques bf44bb1
Merge remote-tracking branch 'upstream/master' into operator_refactor
dongreenberg ae1e740
Allow MinEigenOptimizer to accept StateFn result in result.eigenstate.
dongreenberg e796637
fix style
manoelmarques 6530146
Update changelog with more detail. Update VQE to call super.
dongreenberg 0ab112e
Merge remote-tracking branch 'origin/operator_refactor' into operator…
dongreenberg 81ab711
Typo
dongreenberg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.