Fix for docplex 2.20 (#1520)

* Fix for docplex 2.20 * fix cvxpy not installed on unit test Co-authored-by: Manoel Marques <manoel.marques@ibm.com>
qiskit-community · Feb 4, 2021 · d793c2b · d793c2b
1 parent 325d57c
commit d793c2b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/qiskit/optimization/applications/ising/docplex.py b/qiskit/optimization/applications/ising/docplex.py
@@ -64,7 +64,7 @@
 import numpy as np
 from docplex.mp.constants import ComparisonType
 from docplex.mp.constr import LinearConstraint, QuadraticConstraint
-from docplex.mp.linear import Var
+from docplex.mp.dvar import Var
 from docplex.mp.model import Model
 from qiskit.quantum_info import Pauli
 

diff --git a/qiskit/optimization/problems/quadratic_program.py b/qiskit/optimization/problems/quadratic_program.py
@@ -24,7 +24,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

diff --git a/test/aqua/test_qsvm.py b/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.