Merge pull request #984 from manoelmarques/stable-0.7.1

[Stable] Aqua Release 0.7.1

Author: manoelmarques

.pylintdict

@@ -4,6 +4,7 @@ abstractmethod
 adag
 adam
 adjoints
+ADMMState
 ae
 aer
 Aer's
@@ -347,6 +348,7 @@ lhs
 lih
 lijh
 lin
+LinearConstraint
 LinearConstraintInterface
 linearpaulirotations
 ljik
@@ -462,7 +464,6 @@ oplist
 oplist's
 oplus
 optim
-QuadraticProgram
 optimizer's
 optimizers
 opv
@@ -539,7 +540,9 @@ qp
 qpe
 qreg
 qrs
+QuadraticConstraint
 QuadraticConstraintInterface
+QuadraticProgram
 quandl
 quantized
 quantumcircuit

.travis.yml

@@ -55,9 +55,6 @@ stage_dependencies: &stage_dependencies
     - pip install -U 'pip<20.0.0'
     - pip install -U setuptools wheel
     - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-    - sudo apt-get -y update
-    - sudo apt-get -y install g++-7
-    - sudo apt-get -y install libopenblas-dev
     - |
       if [ "$DEPENDENCY_BRANCH" == "master" ]; then
         pip install cython
@@ -67,6 +64,10 @@ stage_dependencies: &stage_dependencies
         pip install https://github.com/Qiskit/qiskit-ignis/archive/master.zip --progress-bar off
         # Installing qiskit-ibmq-provider master branch...
         pip install https://github.com/Qiskit/qiskit-ibmq-provider/archive/master.zip --progress-bar off
+        # install qiskit-aer build dependencies
+        sudo apt-get -y update
+        sudo apt-get -y install g++-7
+        sudo apt-get -y install libopenblas-dev
         # Clone qiskit-aer
         git clone --recurse-submodules https://github.com/Qiskit/qiskit-aer.git /tmp/qiskit-aer
         cd /tmp/qiskit-aer
@@ -128,6 +129,7 @@ jobs:
         - sudo apt-get -y install python3-enchant
         - sudo apt-get -y install hunspell-en-us
         - pip install pyenchant
+        - pip install cplex
       script:
         - make spell
         - make style
@@ -145,6 +147,7 @@ jobs:
             - aqua1.dat
             - aqua137.dep
       before_script:
+        - pip install cplex
         - pip install cvxopt
         - export PYTHON="coverage3 run --source qiskit/aqua,qiskit/chemistry,qiskit/finance,qiskit/ml,qiskit/optimization --omit */gauopen/* --parallel-mode"
       script:
@@ -175,6 +178,7 @@ jobs:
             - aqua2.dat
             - aqua237.dep
       before_script:
+        - pip install cplex
         - pip install cvxopt
         - export PYTHON="coverage3 run --source qiskit/aqua,qiskit/chemistry,qiskit/finance,qiskit/ml,qiskit/optimization --omit */gauopen/* --parallel-mode"
       script:
@@ -213,7 +217,9 @@ jobs:
         - sudo apt-get -y install libgfortran5
         # Installing pyquante2 master branch...
         - pip install https://github.com/rpmuller/pyquante2/archive/master.zip --progress-bar off
+        # make sure it uses latest numpy, this will be removed later
         - pip install -U numpy
+        - pip install cplex
       before_script:
         - export PYTHON="coverage3 run --source qiskit/aqua,qiskit/chemistry,qiskit/finance,qiskit/ml,qiskit/optimization --omit */gauopen/* --parallel-mode"
       script:
@@ -249,6 +255,7 @@ jobs:
             - finance.dat
             - finance37.dep
       before_script:
+        - pip install cplex
         - export PYTHON="coverage3 run --source qiskit/aqua,qiskit/chemistry,qiskit/finance,qiskit/ml,qiskit/optimization --omit */gauopen/* --parallel-mode"
       script:
         - stestr --test-path test/finance run 2> >(tee /dev/stderr out.txt > /dev/null)
@@ -276,6 +283,7 @@ jobs:
             - ml.dat
             - ml37.dep
       before_script:
+        - pip install cplex
         - export PYTHON="coverage3 run --source qiskit/aqua,qiskit/chemistry,qiskit/finance,qiskit/ml,qiskit/optimization --omit */gauopen/* --parallel-mode"
       script:
         - stestr --test-path test/ml run 2> >(tee /dev/stderr out.txt > /dev/null)
@@ -303,6 +311,7 @@ jobs:
             - optimization.dat
             - optimization37.dep
       before_script:
+        - pip install cplex
         - export PYTHON="coverage3 run --source qiskit/aqua,qiskit/chemistry,qiskit/finance,qiskit/ml,qiskit/optimization --omit */gauopen/* --parallel-mode"
       script:
         - stestr --test-path test/optimization run 2> >(tee /dev/stderr out.txt > /dev/null)
@@ -324,6 +333,7 @@ jobs:
       <<: *stage_dependencies
       if: tag IS blank
       script:
+        - pip install cplex
         - pip install cvxopt
         - pip install https://github.com/rpmuller/pyquante2/archive/master.zip --progress-bar off
         - pip check

CHANGELOG.md

@@ -15,9 +15,24 @@ Changelog](http://keepachangelog.com/en/1.0.0/).
 > -   **Fixed**: for any bug fixes.
 > -   **Security**: in case of vulnerabilities.
 
-[UNRELEASED](https://github.com/Qiskit/qiskit-aqua/compare/0.7.0...HEAD)
+[UNRELEASED](https://github.com/Qiskit/qiskit-aqua/compare/0.7.1...HEAD)
 ========================================================================
 
+[0.7.1](https://github.com/Qiskit/qiskit-aqua/compare/0.7.0...0.7.1) - 2020-05-14
+=================================================================================
+
+Added
+-----
+
+-   Added a `linear` option to the `IsingToQuadraticProgram` converter (#956)
+
+Removed
+-------
+
+-   The monkey-patched ``QuantumCircuit.mcmt`` method and tests, has moved to Terra (#950)
+-   CPLEX as install requirement in ``requirements.txt`` (#952)
+
+
 [0.7.0](https://github.com/Qiskit/qiskit-aqua/compare/0.6.6...0.7.0) - 2020-04-30
 =================================================================================
 
@@ -101,7 +116,7 @@ Changed
 -   HartreeFock initial state and UCCSD variational form `num_qubits` parameter removed as it was
     only value checked against that computed internally from the other parameters. UCCSD `depth`
     parameter renamed to `reps` and moved in order so it can default to 1. (#939)
-     
+
 
 Removed
 -------

docs/_static/custom.css

@@ -0,0 +1,27 @@
+.toggle .header {
+    display: block;
+    clear: both;
+    background-color: #785EF0;
+    color: #f9f9f9;
+    height: 40px;
+    padding-top: 10px;
+    padding-left: 5px;
+    margin-bottom: 20px;
+}
+
+.toggle .header:before {
+    float: left;
+    content: "▶ ";
+    font-size: 20px;
+
+}
+
+.toggle .header.open:before {
+    float: left;
+    content: "▼ ";
+    font-size: 20px;
+}
+
+.toggle{
+  background: #FBFBFB;
+}

docs/_templates/page.html

@@ -0,0 +1,14 @@
+{% extends "!page.html" %}
+
+{% block footer %}
+ <script type="text/javascript">
+    $(document).ready(function() {
+        $(".toggle > *").hide();
+        $(".toggle .header").show();
+        $(".toggle .header").click(function() {
+            $(this).parent().children().not(".header").toggle(400);
+            $(this).parent().children(".header").toggleClass("open");
+        })
+    });
+</script>
+{% endblock %}

docs/apidocs/qiskit.aqua.circuits.gates.rst

@@ -65,16 +65,14 @@
     'sphinx.ext.viewcode',
     'sphinx.ext.extlinks',
     'sphinx_tabs.tabs',
-    'jupyter_sphinx.execute',
+    'jupyter_sphinx',
     'sphinx_autodoc_typehints',
     'reno.sphinxext',
     'sphinx.ext.doctest',
 ]
 html_static_path = ['_static']
 templates_path = ['_templates']
-html_css_files = [
-    'style.css',
-]
+html_css_files = ['style.css', 'custom.css']
 
 # -----------------------------------------------------------------------------
 # Autosummary
@@ -89,7 +87,6 @@
 
 autodoc_default_options = {
     'inherited-members': None,
-    'show-inheritance': None,
 }
 
 
@@ -113,7 +110,7 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = []
+exclude_patterns = ['_build', '**.ipynb_checkpoints']
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'colorful'

docs/conf.py

@@ -1 +1 @@
-0.7.0
+0.7.1

qiskit/aqua/VERSION.txt

@@ -275,7 +275,7 @@ def get_kernel_matrix(quantum_instance, feature_map, x1_vec, x2_vec=None):
                     (feature_map_params, feature_map_params), feature_map, measurement,
                     is_statevector_sim=is_statevector_sim)
                 parameterized_circuit = quantum_instance.transpile(parameterized_circuit)[0]
-                circuits = [parameterized_circuit.bind_parameters({feature_map_params: x})
+                circuits = [parameterized_circuit.assign_parameters({feature_map_params: x})
                             for x in to_be_computed_data]
             else:
                 #  the second x is redundant
@@ -327,8 +327,8 @@ def get_kernel_matrix(quantum_instance, feature_map, x1_vec, x2_vec=None):
                         (feature_map_params_x, feature_map_params_y), feature_map, measurement,
                         is_statevector_sim=is_statevector_sim)
                     parameterized_circuit = quantum_instance.transpile(parameterized_circuit)[0]
-                    circuits = [parameterized_circuit.bind_parameters({feature_map_params_x: x,
-                                                                       feature_map_params_y: y})
+                    circuits = [parameterized_circuit.assign_parameters({feature_map_params_x: x,
+                                                                         feature_map_params_y: y})
                                 for x, y in to_be_computed_data_pair]
                 else:
                     if logger.isEnabledFor(logging.DEBUG):

qiskit/aqua/algorithms/classifiers/qsvm/qsvm.py

@@ -45,6 +45,14 @@ class VQC(VQAlgorithm):
     VQC uses the variational method to solve such problems in a quantum processor.  Specifically,
     it optimizes a parameterized quantum circuit to provide a solution that cleanly separates
     the data.
+
+    .. note::
+
+        The VQC stores the parameters of `var_form` and `feature_map` sorted by name to map the
+        values provided by the optimizer to the circuit. This is done to ensure reproducible
+        results, for example such that running the optimization twice with same random seeds yields
+        the same result.
+
     """
 
     def __init__(
@@ -529,7 +537,7 @@ def feature_map(self, feature_map: Union[FeatureMap, QuantumCircuit]):
 
             # store the parameters
             self._num_qubits = feature_map.num_qubits
-            self._feature_map_params = list(feature_map.parameters)
+            self._feature_map_params = sorted(feature_map.parameters, key=lambda p: p.name)
             self._feature_map = feature_map
         elif isinstance(feature_map, FeatureMap):
             # raw feature vector is not yet replaced
@@ -547,7 +555,7 @@ def feature_map(self, feature_map: Union[FeatureMap, QuantumCircuit]):
         else:
             raise ValueError('Unsupported type {} of feature_map.'.format(type(feature_map)))
 
-        if self._feature_map and self._feature_map.feature_dimension == 0:
+        if self._feature_map.feature_dimension == 0:
             warnings.warn('The feature map has no parameters that can be optimized to represent '
                           'the data. This will most likely cause the VQC to fail.')