squlearn 0.11.2__tar.gz → 0.12.0__tar.gz

{squlearn-0.11.2 → squlearn-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: squlearn
-Version: 0.11.2
+Version: 0.12.0
 Summary: A library for quantum machine learning following the scikit-learn standard.
 Keywords: quantum,machine learning,qml
 Author-email: David Kreplin <david.kreplin@ipa.fraunhofer.de>, Moritz Willmann <moritz.willmann@ipa.fraunhofer.de>, Jan Schnabel <jan.schnabel@ipa.fraunhofer.de>, Frederic Rapp <frederic.rapp@ipa.fraunhofer.de>, Manuel Hagelüken <manuel.hagelueken@ipa.fraunhofer.de>, Marco Roth <marco.roth@ipa.fraunhofer.de>
@@ -15,20 +15,22 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 License-File: LICENSE.txt
+Requires-Dist: autograd<1.9
 Requires-Dist: bayesian-optimization>=1.4.3,<2
 Requires-Dist: dill>=0.3.5
-Requires-Dist: mapomatic>=0.12.0
+Requires-Dist: mapomatic>=0.14.0
 Requires-Dist: networkx>=3.0
-Requires-Dist: numpy>=1.22
-Requires-Dist: pennylane>=0.34.0
-Requires-Dist: qiskit>=1.0.0,<3.0.0
-Requires-Dist: qiskit-aer>=0.14.0.1
-Requires-Dist: qiskit-algorithms>=0.3.0
-Requires-Dist: qiskit-ibm-runtime>=0.19.0
-Requires-Dist: qiskit-machine-learning>=0.7.0
-Requires-Dist: scipy>=1.8.0
-Requires-Dist: scikit-learn>=1.2.0
-Requires-Dist: sympy>=1.8
+Requires-Dist: numpy>=2.0.0
+Requires-Dist: pennylane>=0.42.0
+Requires-Dist: qc-executor>=0.2.1
+Requires-Dist: qiskit>=2.5.2,<3.0.0
+Requires-Dist: qiskit-aer>=0.17.0
+Requires-Dist: qiskit-algorithms>=0.4.0
+Requires-Dist: qiskit-ibm-runtime>=0.37.0
+Requires-Dist: qiskit-machine-learning>=0.9.0
+Requires-Dist: scipy>=1.14.0
+Requires-Dist: scikit-learn>=1.4.2
+Requires-Dist: sympy>=1.12.1
 Requires-Dist: tqdm>=4.1.0
 Requires-Dist: qulacs>=0.6.0
 Requires-Dist: black[jupyter] ; extra == "dev"
@@ -61,6 +63,7 @@ Project-URL: github, https://github.com/sQUlearn/squlearn
 Provides-Extra: dev
 Provides-Extra: docs
 Provides-Extra: examples
+Import-Name: squlearn
 
 <p align="center">
   <img alt="sQUlearn" src="https://raw.githubusercontent.com/sQUlearn/squlearn/main/docs/_static/logo.png" />

{squlearn-0.11.2 → squlearn-0.12.0}/pyproject.toml

@@ -29,20 +29,22 @@ classifiers = [
 ]
 keywords = ["quantum", "machine learning", "qml"]
 dependencies = [
+    "autograd<1.9",
     "bayesian-optimization>=1.4.3,<2",
     "dill>=0.3.5",
-    "mapomatic>=0.12.0",
+    "mapomatic>=0.14.0",
     "networkx>=3.0",
-    "numpy>=1.22",
-    "pennylane>=0.34.0",
-    "qiskit>=1.0.0,<3.0.0",
-    "qiskit-aer>=0.14.0.1",
-    "qiskit-algorithms>=0.3.0",
-    "qiskit-ibm-runtime>=0.19.0",
-    "qiskit-machine-learning>=0.7.0",
-    "scipy>=1.8.0",
-    "scikit-learn>=1.2.0",
-    "sympy>=1.8",
+    "numpy>=2.0.0",
+    "pennylane>=0.42.0",
+    "qc-executor>=0.2.1",
+    "qiskit>=2.5.2,<3.0.0",
+    "qiskit-aer>=0.17.0",
+    "qiskit-algorithms>=0.4.0",
+    "qiskit-ibm-runtime>=0.37.0",
+    "qiskit-machine-learning>=0.9.0",
+    "scipy>=1.14.0",
+    "scikit-learn>=1.4.2",
+    "sympy>=1.12.1",
     "tqdm>=4.1.0",
     "qulacs>=0.6.0",
 ]

{squlearn-0.11.2 → squlearn-0.12.0}/src/squlearn/__init__.py

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

{squlearn-0.11.2 → squlearn-0.12.0}/src/squlearn/encoding_circuit/circuit_library/chebyshev_pqc.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 import numpy as np
 from typing import Union
 
-from qiskit.circuit import ParameterVector
-from qiskit.circuit import QuantumCircuit
 
 from squlearn.util.data_preprocessing import extract_num_features
+from squlearn.util.symbolic_math import arccos, arctan
 
 from ..encoding_circuit_base import EncodingCircuitBase
+from qc_executor import QuantumCircuit, Parameters
 
 
 class ChebyshevPQC(EncodingCircuitBase):
@@ -269,16 +269,16 @@ class ChebyshevPQC(EncodingCircuitBase):
 
     def get_circuit(
         self,
-        features: Union[ParameterVector, np.ndarray],
-        parameters: Union[ParameterVector, np.ndarray],
+        features: Union[Parameters, np.ndarray],
+        parameters: Union[Parameters, np.ndarray],
     ) -> QuantumCircuit:
         """
         Returns the circuit of the ChebyshevPQC encoding circuit
 
         Args:
-            features (Union[ParameterVector,np.ndarray]): Input vector of the features
+            features (Union[Parameters,np.ndarray]): Input vector of the features
                                                           from which the gate inputs are obtained
-            param_vec (Union[ParameterVector,np.ndarray]): Input vector of the parameters
+            param_vec (Union[Parameters,np.ndarray]): Input vector of the parameters
                                                            from which the gate inputs are obtained
 
         Return:
@@ -289,13 +289,13 @@ class ChebyshevPQC(EncodingCircuitBase):
 
             def mapping(a, x):
                 """Helper function for returning a*arccos(x)"""
-                return a * np.arccos(x)
+                return a * arccos(x)
 
         elif self._nonlinearity == "arctan":
 
             def mapping(a, x):
                 """Helper function for returning a*arctan(x)"""
-                return a * np.arctan(x)
+                return a * arctan(x)
 
         num_features = extract_num_features(features)
         num_params = len(parameters)
@@ -315,33 +315,33 @@ class ChebyshevPQC(EncodingCircuitBase):
 
         # Basis change at the beginning
         for i in range(self.num_qubits):
-            QC.ry(parameters[index_offset % num_params], i)
+            QC.ry(i, parameters[index_offset % num_params])
             index_offset += 1
 
         for _ in range(self._num_layers):
             # Chebyshev encoding circuit
             for i in range(self.num_qubits):
                 QC.rx(
+                    i,
                     mapping(
                         parameters[index_offset % num_params],
                         features[feature_offset % num_features],
                     ),
-                    i,
                 )
                 index_offset += 1
                 feature_offset += 1
 
             for i in range(0, self.num_qubits + self._closed - 1, 2):
-                egate(parameters[index_offset % num_params], i, (i + 1) % self.num_qubits)
+                egate(i, (i + 1) % self.num_qubits, parameters[index_offset % num_params])
                 index_offset += 1
 
             if self.num_qubits > 2:
                 for i in range(1, self.num_qubits + self._closed - 1, 2):
-                    egate(parameters[index_offset % num_params], i, (i + 1) % self.num_qubits)
+                    egate(i, (i + 1) % self.num_qubits, parameters[index_offset % num_params])
                     index_offset += 1
 
         for i in range(self.num_qubits):
-            QC.ry(parameters[index_offset % num_params], i)
+            QC.ry(i, parameters[index_offset % num_params])
             index_offset += 1
 
         return QC

{squlearn-0.11.2 → squlearn-0.12.0}/src/squlearn/encoding_circuit/circuit_library/chebyshev_rx.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import numpy as np
 from typing import Union
 
-from qiskit.circuit import ParameterVector
-from qiskit.circuit import QuantumCircuit
+from qc_executor import QuantumCircuit, Parameters
 
 from squlearn.util.data_preprocessing import extract_num_features
+from squlearn.util.symbolic_math import arccos, arctan
 
 from ..encoding_circuit_base import EncodingCircuitBase
 
@@ -202,16 +202,16 @@ class ChebyshevRx(EncodingCircuitBase):
 
     def get_circuit(
         self,
-        features: Union[ParameterVector, np.ndarray],
-        parameters: Union[ParameterVector, np.ndarray],
+        features: Union[Parameters, np.ndarray],
+        parameters: Union[Parameters, np.ndarray],
     ) -> QuantumCircuit:
         """
         Returns the circuit of the ChebyshevRx encoding circuit
 
         Args:
-            features Union[ParameterVector,np.ndarray]: Input vector of the features
+            features Union[Parameters,np.ndarray]: Input vector of the features
                 from which the gate inputs are obtained
-            param_vec Union[ParameterVector,np.ndarray]: Input vector of the parameters
+            param_vec Union[Parameters,np.ndarray]: Input vector of the parameters
                 from which the gate inputs are obtained
 
         Return:
@@ -237,13 +237,13 @@ class ChebyshevRx(EncodingCircuitBase):
 
             def mapping(a, x):
                 """Helper function for returning a*arccos(x)"""
-                return a * np.arccos(x)
+                return a * arccos(x)
 
         elif self._nonlinearity == "arctan":
 
             def mapping(a, x):
                 """Helper function for returning a*arctan(x)"""
-                return a * np.arctan(x)
+                return a * arctan(x)
 
         QC = QuantumCircuit(self.num_qubits)
         index_offset = 0
@@ -252,17 +252,17 @@ class ChebyshevRx(EncodingCircuitBase):
             # Chebyshev encoding circuit
             for i in range(self.num_qubits):
                 QC.rx(
+                    i,
                     mapping(
                         parameters[index_offset % num_params],
                         features[feature_offset % num_features],
                     ),
-                    i,
                 )
                 index_offset += 1
                 feature_offset += 1
             # Trafo
             for i in range(self.num_qubits):
-                QC.rx(parameters[index_offset % num_params], i)
+                QC.rx(i, parameters[index_offset % num_params])
                 index_offset += 1
             QC = entangle_layer(QC)
 

{squlearn-0.11.2 → squlearn-0.12.0}/src/squlearn/encoding_circuit/circuit_library/chebyshev_tower.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 import numpy as np
 from typing import Union
 
-from qiskit.circuit import ParameterVector
-from qiskit.circuit import QuantumCircuit
+from qc_executor import QuantumCircuit, Parameters
 
 from squlearn.util.data_preprocessing import extract_num_features
+from squlearn.util.symbolic_math import arccos, arctan
 
 from ..encoding_circuit_base import EncodingCircuitBase
 
@@ -175,16 +175,16 @@ class ChebyshevTower(EncodingCircuitBase):
 
     def get_circuit(
         self,
-        features: Union[ParameterVector, np.ndarray],
-        parameters: Union[ParameterVector, np.ndarray] = None,
+        features: Union[Parameters, np.ndarray],
+        parameters: Union[Parameters, np.ndarray] = None,
     ) -> QuantumCircuit:
         """
         Generates and returns the circuit of the Chebyshev encoding circuit.
 
         Args:
-            features (Union[ParameterVector,np.ndarray]): Input vector of the features
+            features (Union[Parameters,np.ndarray]): Input vector of the features
                                                           from which the gate inputs are obtained
-            param_vec (Union[ParameterVector,np.ndarray]): Input vector of the parameters
+            param_vec (Union[Parameters,np.ndarray]): Input vector of the parameters
                                                            from which the gate inputs are obtained
 
         Return:
@@ -213,13 +213,13 @@ class ChebyshevTower(EncodingCircuitBase):
 
             def mapping(x, i):
                 """Non-linear mapping for x: alpha*i*arccos(x)"""
-                return self._alpha * i * np.arccos(x)
+                return self._alpha * i * arccos(x)
 
         elif self._nonlinearity == "arctan":
 
             def mapping(x, i):
                 """Non-linear mapping for x: alpha*i*arctan(x)"""
-                return self._alpha * i * np.arctan(x)
+                return self._alpha * i * arctan(x)
 
         QC = QuantumCircuit(self.num_qubits)
 
@@ -244,18 +244,18 @@ class ChebyshevTower(EncodingCircuitBase):
                 for inner_ in range(inner):
                     if self._rotation_gate.lower() == "rx":
                         QC.rx(
-                            mapping(features[index_offset % num_features], icheb),
                             iqubit % self.num_qubits,
+                            mapping(features[index_offset % num_features], icheb),
                         )
                     elif self._rotation_gate.lower() == "ry":
                         QC.ry(
-                            mapping(features[index_offset % num_features], icheb),
                             iqubit % self.num_qubits,
+                            mapping(features[index_offset % num_features], icheb),
                         )
                     elif self._rotation_gate.lower() == "rz":
                         QC.rz(
-                            mapping(features[index_offset % num_features], icheb),
                             iqubit % self.num_qubits,
+                            mapping(features[index_offset % num_features], icheb),
                         )
                     else:
                         raise ValueError(

{squlearn-0.11.2 → squlearn-0.12.0}/src/squlearn/encoding_circuit/circuit_library/highdim_encoding_circuit.py

@@ -1,7 +1,7 @@
-import numpy as np
 from typing import Union
-from qiskit.circuit import QuantumCircuit
-from qiskit.circuit import ParameterVector
+
+import numpy as np
+from qc_executor import Parameters, QuantumCircuit
 
 from squlearn.util.data_preprocessing import extract_num_features
 
@@ -79,8 +79,6 @@ class HighDimEncodingCircuit(EncodingCircuitBase):
         if self._entangling_gate not in ("cx", "iswap"):
             raise ValueError("Unknown entangling gate:", self._entangling_gate)
 
-        self.siswap_gate = _build_siswap_gate()
-
     @property
     def cycling(self) -> bool:
         """Whether the assignment of gates cycles."""
@@ -147,16 +145,16 @@ class HighDimEncodingCircuit(EncodingCircuitBase):
 
     def get_circuit(
         self,
-        features: Union[ParameterVector, np.ndarray],
-        parameters: Union[ParameterVector, np.ndarray] = None,
+        features: Union[Parameters, np.ndarray],
+        parameters: Union[Parameters, np.ndarray] = None,
     ) -> QuantumCircuit:
         """
         Returns the circuit of the HighDim encoding circuit
 
         Args:
-            features (Union[ParameterVector,np.ndarray]): Input vector of the features
+            features (Union[Parameters,np.ndarray]): Input vector of the features
                                                           from which the gate inputs are obtained.
-            param_vec (Union[ParameterVector,np.ndarray]): Input vector of the parameters
+            param_vec (Union[Parameters,np.ndarray]): Input vector of the parameters
                                                            from which the gate inputs are obtained.
 
         Return:
@@ -176,7 +174,7 @@ class HighDimEncodingCircuit(EncodingCircuitBase):
         self._check_feature_encoding_slots(num_features, self.num_encoding_slots)
         self._check_feature_consistency(features)
 
-        def build_layer(QC: QuantumCircuit, feature_vec: ParameterVector, index_offset: int):
+        def build_layer(QC: QuantumCircuit, feature_vec: Parameters, index_offset: int):
             """
             Private function which creates a single layer
             """
@@ -216,29 +214,33 @@ class HighDimEncodingCircuit(EncodingCircuitBase):
                 # Create Rz and Ry gates
                 if rows:
                     if i % 3 == 0:
-                        QC.rz(feature_vec[ii], iqubit)
+                        QC.rz(iqubit, feature_vec[ii])
                     elif i % 3 == 1:
-                        QC.ry(feature_vec[ii], iqubit)
+                        QC.ry(iqubit, feature_vec[ii])
                     else:  # i % 3 == 2
-                        QC.rz(feature_vec[ii], iqubit)
+                        QC.rz(iqubit, feature_vec[ii])
                 else:
                     if int(i / self.num_qubits) == 0:
-                        QC.rz(feature_vec[ii], iqubit)
+                        QC.rz(iqubit, feature_vec[ii])
                     elif int(i / self.num_qubits) == 1:
-                        QC.ry(feature_vec[ii], iqubit)
+                        QC.ry(iqubit, feature_vec[ii])
                     else:  # int(i/self.num_qubits) == 2
-                        QC.rz(feature_vec[ii], iqubit)
+                        QC.rz(iqubit, feature_vec[ii])
 
             return QC
 
         def entangle_layer_siswap(QC: QuantumCircuit):
-            """Createn of the entangeling layer by iSWAP neighboring qubits"""
+            """Creation of the entangling layer by iSWAP neighboring qubits
 
-            # Build the layer
+            Implemented as RXX(-pi/4) followed by RYY(-pi/4), which is equivalent
+            to sqrt-iSWAP up to global phase. See verification below.
+            """
             for i in range(0, self.num_qubits - 1, 2):
-                QC.append(self.siswap_gate, [i, i + 1])
+                QC.rxx(i, i + 1, -np.pi / 4)
+                QC.ryy(i, i + 1, -np.pi / 4)
             for i in range(1, self.num_qubits - 1, 2):
-                QC.append(self.siswap_gate, [i, i + 1])
+                QC.rxx(i, i + 1, -np.pi / 4)
+                QC.ryy(i, i + 1, -np.pi / 4)
 
             return QC
 
@@ -284,14 +286,3 @@ class HighDimEncodingCircuit(EncodingCircuitBase):
                 index_offset = 0
 
         return QC
-
-
-def _build_siswap_gate():
-    """Manually build the square root iSWAP operator, since it is not available in Qiskit"""
-    sqr_iswap = QuantumCircuit(2)
-    sqr_iswap.cx(0, 1)
-    sqr_iswap.cs(1, 0)
-    sqr_iswap.ch(1, 0)
-    sqr_iswap.cs(1, 0)
-    sqr_iswap.cx(0, 1)
-    return sqr_iswap.to_gate(label="siswap")

{squlearn-0.11.2 → squlearn-0.12.0}/src/squlearn/encoding_circuit/circuit_library/hubregtsen_encoding_circuit.py

@@ -1,7 +1,6 @@
 import numpy as np
 from typing import Union
-from qiskit.circuit import QuantumCircuit
-from qiskit.circuit import ParameterVector
+from qc_executor import QuantumCircuit, Parameters
 
 from squlearn.util.data_preprocessing import extract_num_features
 
@@ -127,16 +126,16 @@ class HubregtsenEncodingCircuit(EncodingCircuitBase):
 
     def get_circuit(
         self,
-        features: Union[ParameterVector, np.ndarray],
-        parameters: Union[ParameterVector, np.ndarray],
+        features: Union[Parameters, np.ndarray],
+        parameters: Union[Parameters, np.ndarray],
     ) -> QuantumCircuit:
         """
         Generates and returns the circuit of the Hubregtsen encoding circuit
 
         Args:
-            features (Union[ParameterVector,np.ndarray]): Input vector of the features
+            features (Union[Parameters,np.ndarray]): Input vector of the features
                                                           from which the gate inputs are obtained.
-            param_vec (Union[ParameterVector,np.ndarray]): Input vector of the parameters
+            param_vec (Union[Parameters,np.ndarray]): Input vector of the parameters
                                                            from which the gate inputs are obtained.
 
         Return:
@@ -158,13 +157,13 @@ class HubregtsenEncodingCircuit(EncodingCircuitBase):
             n_feature_loop = int(np.ceil(num_features / self.num_qubits))
             for i in range(n_feature_loop * self.num_qubits):
                 if (i // self.num_qubits) % 2 == 0:
-                    QC.rz(features[i % num_features], i % self.num_qubits)
+                    QC.rz(i % self.num_qubits, features[i % num_features])
                 else:
-                    QC.rx(features[i % num_features], i % self.num_qubits)
+                    QC.rx(i % self.num_qubits, features[i % num_features])
 
             # Single theta Ry gates
             for i in range(self.num_qubits):
-                QC.ry(parameters[index_offset % num_params], i)
+                QC.ry(i, parameters[index_offset % num_params])
                 index_offset += 1
 
             # Entangled theta CRZ gates
@@ -175,7 +174,7 @@ class HubregtsenEncodingCircuit(EncodingCircuitBase):
                     istop = self.num_qubits - 1
 
                 for i in range(istop):
-                    QC.crz(parameters[index_offset % num_params], i, (i + 1) % self.num_qubits)
+                    QC.crz(i, (i + 1) % self.num_qubits, parameters[index_offset % num_params])
                     index_offset += 1
 
         if self._final_encoding:
@@ -183,8 +182,8 @@ class HubregtsenEncodingCircuit(EncodingCircuitBase):
             n_feature_loop = int(np.ceil(num_features / self.num_qubits))
             for i in range(n_feature_loop * self.num_qubits):
                 if int(np.ceil(i / self.num_qubits)) % 2 == 0:
-                    QC.rz(features[i % num_features], i % self.num_qubits)
+                    QC.rz(i % self.num_qubits, features[i % num_features])
                 else:
-                    QC.rx(features[i % num_features], i % self.num_qubits)
+                    QC.rx(i % self.num_qubits, features[i % num_features])
 
         return QC

{squlearn-0.11.2 → squlearn-0.12.0}/src/squlearn/encoding_circuit/circuit_library/kyriienko_nonlinear_encoding_circuit.py

@@ -1,10 +1,9 @@
 import numpy as np
 from typing import Union
-
-from qiskit.circuit import ParameterVector
-from qiskit.circuit import QuantumCircuit
+from qc_executor import QuantumCircuit, Parameters
 
 from squlearn.util.data_preprocessing import extract_num_features
+from squlearn.util.symbolic_math import arccos
 
 from ..encoding_circuit_base import EncodingCircuitBase
 from ..layered_encoding_circuit import LayeredEncodingCircuit, Layer
@@ -177,15 +176,15 @@ class KyriienkoEncodingCircuit(EncodingCircuitBase):
 
     def get_circuit(
         self,
-        features: Union[ParameterVector, np.ndarray],
-        parameters: Union[ParameterVector, np.ndarray],
+        features: Union[Parameters, np.ndarray],
+        parameters: Union[Parameters, np.ndarray],
     ) -> QuantumCircuit:
         """
         Generates and returns the circuit of the KyriienkoEncodingCircuit
 
         Args:
-            features (Union[ParameterVector, np.ndarray]): The features to encode
-            parameters (Union[ParameterVector, np.ndarray]): The parameters of the encoding circuit
+            features (Union[Parameters, np.ndarray]): The features to encode
+            parameters (Union[Parameters, np.ndarray]): The parameters of the encoding circuit
 
         Returns:
             QuantumCircuit: The encoding circuit
@@ -196,7 +195,7 @@ class KyriienkoEncodingCircuit(EncodingCircuitBase):
 
         def mapping(x, i):
             """Non-linear mapping for x: alpha*i*arccos(x)"""
-            return self.alpha * i * np.arccos(x)
+            return self.alpha * i * arccos(x)
 
         def variational_gate_block(
             QC,
@@ -216,9 +215,9 @@ class KyriienkoEncodingCircuit(EncodingCircuitBase):
                 for i in range(qubit_starting_index, num_qubits):
                     if i >= self.num_qubits:
                         i -= self.num_qubits
-                    QC.rz(parameters[index_offset], i)
-                    QC.rx(parameters[index_offset + 1], i)
-                    QC.rz(parameters[index_offset + 2], i)
+                    QC.rz(i, parameters[index_offset])
+                    QC.rx(i, parameters[index_offset + 1])
+                    QC.rz(i, parameters[index_offset + 2])
                     index_offset += 3
                 if variational_arrangement == "HEA":
                     for start in (0, 1):
@@ -256,8 +255,8 @@ class KyriienkoEncodingCircuit(EncodingCircuitBase):
                 for outer_ in range(outer):
                     for inner_ in range(inner):
                         {"rx": QC.rx, "ry": QC.ry, "rz": QC.rz}[self._rotation_gate](
-                            mapping(features[index_offset_encoding % num_features], icheb),
                             iqubit % self.num_qubits,
+                            mapping(features[index_offset_encoding % num_features], icheb),
                         )
                         iqubit += 1
                         index_offset_encoding += 1

{squlearn-0.11.2 → squlearn-0.12.0}/src/squlearn/encoding_circuit/circuit_library/multi_control_encoding_circuit.py

@@ -1,8 +1,7 @@
 import numpy as np
 from typing import Union
 
-from qiskit.circuit import ParameterVector
-from qiskit.circuit import QuantumCircuit
+from qc_executor import QuantumCircuit, Parameters
 
 from squlearn.util.data_preprocessing import extract_num_features
 
@@ -105,16 +104,16 @@ class MultiControlEncodingCircuit(EncodingCircuitBase):
 
     def get_circuit(
         self,
-        features: Union[ParameterVector, np.ndarray],
-        parameters: Union[ParameterVector, np.ndarray],
+        features: Union[Parameters, np.ndarray],
+        parameters: Union[Parameters, np.ndarray],
     ) -> QuantumCircuit:
         """
         Returns the circuit of the MultiControlEncodingCircuit encoding circuit
 
         Args:
-            features (Union[ParameterVector,np.ndarray]): Input vector of the features
+            features (Union[Parameters,np.ndarray]): Input vector of the features
                                                           from which the gate inputs are obtained.
-            param_vec (Union[ParameterVector,np.ndarray]): Input vector of the parameters
+            param_vec (Union[Parameters,np.ndarray]): Input vector of the parameters
                                                            from which the gate inputs are obtained.
 
         Return:
@@ -137,7 +136,7 @@ class MultiControlEncodingCircuit(EncodingCircuitBase):
             # First ZZ-encoding circuit
             QC.h(range(self.num_qubits))
             for i in range(self.num_qubits):
-                QC.rz(features[feature_offset % num_features], i)
+                QC.rz(i, features[feature_offset % num_features])
                 feature_offset += 1
 
             if self._closed:
@@ -146,11 +145,11 @@ class MultiControlEncodingCircuit(EncodingCircuitBase):
                 istop = self.num_qubits - 1
 
             for i in range(0, istop, 2):
-                QC.crx(parameters[index_offset % num_params], i, (i + 1) % self.num_qubits)
+                QC.crx(i, (i + 1) % self.num_qubits, parameters[index_offset % num_params])
                 index_offset += 1
-                QC.cry(parameters[index_offset % num_params], i, (i + 1) % self.num_qubits)
+                QC.cry(i, (i + 1) % self.num_qubits, parameters[index_offset % num_params])
                 index_offset += 1
-                QC.crz(parameters[index_offset % num_params], i, (i + 1) % self.num_qubits)
+                QC.crz(i, (i + 1) % self.num_qubits, parameters[index_offset % num_params])
                 index_offset += 1
 
             if self.num_qubits >= 2:
@@ -160,15 +159,15 @@ class MultiControlEncodingCircuit(EncodingCircuitBase):
                     istop = self.num_qubits - 1
 
                 for i in range(1, istop, 2):
-                    QC.crx(parameters[index_offset % num_params], i, (i + 1) % self.num_qubits)
+                    QC.crx(i, (i + 1) % self.num_qubits, parameters[index_offset % num_params])
                     index_offset += 1
-                    QC.cry(parameters[index_offset % num_params], i, (i + 1) % self.num_qubits)
+                    QC.cry(i, (i + 1) % self.num_qubits, parameters[index_offset % num_params])
                     index_offset += 1
-                    QC.crz(parameters[index_offset % num_params], i, (i + 1) % self.num_qubits)
+                    QC.crz(i, (i + 1) % self.num_qubits, parameters[index_offset % num_params])
                     index_offset += 1
 
         if self._final_encoding:
             for i in range(self.num_qubits):
-                QC.rz(features[feature_offset % num_features], i)
+                QC.rz(i, features[feature_offset % num_features])
                 feature_offset += 1
         return QC