fetch from origin #126
Merged
fetch from origin #126
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
…#1115) * Update qgan.py Raise error if the number of the training data items is smaller than the batch size, e.g. due to truncation to bounds. Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
* P_BFGS spawn crash on MacOS and python >= 3.8
* Improve inequality for "a" in Shor's Algorithm * change inequality to 1 < a < N
…fix) (#1128) * determine the max number of ancillae for all ESOPs * fix for when no ancillae are needed Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
* Matrix multiplicative factor (z + z == 2 * z) * Adding ParameterExpression coefficients handling in MatrixOp comparison * MatrixOp comparison: unit test for different coefficient types * MatrixOp additions aggregation case Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com> Co-authored-by: Julien Gacon <jules.gacon@googlemail.com>
Without this check, a nonsense answer may be returned silently for
invalid input. For example, applying a Pauli Y operator to two qubits,
Y.eval('11') flips both qubits, but returns the wrong coefficient.
This behavior seems to be an unintended accident.
Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
Before, all summands were converted to MatrixOp and then summed. This PR instead converts them one by one and accumulates the result, thereby avoiding building a large intermediate list. Closes #1027 * Add release note Co-authored-by: Manoel Marques <manoel@us.ibm.com>
* ADMMParameters repr * ADMM properties, tests * linting * fix tests * removed default dependency on cplex * import fix for pylint * added reno file for ADMM * updated docstring Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com>
* 1) new argument “x_name” added to OptimizationResult constructor. It is supposed to contain the names of the variables being optimized, in most cases it should contain “problem.variables” 2) new @Property var_dict created in OptimizationResult 3) property.setters used for setting the private variables in OptimizationResult 4) all instances of OptimizationResult modified to match the constructor 5) __str__ was redundant due to existing implementation of __repr__ * Documentation updated * Documentation updated * 1) __getitem__ implemented for OptimizationResult 2) list of variables added to OptimizationResult constructor * remove unnecessary print * 1) removed unnecessary setter from AdmmOptimizationResult 2) refactoring OptimizationResult according to code review * var_dict -> variables * fixed linting * 1) properties used as intefaces only 2) refactoring based on code review 3) pylint errors fixed * fixed failed build * ensuring that lists are not None * fix ValueError Co-authored-by: Anton Dekusar <62334182+adekusar-drl@users.noreply.github.com> Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com>
* Make pyscf an optional dependency pyscf doesn't package precompiled binaries for windows, older versions of macOS or 32bit linux and this has been a constant source of pain for users trying to install the qiskit meta-package. The windows case was already being handled so pyscf isn't a hard requirement for aqua. This commit removes pyscf from the requirements list and makes it an optional dependency for all environments. Fixes Qiskit/qiskit#696 * Optional pyscf install only for non windows * fix docs * fix unit test case Co-authored-by: Manoel Marques <manoel@us.ibm.com>
* Fix torch abstract class method not implemented
* Improve opflow test repeatability
* Documentation update for CustomCircuitOracle
The bug in cvxpy 1.1.x that was breaking the aqua usage has been fixed in the latest 1.1.3 release (see Qiskit/qiskit-aer#832 and Qiskit/qiskit-aer#779 for more details). Since the bug is fixed we can remove the version cap an enable newer versions of cvxpy to be installed. Exclude rules are left on the setuptools extra requirement so that end users don't accidently try to use a version known not to run. Co-authored-by: Manoel Marques <manoelmrqs@gmail.com>
* VQE construct circuit to return circuits * add reno * add test * fix spell * return all circuits from expression (also duplicates) Co-authored-by: Manoel Marques <manoel@us.ibm.com> Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
* propagate value of combo_fn * fix combo fn in listop * fix mypy warnings * use explicit args instead of **state Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
* Indented operator string * Indenting logic moved to ListOp * Update test_op_construction.py * Update qiskit/aqua/operators/list_ops/list_op.py Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com> * Moving indent logic to OperatorBase and adding unittest * Updating test and moving INDENTATION in class to avoid import cycle Co-authored-by: Manoel Marques <manoel@us.ibm.com> Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com> Co-authored-by: Manoel Marques <manoelmrqs@gmail.com> Co-authored-by: Manoel Marques <manoel.marques@ibm.com>
* Fix PySCF driver exception
* Fix MP2Info when single double excitation * Update comment
* refactored converter's constructor * added baseconverter class * added is_compatible_with_integer_slack * added InequalityToEquality converter to QuadraticProgramToQubo * refactor InequalityToEquality converter * refactored encode and decode name * renamed encode/decode to convert/interpret * added getter/setter for linear * moved `name` to convert method * fixed IsingToQuadraticProgram * removed `name` arguments from converters * added to_ising and from_ising * moved converters to constructors of algorithms * fixed deprecated msg and added conv to results Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com> Co-authored-by: Julien Gacon <jules.gacon@googlemail.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
Details and comments