Merge pull request #356 from sQUlearn/develop

Version 0.9.1

Author: MoritzWillmann

.github/workflows/tests.yaml

@@ -82,7 +82,7 @@ jobs:
           python -m pip install --upgrade pip
           python -m venv venv_qiskit_1
           source venv_qiskit_1/bin/activate
-          pip install .[examples] qiskit==1.1.2 qiskit-ibm-runtime==0.27.1 autoray==0.7.2
+          pip install .[examples] qiskit==1.1.2 qiskit-algorithms==0.3.0 qiskit-ibm-runtime==0.27.1 autoray==0.7.2
       - name: Test with pytest
         run: |
           source venv_qiskit_1/bin/activate

src/squlearn/__init__.py

@@ -3,7 +3,7 @@
 from .util import Executor
 from . import observables, encoding_circuit, kernel, optimizers, qnn, util
 
-__version__ = "0.9.0"
+__version__ = "0.9.1"
 
 __all__ = [
     "Executor",

src/squlearn/optimizers/optimizers_wrapper.py

@@ -1,7 +1,7 @@
 """Various optimization methods that are implemented via wrappers"""
 
 import numpy as np
-import qiskit_algorithms.optimizers as qiskit_optimizers
+from qiskit_algorithms.optimizers import SPSA as QiskitSPSA
 from scipy.optimize import minimize
 
 from .optimizer_base import OptimizerBase, OptimizerResult, IterativeMixin, default_callback
@@ -177,7 +177,7 @@ def minimize(
             Result of the optimization in class:`OptimizerResult` format.
         """
 
-        spsa = qiskit_optimizers.SPSA(
+        spsa = QiskitSPSA(
             maxiter=self.maxiter,
             blocking=self.blocking,
             allowed_increase=self.allowed_increase,

src/squlearn/util/execution/parallel_sampler.py

@@ -13,7 +13,6 @@
 from qiskit.providers import JobV1 as Job
 from qiskit.providers import Options
 from qiskit_aer import Aer
-from qiskit_ibm_runtime import RuntimeJob
 from qiskit_ibm_runtime import __version__ as ibm_runtime_version
 
 QISKIT_SMALLER_1_0 = version.parse(qiskit_version) < version.parse("1.0.0")
@@ -76,6 +75,7 @@ class BackendSamplerV2:
 if QISKIT_RUNTIME_SMALLER_0_21:
     # pylint: disable=ungrouped-imports
     from qiskit_ibm_runtime import (
+        RuntimeJob,
         Sampler as RuntimeSamplerV1,
     )
 
@@ -87,6 +87,7 @@ class RuntimeSamplerV2:
 
 elif QISKIT_RUNTIME_SMALLER_0_28:
     from qiskit_ibm_runtime import (
+        RuntimeJob,
         SamplerV1 as RuntimeSamplerV1,
         SamplerV2 as RuntimeSamplerV2,
     )
@@ -99,6 +100,9 @@ class RuntimeOptions:
         Sampler as RuntimeSamplerV2,
     )
 
+    class RuntimeJob:
+        """Dummy RuntimeJob"""
+
     class RuntimeSamplerV1:
         """Dummy RuntimeSamplerV1"""