eqc-models 0.12.0__tar.gz → 0.14.0__tar.gz

eqc_models-0.14.0/.gitignore

@@ -0,0 +1,6 @@
+__pycache__
+build
+eqc_models.egg-info
+
+*.c
+*.so

{eqc_models-0.12.0/eqc_models.egg-info → eqc_models-0.14.0}/PKG-INFO

@@ -1,22 +1,23 @@
 Metadata-Version: 2.4
 Name: eqc-models
-Version: 0.12.0
+Version: 0.14.0
 Summary: Optimization and ML modeling package targeting EQC devices
-Author: Quantum Computing Inc.
-Author-email: support@quantumcomputinginc.com
+Author-email: "Quantum Computing Inc." <support@quantumcomputinginc.com>
 Project-URL: Homepage, https://quantumcomputinginc.com
 Project-URL: Documentation, https://quantumcomputinginc.com/learn/support/software-packages/
 Project-URL: Issues, https://support.quantumcomputinginc.com/
-Requires-Python: <3.11,>=3.9
+Requires-Python: <3.14,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: emucore-direct==1.0.7; python_version < "3.11"
+Requires-Dist: eqc-direct==2.0.2; python_version < "3.11"
 Requires-Dist: numpy<2,>=1.22.1
 Requires-Dist: networkx<3,>=2.6.3
-Requires-Dist: pandas>=2.1.0
-Requires-Dist: scikit-learn>=1.2.1
-Requires-Dist: qci-client<5,>=4.3.0
-Requires-Dist: emucore-direct==1.0.6
-Requires-Dist: eqc-direct<3,>=2.0.1
+Requires-Dist: pandas<3,>=2.1.0
+Requires-Dist: scikit-learn<2,>=1.2.1
+Requires-Dist: lightgbm<5,>=4.6.0
+Requires-Dist: xgboost<2,>=1.7.4
+Requires-Dist: qci-client<6,>=5
 Provides-Extra: dev
 Requires-Dist: pytest<8,>=7.1.0; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{eqc_models-0.12.0 → eqc_models-0.14.0}/docs/source/conf.py

@@ -26,7 +26,6 @@ version = f"{project} v{version}"
 import os
 import sys
 import tomli
-import eqc_direct
 
 sys.path.insert(0, os.path.abspath('../../eqc_models'))
 

{eqc_models-0.12.0 → eqc_models-0.14.0}/eqc_models/base/base.py

@@ -41,6 +41,7 @@ class EqcModel:
     _upper_bound = None
     _H = None
     _machine_slacks = 0
+    _is_discrete = None
     
     def decode(self, solution : np.ndarray, from_encoding : str=None) -> np.ndarray:
         """ 
@@ -117,6 +118,16 @@ class EqcModel:
         warn("The domains property is deprecated in favor of naming it upper_bound", DeprecationWarning)
         self._upper_bound = value
 
+    @property
+    def is_discrete(self) -> List:
+        """ An array of boolean values indicating if variable should be restricted to a discrete domain """
+
+        return self._is_discrete
+
+    @is_discrete.setter
+    def is_discrete(self, value : List):
+        self._is_discrete = value
+
     @property
     def n(self) -> int:
         """ Return the number of variables """

eqc_models-0.14.0/eqc_models/base/binaries.py

@@ -0,0 +1,33 @@
+
+def make_binary_penalty(var_idx, slack_idx, max_degree=2, penalty_multiplier=None):
+    """ 
+    Make a penalty expression enforcing binary values 
+
+    The expression is formed from the conditions
+
+    $$
+    x + w = 1
+    $$
+
+    $$
+    xw = 0
+    $$
+
+    $$
+    w^2 + 2xw + x^2 - 2w - 2x + 1 + xw = 0
+    $$
+
+    $$
+    3xw + w^2 + x^2 - 2w - 2x + 1 = 0
+    $$
+
+    """
+
+    indices = [(0, var_idx), (0, slack_idx), (var_idx, slack_idx), (var_idx, var_idx), (slack_idx, slack_idx)]
+    coefficients = [-2, -2, 3, 1, 1]
+    offset = 1
+    if penalty_multiplier is not None:
+        coefficients = [penalty_multiplier * c for c in coefficients]
+        offset *- penalty_multiplier
+    return coefficients, indices, offset
+

{eqc_models-0.12.0 → eqc_models-0.14.0}/eqc_models/base/constraints.py

@@ -82,6 +82,45 @@ class ConstraintsMixIn:
     def constraints(self, value: Tuple[np.ndarray, np.ndarray]):
         self.lhs, self.rhs = value
 
+    @staticmethod
+    def _stackLHS(*args):
+        """
+
+        >>> m1 = np.array([1, 1, 1])
+        >>> m2 = np.array([[2.0, 2.0]])
+        >>> m3 = np.array([[0, 3, 3, 1], [1, 0, 1, 0]])
+        >>> ConstraintsMixIn._stackLHS(m1, m2, m3)
+        array([[1., 1., 1., 0.],
+               [2., 2., 0., 0.],
+               [0., 3., 3., 1.],
+               [1., 0., 1., 0.]])
+
+        """
+        n = 0
+        m = 0
+        dtype = np.int32
+        def update_dtype(matrix):
+            type_rank = ["int8", "int16", "int32", "int64", "float8", "float16", "float32", "float64"]
+            try:
+                idx = type_rank.index(str(matrix.dtype))
+            except ValueError:
+                raise TypeError(f"matrix type {matrix.dtype} not supported")
+        new_args = []
+        for mat in args:
+            if len(mat.shape) == 1:
+                mat = mat.reshape((1, mat.size))
+            if mat.shape[1] > n:
+                n = mat.shape[1]
+            m += mat.shape[0]
+            dtype = update_dtype(mat)
+            new_args.append(mat)
+        new_lhs = np.zeros((m, n), dtype=dtype)
+        idx = 0
+        for mat in new_args:
+            new_lhs[idx:idx+mat.shape[0],:mat.shape[1]] = mat
+            idx += mat.shape[0]
+        return new_lhs
+
     @property
     def offset(self) -> float:
         """ Calculate the offset due to the conversion of constraints to penalties """

{eqc_models-0.12.0 → eqc_models-0.14.0}/eqc_models/base/polynomial.py

@@ -1,10 +1,13 @@
 # (C) Quantum Computing Inc., 2024.
 from typing import Tuple, Union, List
+import logging
 import numpy as np
 from eqc_models.base.base import EqcModel
 from eqc_models.base.operators import Polynomial, QUBO, OperatorNotAvailableError
 from eqc_models.base.constraints import ConstraintsMixIn
 
+log = logging.getLogger(name=__name__)
+
 class PolynomialMixin:
     """This class provides an instance method and property that
     manage polynomial models.
@@ -46,7 +49,12 @@ class PolynomialMixin:
 
         """
 
-        value = self.polynomial.evaluate(np.array(solution))
+        coefficients, indices = self.H
+        log.debug("Coefficients (%d): %s", len(coefficients), coefficients)
+        log.debug("Indices (%d): %s", len(indices), indices)
+        polynomial = self.polynomial
+        log.debug("Polynomial: %s", polynomial)
+        value = polynomial.evaluate(np.array(solution))
 
         return value
     
@@ -107,8 +115,19 @@ class PolynomialModel(PolynomialMixin, EqcModel):
     """
 
     def __init__(self, coefficients : Union[List, np.ndarray], indices : Union[List, np.ndarray]) -> None:
+        # ensure that the coefficients are ordered and not duplicated
+        new_coefficients = {}
+        for idx, v in zip(indices, coefficients):
+            idx = tuple(idx)
+            if idx in new_coefficients:
+                new_coefficients[idx] += v
+            else:
+                new_coefficients[idx] = v
+        new_indices = [idx for idx in new_coefficients]
+        new_indices.sort()
+        coefficients = [new_coefficients[idx] for idx in new_indices]
         self.coefficients = coefficients
-        self.indices = indices
+        self.indices = new_indices
 
     @property
     def polynomial(self) -> Polynomial:

{eqc_models-0.12.0 → eqc_models-0.14.0}/eqc_models/base/results.py

@@ -1,4 +1,5 @@
 import dataclasses
+from typing import Dict
 import warnings
 import numpy as np
 
@@ -41,6 +42,14 @@ class SolutionResults:
     device : str
         String that represents the device used to solve the model.
 
+    raw_solutions : np.ndarray
+        Numpy array of the solutions as returned by the solver device.
+
+    calibration_time : float
+        Total time spend during job exectution where the device performed calibration.
+        The calibration is not directly affected by the job submission and the time
+        is not included in run_time.
+
     time_units : str
         String indicator of the unit of time reported in the metrics. Only
         ns is supported at this time.
@@ -56,6 +65,7 @@ class SolutionResults:
     postprocessing_time : np.ndarray
     penalties : np.ndarray = None
     device : str = None
+    raw_solutions : np.ndarray = None
     time_units : str = "ns"
 
     @property
@@ -95,7 +105,22 @@ class SolutionResults:
 
     @classmethod
     def from_cloud_response(cls, model, response, solver):
-        """ Fill in the details from the cloud """
+        """ 
+        Fill in the details from the cloud 
+
+        Parameters
+        ------------
+
+        model : eqc_models.base.EqcModel
+            EqcModel object describing the problem solved in response
+
+        response : Dict
+            Dictionary of the repsonse from the solver device.
+
+        solver : eqc_models.base.ModelSolver
+            ModelSolver object which is used to obtain job metrics.
+
+        """
 
         solutions = np.array(response["results"]["solutions"])
         if model.machine_slacks > 0:
@@ -164,3 +189,58 @@ class SolutionResults:
                                   device=device_type, time_units="ns")
 
         return results
+
+    @classmethod
+    def from_eqcdirect_response(cls, model, response, solver):
+        """
+        Fill in details from the response dictionary and possibly the solver device.
+
+        Parameters
+        ------------
+
+        model : eqc_models.base.EqcModel
+            EqcModel object describing the problem solved in response
+
+        response : Dict
+            Dictionary of the repsonse from the solver device.
+
+        solver : eqc_models.base.ModelSolver
+            ModelSolver object which is used to obtain device information. 
+
+        """
+        solutions = np.array(response["solution"])
+        if model.machine_slacks > 0:
+            solutions = solutions[:,:-model.machine_slacks]
+        energies = np.array(response["energy"])
+        # interrogate to determine the device type
+        info_dict = solver.client.system_info()
+        device_type = info_dict["device_type"]
+        if hasattr(model, "evaluateObjective"):
+            objectives = np.zeros((solutions.shape[0],), dtype=np.float32)
+            for i in range(solutions.shape[0]):
+                try:
+                    objective = model.evaluateObjective(solutions[i])
+                except NotImplementedError:
+                    warnings.warn(f"Cannot set objective value in results for {model.__class__}")
+                    objectives = None
+                    break
+                objectives[i] = objective
+        else:
+            objectives = None
+        if hasattr(model, "evaluatePenalties"):
+            penalties = np.zeros((solutions.shape[0],), dtype=np.float32)
+            for i in range(solutions.shape[0]):
+                penalties[i] = model.evaluatePenalties(solutions[i]) + model.offset
+        else:
+            penalties = None
+        counts = np.ones(solutions.shape[0])
+        runtime = response["runtime"]
+        post = response["postprocessing_time"]
+        pre = response["preprocessing_time"]
+        results = SolutionResults(solutions, energies, counts, objectives, 
+                                  runtime, pre, post, penalties=penalties,
+                                  device=device_type, time_units="s")
+
+        return results
+
+

{eqc_models-0.12.0 → eqc_models-0.14.0}/eqc_models/graph/__init__.py

@@ -3,6 +3,8 @@
 from .base import EdgeMixin, EdgeModel, GraphModel, NodeModel
 from .maxcut import MaxCutModel
 from .partition import GraphPartitionModel
+from .shortestpath import ShortestPathModel
+from .rcshortestpath import RCShortestPathModel
 
 __all__ = ["MaxCutModel", "GraphPartitionModel",
            "EdgeMixin", "EdgeModel", "GraphModel", 

eqc_models-0.14.0/eqc_models/graph/rcshortestpath.py

@@ -0,0 +1,81 @@
+import logging
+from typing import (Any, Dict, Tuple, List)
+import networkx as nx
+import numpy as np
+from eqc_models.graph.shortestpath import ShortestPathModel
+
+log = logging.getLogger(name=__name__)
+
+class RCShortestPathModel(ShortestPathModel):
+    """ 
+    Model for resource constrained shortest path problems.
+    Use a shortest path base model to implement the routing 
+    constraints and objective function. Add resource constraints.
+    
+    """
+
+    def __init__(self, G : nx.DiGraph, s : Any, t : Any, T : int, resource_key : str="resource"):
+        if T <= 0:
+            raise ValueError("T must be positive")
+        elif round(T, 0) != T:
+            raise ValueError("T must be integer-valued")
+        self.T = T
+        self.resource_key = resource_key
+        # determine shortest path by weight
+        nx_path = nx.shortest_path(G, s, t)
+        path_length = len(nx_path)
+        self.resource_mult = resource_mult = 2 * path_length / self.T
+        super(RCShortestPathModel, self).__init__(G, s, t)
+        upper_bound = np.ones(len(self.variables))
+        upper_bound[-1] = np.ceil(resource_mult * T)
+        self.upper_bound = upper_bound
+        is_discrete = [True for i in range(upper_bound.shape[0])]
+        is_discrete[-1] = False
+        self.is_discrete = is_discrete
+
+    @property
+    def variables(self):
+        variables = super(RCShortestPathModel, self).variables
+        return variables + ["resource_slack"]
+
+    def buildConstraints(self) -> Tuple[np.ndarray,np.ndarray]:
+        lhs, rhs = super(RCShortestPathModel, self).buildConstraints()
+        # add a single constraint
+        G = self.G
+        n = len(self.variables)
+        resource_lhs = np.zeros((1, n), dtype=np.float32)
+        resource_mult = self.resource_mult
+        log.debug("Resource multiplier %f", resource_mult)
+        for i in range(len(G.edges)):
+            (u, v) = self.variables[i]
+            # find the time to traverse the arc
+            resource_cost = G.edges[(u, v)][self.resource_key]
+            resource_cost *= resource_mult
+            log.debug(f"Adding resource %s for edge %s", resource_cost, (u, v))
+            resource_lhs[0, i] = resource_cost
+        resource_lhs[0, -1] = 1
+        lhs = self._stackLHS(lhs, resource_lhs)
+        rhs = np.hstack([rhs, [self.T*resource_mult]])
+        log.debug("LHS shape %s RHS shape %s", lhs.shape, rhs.shape)
+        return lhs, rhs
+
+    def pathCost(self, path):
+        """ sum the cost of all legs in the path """
+        assert self.s in path
+        G = self.G
+        node = self.s
+        max_len = len(self.G.nodes) - 1
+        path_len = 0
+        path_cost = 0
+        path_resources = 0
+        while node != t:
+            edge = (node, path[node])
+            if edge not in G.edges:
+                raise ValueError(f"Edge {edge} not found")
+            path_len += 1
+            path_cost += G.edges[edge]["weight"]
+            path_resources += G.edges[edge][self.resource_key]
+            if path_len > max_len:
+                raise ValueError("Invalid path. Describes a cycle.")
+        return path_cost, path_resources
+

{eqc_models-0.12.0 → eqc_models-0.14.0}/eqc_models/graph/shortestpath.py

@@ -62,6 +62,9 @@ class ShortestPathModel(EdgeMixin, ConstrainedQuadraticModel):
         self.lhs, self.rhs = self.buildConstraints()
         C, J = self.buildObjective()
         super(ShortestPathModel, self).__init__(C, J, self.lhs, self.rhs)
+        self.upper_bound = np.ones(self.lhs.shape[1])
+        self.is_discrete = [True for i in range(self.lhs.shape[1])]
+        self.machine_slacks = 0
 
     def buildConstraints(self) -> Tuple[np.ndarray,np.ndarray]:
         """
@@ -72,7 +75,7 @@ class ShortestPathModel(EdgeMixin, ConstrainedQuadraticModel):
         $c$ is -1, 1 or 0 for $i=t$, $s$ or all others
         
         """
-        log.info("Building constraints to find path from %s to %s", self.s, self.t)
+        log.debug("Building constraints to find path from %s to %s", self.s, self.t)
         variables = self.variables
         nodes = [n for n in self.G.nodes]
         m = len(nodes)
@@ -84,7 +87,8 @@ class ShortestPathModel(EdgeMixin, ConstrainedQuadraticModel):
                 _rhs[node_index, 0] = 1
             elif k == self.t:
                 _rhs[node_index, 0] = -1
-        for l, (i, j) in enumerate(variables):
+        for l in range(len(self.G.edges)): # don't enumerate the edges because the order could change
+            (i, j) = self.variables[l]
             if i == j:
                 # self loops are not allowed
                 raise ValueError("Self loops are not allowed in ShortestPathModel")
@@ -97,8 +101,8 @@ class ShortestPathModel(EdgeMixin, ConstrainedQuadraticModel):
             j_index = nodes.index(j)
             _cons[i_index, l] = 1
             _cons[j_index, l] = -1
-        log.info("LHS shape %s RHS shape %s", _cons.shape, _rhs.shape)
-        log.info("checksum %f min %f", np.sum(_cons), np.min(_cons))
+        log.debug("LHS shape %s RHS shape %s", _cons.shape, _rhs.shape)
+        log.debug("checksum %f min %f", np.sum(_cons), np.min(_cons))
         assert np.sum(_rhs) == 0
         return _cons, np.squeeze(_rhs)
 
@@ -114,9 +118,10 @@ class ShortestPathModel(EdgeMixin, ConstrainedQuadraticModel):
         m, n = len(nodes), len(variables)
         _obj = [0 for i in range(n)]
         for index, name in enumerate(variables):
-            i, j = name
-            _obj[index] = v = G.get_edge_data(i, j)["weight"]
-            assert not np.isnan(v), f"Got a NaN at {i, j}"
+            if type(name) == type((1,2)):
+                i, j = name
+                _obj[index] = v = G.get_edge_data(i, j)["weight"]
+                assert not np.isnan(v), f"Got a NaN at {i, j}"
         J = np.zeros((n, n))
         return np.array(_obj), J
 
@@ -126,32 +131,60 @@ class ShortestPathModel(EdgeMixin, ConstrainedQuadraticModel):
         a dictionary with each edge described by key, value pairs.
 
         """
-        variables = self.variables
+        variables = self.variables[:len(self.G.edges)]
+        # log.debug("Using variables %s", variables)
 
         lhs, rhs = self.constraints
-        upper_thresh = max(solution)
+        log.debug("LHS shape %s RHS shape %s", lhs.shape, rhs.shape)
+        upper_thresh = max(solution[:len(variables)])
         lower_thresh = 0
+        got_path = None
         while upper_thresh - lower_thresh > 1e-6:
-            log.info("Lower Value: %f Upper Value %f", lower_thresh, upper_thresh)
+            log.debug("Lower Value: %f Upper Value %f", lower_thresh, upper_thresh)
             thresh = (lower_thresh + upper_thresh) / 2
             nx_path = None
             G = nx.DiGraph()
             for (i, j), value in zip(variables, solution):
                 if value > thresh:
                     G.add_edge(i, j)
+            edges = [e for e in G.edges]
+            log.debug("Resulting edge count %s", len(edges))
+            self.alt_g = G
             path = {}
             try:
                 nx_path = nx.shortest_path(G, self.s, self.t)
-                upper_thresh = thresh
                 lower_thresh = thresh
+                got_path = nx_path
+                log.debug("Got path size %d", len(got_path))
             except (nx.exception.NodeNotFound, nx.NetworkXAlgorithmError) as err:
-                lower_thresh = thresh
-        if nx_path is None:
+                upper_thresh = thresh
+        if got_path is None:
             raise RuntimeError(f"Solution does not describe path from {self.s} to {self.t}")
-        path = {}
-        for i, v in enumerate(nx_path):
-            path[nx_path[i-1]] = v
-        if self.t in path:
-            del path[self.t]
-        return path
+        # path = {}
+        # log.debug("Translating path to dictionary")
+        # for i, v in enumerate(got_path):
+        #     path[got_path[i-1]] = v
+        # log.debug("Updated path %s", path)
+        # if self.t in path:
+        #     log.debug("Removing %s from path keys.", self.t)
+        #     del path[self.t]
+        return got_path
+
+    def pathCost(self, path):
+        """ sum the cost of all legs in the path """
+        assert self.s in path
+        G = self.G
+        node = self.s
+        max_len = len(self.G.nodes) - 1
+        path_len = 0
+        path_cost = 0
+        while node != t:
+            edge = (node, path[node])
+            if edge not in G.edges:
+                raise ValueError(f"Edge {edge} not found")
+            path_len += 1
+            path_cost += G.edges[edge]["weight"]
+            if path_len > max_len:
+                raise ValueError("Invalid path. Describes a cycle.")
+        return path_cost
 

{eqc_models-0.12.0 → eqc_models-0.14.0}/eqc_models/ml/classifierbase.py

@@ -31,10 +31,6 @@ class ClassifierBase(QuadraticModel):
 
         assert solver_access in ["cloud", "direct"]
 
-        if solver_access == "direct":
-            assert ip_addr is not None, "ip_addr should be set when using direct solver!"
-            assert port is not None,"port should be set when using direct solver!"
-            
         self.solver_access = solver_access
         self.ip_addr = ip_addr
         self.port = port
@@ -78,7 +74,6 @@ class ClassifierBase(QuadraticModel):
             self,
             sum_constraint=self._sum_constraint,
             relaxation_schedule=self.relaxation_schedule,
-            solution_precision=None,
             num_samples=self.num_samples,
         )