qilisdk 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

qilisdk/analog/hamiltonian.py

@@ -24,9 +24,9 @@ from typing import TYPE_CHECKING, Callable, ClassVar
 import numpy as np
 from scipy.sparse import csr_matrix, identity, kron, spmatrix
 
-from qilisdk.common.parameterizable import Parameterizable
-from qilisdk.common.qtensor import QTensor
-from qilisdk.common.variables import BaseVariable, Parameter, Term
+from qilisdk.core.parameterizable import Parameterizable
+from qilisdk.core.qtensor import QTensor
+from qilisdk.core.variables import BaseVariable, Parameter, Term
 from qilisdk.yaml import yaml
 
 from .exceptions import InvalidHamiltonianOperation

qilisdk/analog/linear_schedule.py

@@ -15,7 +15,7 @@ from __future__ import annotations
 
 from qilisdk.analog.hamiltonian import Hamiltonian
 from qilisdk.analog.schedule import Schedule
-from qilisdk.common.variables import Number, Parameter, Term
+from qilisdk.core.variables import Number, Parameter, Term
 from qilisdk.yaml import yaml
 
 
@@ -85,7 +85,9 @@ class LinearSchedule(Schedule):
         if next_idx is None or prev_idx is None or prev_expr is None or next_expr is None:
             raise ValueError("Something unexpected happened while retrieving the coefficient.")
         alpha: float = (t - prev_idx) / (next_idx - prev_idx)
-        return (1 - alpha) * prev_expr + alpha * next_expr
+        e1 = next_expr * alpha
+        e2 = prev_expr * (1 - alpha)
+        return e1 + e2
 
     def get_coefficient(self, time_step: float, hamiltonian_key: str) -> Number:
         """
@@ -98,6 +100,7 @@ class LinearSchedule(Schedule):
         Returns:
             Number: Evaluated coefficient value.
         """
+        time_step = float(time_step)
         val = self.get_coefficient_expression(time_step=time_step, hamiltonian_key=hamiltonian_key)
         return val.evaluate({}) if isinstance(val, Term) else (val.evaluate() if isinstance(val, Parameter) else val)
 

qilisdk/analog/schedule.py

@@ -18,8 +18,8 @@ from typing import Callable
 from loguru import logger
 
 from qilisdk.analog.hamiltonian import Hamiltonian
-from qilisdk.common.parameterizable import Parameterizable
-from qilisdk.common.variables import BaseVariable, Number, Parameter, Term
+from qilisdk.core.parameterizable import Parameterizable
+from qilisdk.core.variables import BaseVariable, Number, Parameter, Term
 from qilisdk.utils.visualization import ScheduleStyle
 from qilisdk.yaml import yaml
 
@@ -110,7 +110,7 @@ class Schedule(Parameterizable):
                                 f"The schedule can only contain Parameters, but a generic variable was provided ({time_step})"
                             )
                         self._parameters[v.label] = v
-                if isinstance(coeff, BaseVariable):
+                elif isinstance(coeff, BaseVariable):
                     if not isinstance(coeff, Parameter):
                         raise ValueError(
                             f"The schedule can only contain Parameters, but a generic variable was provided ({time_step})"
@@ -256,12 +256,12 @@ class Schedule(Parameterizable):
         self._hamiltonians[label] = hamiltonian
         self._schedule[0][label] = 0
         self._nqubits = max(self._nqubits, hamiltonian.nqubits)
-        for l, param in hamiltonian.parameters.items():
+        for _, param in hamiltonian.parameters.items():
             self._parameters[param.label] = param
 
         if schedule is not None:
             for t in range(int(self.T / self.dt)):
-                time_step = schedule(t, **kwargs)
+                time_step = schedule(float(t), **kwargs)
                 if isinstance(time_step, Term):
                     for v in time_step.variables():
                         if not isinstance(v, Parameter):
@@ -422,6 +422,7 @@ class Schedule(Parameterizable):
         Returns:
             Number: The coefficient of the Hamiltonian at the specified time, or 0 if not defined.
         """
+        time_step = float(time_step)
         val = self.get_coefficient_expression(time_step=time_step, hamiltonian_key=hamiltonian_key)
         return val.evaluate({}) if isinstance(val, Term) else (val.evaluate() if isinstance(val, Parameter) else val)
 
@@ -502,3 +503,5 @@ class Schedule(Parameterizable):
         renderer.plot()
         if filepath:
             renderer.save(filepath)
+        else:
+            renderer.show()

qilisdk/backends/cuda_backend.py

@@ -24,7 +24,7 @@ from loguru import logger
 
 from qilisdk.analog.hamiltonian import Hamiltonian, PauliI, PauliOperator, PauliX, PauliY, PauliZ
 from qilisdk.backends.backend import Backend
-from qilisdk.common.qtensor import QTensor
+from qilisdk.core.qtensor import QTensor
 from qilisdk.digital.exceptions import UnsupportedGateError
 from qilisdk.digital.gates import RX, RY, RZ, SWAP, U1, U2, U3, Adjoint, BasicGate, Controlled, H, I, M, S, T, X, Y, Z
 from qilisdk.functionals.sampling_result import SamplingResult

qilisdk/backends/qutip_backend.py

@@ -25,7 +25,7 @@ from qutip_qip.operations.gateclass import SingleQubitGate, is_qutip5
 
 from qilisdk.analog.hamiltonian import Hamiltonian, PauliI, PauliOperator
 from qilisdk.backends.backend import Backend
-from qilisdk.common.qtensor import QTensor, tensor_prod
+from qilisdk.core.qtensor import QTensor, tensor_prod
 from qilisdk.digital import RX, RY, RZ, SWAP, U1, U2, U3, Circuit, H, I, M, S, T, X, Y, Z
 from qilisdk.digital.exceptions import UnsupportedGateError
 from qilisdk.digital.gates import Adjoint, BasicGate, Controlled
@@ -33,7 +33,6 @@ from qilisdk.functionals.sampling_result import SamplingResult
 from qilisdk.functionals.time_evolution_result import TimeEvolutionResult
 
 if TYPE_CHECKING:
-    from qilisdk.common.variables import Number
     from qilisdk.functionals.sampling import Sampling
     from qilisdk.functionals.time_evolution import TimeEvolution
 
@@ -183,28 +182,10 @@ class QutipBackend(Backend):
                 )
             )
 
-        def get_hamiltonian_schedule(
-            hamiltonian: str, dt: float, schedule: dict[int, dict[str, Number]], T: float
-        ) -> Callable:
-            def get_coeff(t: float) -> Number:
-                if int(t / dt) in schedule:
-                    return schedule[int(t / dt)][hamiltonian]
-                time_step = int(t / dt)
-                while time_step > 0:
-                    time_step -= 1
-                    if time_step in schedule:
-                        return schedule[time_step][hamiltonian]
-                return 0
-
-            return get_coeff
-            # return lambda t: schedule[int(t / dt)][ham] if int(t / dt) < int(T / dt) else schedule[int(T / dt)][ham]
-
         H_t = [
             [
                 qutip_hamiltonians[i],
-                get_hamiltonian_schedule(
-                    h, functional.schedule.dt, functional.schedule.schedule, functional.schedule.T
-                ),
+                np.array([functional.schedule.get_coefficient(t, h) for t in tlist]),
             ]
             for i, h in enumerate(functional.schedule.hamiltonians)
         ]

qilisdk/{common → core}/model.py

@@ -103,8 +103,8 @@ class Constraint:
     Example:
         .. code-block:: python
 
-            from qilisdk.common.model import Constraint
-            from qilisdk.common.variables import BinaryVariable, LEQ
+            from qilisdk.core.model import Constraint
+            from qilisdk.core.variables import BinaryVariable, LEQ
 
             x = BinaryVariable("x")
             constraint = Constraint("limit", LEQ(x, 1))
@@ -195,8 +195,8 @@ class Objective:
     Example:
         .. code-block:: python
 
-            from qilisdk.common.model import Objective, ObjectiveSense
-            from qilisdk.common.variables import BinaryVariable
+            from qilisdk.core.model import Objective, ObjectiveSense
+            from qilisdk.core.variables import BinaryVariable
 
             x = BinaryVariable("x")
             obj = Objective("profit", 3 * x, sense=ObjectiveSense.MAXIMIZE)
@@ -275,7 +275,7 @@ class Model:
     Example:
         .. code-block:: python
 
-            from qilisdk.common import BinaryVariable, LEQ, Model
+            from qilisdk.core import BinaryVariable, LEQ, Model
 
             num_items = 4
             values = [1, 3, 5, 2]
@@ -517,8 +517,8 @@ class QUBO(Model):
     Example:
         .. code-block:: python
 
-            from qilisdk.common.model import QUBO
-            from qilisdk.common.variables import BinaryVariable
+            from qilisdk.core.model import QUBO
+            from qilisdk.core.variables import BinaryVariable
 
             x0, x1 = BinaryVariable("x0"), BinaryVariable("x1")
             qubo = QUBO("Example")

qilisdk/{common → core}/qtensor.py

@@ -66,7 +66,7 @@ class QTensor:
         .. code-block:: python
 
             import numpy as np
-            from qilisdk.common import QTensor
+            from qilisdk.core import QTensor
 
             ket = QTensor(np.array([[1.0], [0.0]]))
             density = ket * ket.adjoint()

qilisdk/{common → core}/variables.py

@@ -23,7 +23,7 @@ from typing import TYPE_CHECKING, Iterator, Mapping, Sequence, TypeVar
 import numpy as np
 from loguru import logger
 
-from qilisdk.common.exceptions import EvaluationError, InvalidBoundsError, NotSupportedOperation, OutOfBoundsException
+from qilisdk.core.exceptions import EvaluationError, InvalidBoundsError, NotSupportedOperation, OutOfBoundsException
 from qilisdk.yaml import yaml
 
 if TYPE_CHECKING:
@@ -890,6 +890,9 @@ class BaseVariable(ABC):
         if isinstance(other, Term):
             return other + self
 
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return Term(elements=[self, other], operation=Operation.ADD)
 
     __radd__ = __add__
@@ -901,6 +904,9 @@ class BaseVariable(ABC):
         if isinstance(other, Term):
             return other * self
 
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return Term(elements=[self, other], operation=Operation.MUL)
 
     def __rmul__(self, other: Number | BaseVariable | Term) -> Term:
@@ -909,6 +915,9 @@ class BaseVariable(ABC):
         if isinstance(other, Term):
             return other * self
 
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return Term(elements=[other, self], operation=Operation.MUL)
 
     __imul__ = __mul__
@@ -916,11 +925,19 @@ class BaseVariable(ABC):
     def __sub__(self, other: Number | BaseVariable | Term) -> Term:
         if not isinstance(other, (Number, BaseVariable, Term)):
             return NotImplemented
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return self + -1 * other
 
     def __rsub__(self, other: Number | BaseVariable | Term) -> Term:
         if not isinstance(other, (Number, BaseVariable, Term)):
             return NotImplemented
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return -1 * self + other
 
     __isub__ = __sub__
@@ -935,6 +952,8 @@ class BaseVariable(ABC):
         if other == 0:
             raise ValueError("Division by zero is not allowed")
 
+        if isinstance(other, np.generic):
+            other = other.item()
         other = 1 / other
         return self * other
 
@@ -979,7 +998,7 @@ class BinaryVariable(BaseVariable):
     Example:
         .. code-block:: python
 
-            from qilisdk.common.variables import BinaryVariable
+            from qilisdk.core.variables import BinaryVariable
 
             x = BinaryVariable("x")
     """
@@ -1048,7 +1067,7 @@ class Variable(BaseVariable):
     Example:
         .. code-block:: python
 
-            from qilisdk.common.variables import Domain, Variable
+            from qilisdk.core.variables import Domain, Variable
 
             price = Variable("price", domain=Domain.REAL, bounds=(0, 10))
             binary_term = price.to_binary()
@@ -1183,7 +1202,7 @@ class Parameter(BaseVariable):
     Example:
         .. code-block:: python
 
-            from qilisdk.common.variables import Parameter
+            from qilisdk.core.variables import Parameter
 
             theta = Parameter("theta", value=0.5)
             theta.set_value(0.75)
@@ -1665,6 +1684,10 @@ class Term:
         if not isinstance(other, (Number, BaseVariable, Term)):
             return NotImplemented
         out = self.to_list() if self.operation == Operation.ADD else [copy.copy(self)]
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         out.append(other)
         return Term(out, Operation.ADD)
 
@@ -1674,6 +1697,9 @@ class Term:
         if not isinstance(other, (Number, BaseVariable, Term)):
             return NotImplemented
         out = self.to_list() if self.operation == Operation.ADD else [copy.copy(self)]
+
+        if isinstance(other, np.generic):
+            other = other.item()
         out.insert(0, other)
         return Term(out, Operation.ADD)
 
@@ -1683,6 +1709,10 @@ class Term:
         out = self.to_list() if self.operation == Operation.MUL else [copy.copy(self)]
         if len(out) == 0:
             out = [0]
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         out.append(other)
         return Term(out, Operation.MUL)._unfold_parentheses()
 
@@ -1694,6 +1724,10 @@ class Term:
         out = self.to_list() if self.operation == Operation.MUL else [copy.copy(self)]
         if len(out) == 0:
             out = [0]
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         out.insert(0, other)
         return Term(out, Operation.MUL)._unfold_parentheses()
 
@@ -1703,6 +1737,10 @@ class Term:
     def __sub__(self, other: Number | BaseVariable | Term) -> Term:
         if not isinstance(other, (Number, BaseVariable, Term)):
             return NotImplemented
+
+        if isinstance(other, np.generic):
+            other = other.item()
+
         return self + -1 * other
 
     def __rsub__(self, other: Number | BaseVariable | Term) -> Term:

qilisdk/cost_functions/cost_function.py

@@ -21,7 +21,7 @@ from qilisdk.functionals.sampling_result import SamplingResult
 from qilisdk.functionals.time_evolution_result import TimeEvolutionResult
 
 if TYPE_CHECKING:
-    from qilisdk.common.variables import Number
+    from qilisdk.core.variables import Number
 
 TResult = TypeVar("TResult", bound=FunctionalResult)
 

qilisdk/cost_functions/model_cost_function.py

@@ -17,24 +17,24 @@ from typing import TYPE_CHECKING
 
 import numpy as np
 
-from qilisdk.common.model import QUBO, Model
-from qilisdk.common.qtensor import QTensor, expect_val, ket
+from qilisdk.core.model import QUBO, Model
+from qilisdk.core.qtensor import QTensor, expect_val, ket
 from qilisdk.cost_functions.cost_function import CostFunction
 
 if TYPE_CHECKING:
-    from qilisdk.common.variables import Number
+    from qilisdk.core.variables import Number
     from qilisdk.functionals.sampling_result import SamplingResult
     from qilisdk.functionals.time_evolution_result import TimeEvolutionResult
 
 
 class ModelCostFunction(CostFunction):
     """
-    Evaluate the cost of functional results with respect to a :class:`~qilisdk.common.model.Model`.
+    Evaluate the cost of functional results with respect to a :class:`~qilisdk.core.model.Model`.
 
     Example:
         .. code-block:: python
 
-            from qilisdk.common import BinaryVariable, Model, LEQ
+            from qilisdk.core import BinaryVariable, Model, LEQ
             from qilisdk.cost_functions import ModelCostFunction
 
             model = Model("demo")

qilisdk/cost_functions/observable_cost_function.py

@@ -18,11 +18,11 @@ from typing import TYPE_CHECKING
 import numpy as np
 
 from qilisdk.analog.hamiltonian import Hamiltonian, PauliOperator
-from qilisdk.common.qtensor import QTensor, expect_val, ket, tensor_prod
+from qilisdk.core.qtensor import QTensor, expect_val, ket, tensor_prod
 from qilisdk.cost_functions.cost_function import CostFunction
 
 if TYPE_CHECKING:
-    from qilisdk.common.variables import Number
+    from qilisdk.core.variables import Number
     from qilisdk.functionals.sampling_result import SamplingResult
     from qilisdk.functionals.time_evolution_result import TimeEvolutionResult
 

qilisdk/digital/ansatz.py

@@ -188,9 +188,6 @@ class HardwareEfficientAnsatz(Ansatz):
         # Parameter iterator covering all single-qubit blocks, in order
         parameter_iterator = iter(self._parameter_blocks())
 
-        # U(0)
-        self._apply_single_qubit_block(parameter_iterator)
-
         # For each remaining layer: U -> E
         if self.structure == "grouped":
             for _ in range(self.layers):

qilisdk/digital/circuit.py

@@ -14,8 +14,8 @@
 
 import numpy as np
 
-from qilisdk.common.parameterizable import Parameterizable
-from qilisdk.common.variables import Parameter, RealNumber
+from qilisdk.core.parameterizable import Parameterizable
+from qilisdk.core.variables import Parameter, RealNumber
 from qilisdk.utils.visualization import CircuitStyle
 from qilisdk.yaml import yaml
 

qilisdk/digital/gates.py

@@ -20,8 +20,8 @@ import numpy as np
 from scipy.linalg import expm
 from typing_extensions import Self
 
-from qilisdk.common.parameterizable import Parameterizable
-from qilisdk.common.variables import Parameter
+from qilisdk.core.parameterizable import Parameterizable
+from qilisdk.core.variables import Parameter
 from qilisdk.yaml import yaml
 
 from .exceptions import (
@@ -924,7 +924,7 @@ class U2(BasicGate):
         ``U2(phi, gamma) = U2_qiskit/pennylane(phi, gamma) = exp(i*(phi+gamma)/2) U2_qibo(phi, gamma)``
 
     Other unitaries you can get from this one are:
-        - ``U2(phi=0, gamma=np.pi) = H``
+        - ``U2(phi=0, gamma=pi) = H``
         - ``U2(phi=0, gamma=0) = RY(theta=pi/2)``
         - ``U2(phi=-pi/2, gamma=pi/2) = RX(theta=pi/2)``
     """

qilisdk/functionals/functional.py

@@ -16,7 +16,7 @@ from __future__ import annotations
 from abc import ABC
 from typing import ClassVar, Generic, TypeVar
 
-from qilisdk.common.parameterizable import Parameterizable
+from qilisdk.core.parameterizable import Parameterizable
 from qilisdk.functionals.functional_result import FunctionalResult
 
 TResult_co = TypeVar("TResult_co", bound=FunctionalResult, covariant=True)
@@ -35,5 +35,5 @@ class Functional(ABC):
 
 class PrimitiveFunctional(Parameterizable, Functional, ABC, Generic[TResult_co]):
     """
-    Base class for functionals backed by a :class:`~qilisdk.common.parameterizable.Parameterizable` object.
+    Base class for functionals backed by a :class:`~qilisdk.core.parameterizable.Parameterizable` object.
     """

qilisdk/functionals/functional_result.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from qilisdk.common.result import Result
+from qilisdk.core.result import Result
 
 
 class FunctionalResult(Result):

qilisdk/functionals/sampling.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 from typing import ClassVar
 
-from qilisdk.common.variables import RealNumber
+from qilisdk.core.variables import RealNumber
 from qilisdk.digital.circuit import Circuit
 from qilisdk.functionals.functional import PrimitiveFunctional
 from qilisdk.functionals.sampling_result import SamplingResult

qilisdk/functionals/time_evolution.py

@@ -15,8 +15,8 @@ from typing import ClassVar
 
 from qilisdk.analog.hamiltonian import Hamiltonian, PauliOperator
 from qilisdk.analog.schedule import Schedule
-from qilisdk.common.qtensor import QTensor
-from qilisdk.common.variables import RealNumber
+from qilisdk.core.qtensor import QTensor
+from qilisdk.core.variables import RealNumber
 from qilisdk.functionals.functional import PrimitiveFunctional
 from qilisdk.functionals.time_evolution_result import TimeEvolutionResult
 from qilisdk.yaml import yaml
@@ -31,7 +31,7 @@ class TimeEvolution(PrimitiveFunctional[TimeEvolutionResult]):
         .. code-block:: python
 
             from qilisdk.analog import Schedule, Hamiltonian, Z
-            from qilisdk.common import ket
+            from qilisdk.core import ket
             from qilisdk.functionals.time_evolution import TimeEvolution
 
             h0 = Z(0)

qilisdk/functionals/time_evolution_result.py

@@ -15,8 +15,8 @@ from pprint import pformat
 
 import numpy as np
 
-from qilisdk.common.model import Model
-from qilisdk.common.qtensor import QTensor
+from qilisdk.core.model import Model
+from qilisdk.core.qtensor import QTensor
 from qilisdk.functionals.functional_result import FunctionalResult
 from qilisdk.yaml import yaml
 

qilisdk/optimizers/optimizer_result.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 from __future__ import annotations
 
-from qilisdk.common.result import Result
+from qilisdk.core.result import Result
 from qilisdk.yaml import yaml
 
 

qilisdk/speqtrum/__init__.py

@@ -25,6 +25,8 @@ OPTIONAL_FEATURES: list[OptionalFeature] = [
             Symbol(path="qilisdk.speqtrum.speqtrum", name="SpeQtrum"),
             Symbol(path="qilisdk.speqtrum.speqtrum_models", name="DeviceStatus"),
             Symbol(path="qilisdk.speqtrum.speqtrum_models", name="DeviceType"),
+            Symbol(path="qilisdk.speqtrum.speqtrum_models", name="JobHandle"),
+            Symbol(path="qilisdk.speqtrum.speqtrum_models", name="TypedJobDetail"),
         ],
     ),
 ]