Fix for docplex 2.20 (qiskit-community#1520)

* Fix for docplex 2.20

* fix cvxpy not installed on unit test

Co-authored-by: Manoel Marques <manoel.marques@ibm.com>

qiskit/optimization/applications/ising/docplex.py

@@ -63,6 +63,8 @@
 
 import numpy as np
 from docplex.mp.constants import ComparisonType
+from docplex.mp.constr import LinearConstraint, QuadraticConstraint
+from docplex.mp.dvar import Var
 from docplex.mp.model import Model
 from qiskit.quantum_info import Pauli
 

qiskit/optimization/problems/quadratic_program.py

@@ -25,7 +25,7 @@
 from docplex.mp.constr import (LinearConstraint as DocplexLinearConstraint,
                                QuadraticConstraint as DocplexQuadraticConstraint,
                                NotEqualConstraint)
-from docplex.mp.linear import Var
+from docplex.mp.dvar import Var
 from docplex.mp.model import Model
 from docplex.mp.model_reader import ModelReader
 from docplex.mp.quad import QuadExpr

test/aqua/test_qsvm.py

@@ -244,15 +244,19 @@ def test_matrix_psd(self):
 
         feature_map = ZZFeatureMap(feature_dimension=feature_dim, reps=2, entanglement='linear')
 
-        with self.assertRaises(DQCPError):
-            # Sampling noise means that the kernel matrix will not quite be positive
-            # semi-definite which will cause the optimize svm to fail
-            backend = BasicAer.get_backend('qasm_simulator')
-            quantum_instance = QuantumInstance(backend, shots=1024, seed_simulator=seed,
-                                               seed_transpiler=seed)
-            kernel_matrix = QSVM.get_kernel_matrix(quantum_instance, feature_map=feature_map,
-                                                   x1_vec=training_data, enforce_psd=False)
-            _ = optimize_svm(kernel_matrix, labels, lambda2=0)
+        try:
+            with self.assertRaises(DQCPError):
+                # Sampling noise means that the kernel matrix will not quite be positive
+                # semi-definite which will cause the optimize svm to fail
+                backend = BasicAer.get_backend('qasm_simulator')
+                quantum_instance = QuantumInstance(backend, shots=1024, seed_simulator=seed,
+                                                   seed_transpiler=seed)
+                kernel_matrix = QSVM.get_kernel_matrix(quantum_instance, feature_map=feature_map,
+                                                       x1_vec=training_data, enforce_psd=False)
+                _ = optimize_svm(kernel_matrix, labels, lambda2=0)
+        except MissingOptionalLibraryError as ex:
+            self.skipTest(str(ex))
+            return
 
         # This time we enforce that the matrix be positive semi-definite which runs logic to
         # make it so.

test/chemistry/test_adapt_vqe.py

@@ -1,6 +1,6 @@
 # This code is part of Qiskit.
 #
-# (C) Copyright IBM 2020.
+# (C) Copyright IBM 2020, 2021.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -14,6 +14,8 @@
 import unittest
 from test.chemistry import QiskitChemistryTestCase
 
+import numpy as np
+
 from qiskit.chemistry.drivers import PySCFDriver, UnitsType
 from qiskit.providers.basicaer import BasicAer
 from qiskit.aqua import QuantumInstance

test/chemistry/test_groundstate_eigensolver.py

@@ -1,6 +1,6 @@
 # This code is part of Qiskit.
 #
-# (C) Copyright IBM 2020.
+# (C) Copyright IBM 2020, 2021.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -16,6 +16,8 @@
 
 from test.chemistry import QiskitChemistryTestCase
 
+import numpy as np
+
 from qiskit import BasicAer
 from qiskit.aqua import QuantumInstance
 from qiskit.chemistry import QiskitChemistryError