From 14c2d3f57b8a3741778fb049900b5714f39a754b Mon Sep 17 00:00:00 2001 From: Anton Dekusar Date: Tue, 6 Jun 2023 08:58:40 +0100 Subject: [PATCH 1/6] fix rawfeaturevector --- qiskit_machine_learning/circuit/library/raw_feature_vector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qiskit_machine_learning/circuit/library/raw_feature_vector.py b/qiskit_machine_learning/circuit/library/raw_feature_vector.py index edbe099a6..7083af99a 100644 --- a/qiskit_machine_learning/circuit/library/raw_feature_vector.py +++ b/qiskit_machine_learning/circuit/library/raw_feature_vector.py @@ -164,7 +164,7 @@ def _define(self): # cast ParameterExpressions that are fully bound to numbers cleaned_params = [] for param in self.params: - if len(param.parameters) == 0: + if isinstance(param, (float, complex)) or len(param.parameters) == 0: cleaned_params.append(complex(param)) else: raise QiskitError("Cannot define a ParameterizedInitialize with unbound parameters") From 141835d82af92b3f99e53ddb0ce8d3703ddc1cc5 Mon Sep 17 00:00:00 2001 From: Anton Dekusar Date: Tue, 6 Jun 2023 11:00:21 +0100 Subject: [PATCH 2/6] fix rawfeaturevector --- qiskit_machine_learning/circuit/library/raw_feature_vector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qiskit_machine_learning/circuit/library/raw_feature_vector.py b/qiskit_machine_learning/circuit/library/raw_feature_vector.py index 7083af99a..73cedf869 100644 --- a/qiskit_machine_learning/circuit/library/raw_feature_vector.py +++ b/qiskit_machine_learning/circuit/library/raw_feature_vector.py @@ -1,6 +1,6 @@ # This code is part of Qiskit. # -# (C) Copyright IBM 2020, 2022. +# (C) Copyright IBM 2020, 2023. # # 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 From 2c57d2edbc9fc5685982e628568d0a268d880199 Mon Sep 17 00:00:00 2001 From: Anton Dekusar <62334182+adekusar-drl@users.noreply.github.com> Date: Tue, 6 Jun 2023 13:20:28 +0100 Subject: [PATCH 3/6] Update qiskit_machine_learning/circuit/library/raw_feature_vector.py Co-authored-by: Julien Gacon --- qiskit_machine_learning/circuit/library/raw_feature_vector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qiskit_machine_learning/circuit/library/raw_feature_vector.py b/qiskit_machine_learning/circuit/library/raw_feature_vector.py index 73cedf869..543c6f65b 100644 --- a/qiskit_machine_learning/circuit/library/raw_feature_vector.py +++ b/qiskit_machine_learning/circuit/library/raw_feature_vector.py @@ -164,7 +164,7 @@ def _define(self): # cast ParameterExpressions that are fully bound to numbers cleaned_params = [] for param in self.params: - if isinstance(param, (float, complex)) or len(param.parameters) == 0: + if not isinstance(param, ParameterExpression) or len(param.parameters) == 0: cleaned_params.append(complex(param)) else: raise QiskitError("Cannot define a ParameterizedInitialize with unbound parameters") From 8479f66313cf436ab017f48d68fe0acac86b6e48 Mon Sep 17 00:00:00 2001 From: Anton Dekusar Date: Tue, 6 Jun 2023 15:41:09 +0100 Subject: [PATCH 4/6] fix imports --- .../circuit/library/raw_feature_vector.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qiskit_machine_learning/circuit/library/raw_feature_vector.py b/qiskit_machine_learning/circuit/library/raw_feature_vector.py index 543c6f65b..b627e5912 100644 --- a/qiskit_machine_learning/circuit/library/raw_feature_vector.py +++ b/qiskit_machine_learning/circuit/library/raw_feature_vector.py @@ -15,7 +15,13 @@ from typing import Optional, List import numpy as np from qiskit.exceptions import QiskitError -from qiskit.circuit import QuantumRegister, QuantumCircuit, ParameterVector, Instruction +from qiskit.circuit import ( + QuantumRegister, + QuantumCircuit, + ParameterVector, + Instruction, + ParameterExpression, +) from qiskit.circuit.library import BlueprintCircuit From ead2268d6e4aa43cd77c070c31051eab3afd8105 Mon Sep 17 00:00:00 2001 From: Anton Dekusar Date: Wed, 7 Jun 2023 15:25:39 +0100 Subject: [PATCH 5/6] add reno --- .../notes/fix-rawfeaturevector-742a68224ddb1b9d.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 releasenotes/notes/fix-rawfeaturevector-742a68224ddb1b9d.yaml diff --git a/releasenotes/notes/fix-rawfeaturevector-742a68224ddb1b9d.yaml b/releasenotes/notes/fix-rawfeaturevector-742a68224ddb1b9d.yaml new file mode 100644 index 000000000..52f749c37 --- /dev/null +++ b/releasenotes/notes/fix-rawfeaturevector-742a68224ddb1b9d.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Updated :class:`~qiskit_machine_learning.circuit.library.RawFeatureVector` to support + `changes `__ in parameter assignment + introduced in Qiskit. From ea7b0027d57b16c5df27a123370f6c9cc89ca070 Mon Sep 17 00:00:00 2001 From: Anton Dekusar Date: Wed, 7 Jun 2023 15:26:02 +0100 Subject: [PATCH 6/6] add reno --- releasenotes/notes/fix-rawfeaturevector-742a68224ddb1b9d.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes/notes/fix-rawfeaturevector-742a68224ddb1b9d.yaml b/releasenotes/notes/fix-rawfeaturevector-742a68224ddb1b9d.yaml index 52f749c37..af9fca9be 100644 --- a/releasenotes/notes/fix-rawfeaturevector-742a68224ddb1b9d.yaml +++ b/releasenotes/notes/fix-rawfeaturevector-742a68224ddb1b9d.yaml @@ -2,5 +2,5 @@ fixes: - | Updated :class:`~qiskit_machine_learning.circuit.library.RawFeatureVector` to support - `changes `__ in parameter assignment + `changes `__ in the parameter assignment introduced in Qiskit.