eqc-models 0.14.2__tar.gz → 0.14.4__tar.gz

{eqc_models-0.14.2 → eqc_models-0.14.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eqc-models
-Version: 0.14.2
+Version: 0.14.4
 Summary: Optimization and ML modeling package targeting EQC devices
 Author-email: "Quantum Computing Inc." <support@quantumcomputinginc.com>
 Project-URL: Homepage, https://quantumcomputinginc.com

{eqc_models-0.14.2 → eqc_models-0.14.4}/eqc_models/ml/classifierbase.py

@@ -20,18 +20,21 @@ class ClassifierBase(QuadraticModel):
         relaxation_schedule=2,
         num_samples=1,
         solver_access="cloud",
+        api_url=None,
+        api_token=None,
         ip_addr=None,
         port=None,
     ):
-
         super(self).__init__(None, None, None)
-        
+
         self.relaxation_schedule = relaxation_schedule
         self.num_samples = num_samples
 
         assert solver_access in ["cloud", "direct"]
 
         self.solver_access = solver_access
+        self.api_url = api_url
+        self.api_token = api_token
         self.ip_addr = ip_addr
         self.port = port
         self.params = None
@@ -49,7 +52,6 @@ class ClassifierBase(QuadraticModel):
         pass
 
     def set_model(self, J, C, sum_constraint):
-        
         # Set hamiltonians
         self._C = C
         self._J = J
@@ -59,17 +61,17 @@ class ClassifierBase(QuadraticModel):
         # Set upper_bound
         num_variables = C.shape[0]
         self.upper_bound = sum_constraint * np.ones((num_variables,))
-        
+
         return
 
     def solve(self):
-
         if self.solver_access == "direct":
             solver = Dirac3DirectSolver()
             solver.connect(self.ip_addr, self.port)
         else:
             solver = Dirac3CloudSolver()
-            
+            solver.connect(self.api_url, self.api_token)
+
         response = solver.solve(
             self,
             sum_constraint=self._sum_constraint,
@@ -83,12 +85,12 @@ class ClassifierBase(QuadraticModel):
         elif self.solver_access == "direct":
             energies = response["energy"]
             solutions = response["solution"]
-            
+
         min_id = np.argmin(energies)
         sol = solutions[min_id]
 
         print(response)
-        
+
         return sol, response
 
     def convert_sol_to_params(self, sol):
@@ -96,7 +98,7 @@ class ClassifierBase(QuadraticModel):
 
     def fit(self, X, y):
         return self
-    
+
     def get_dynamic_range(self):
         C = self._C
         J = self._J

{eqc_models-0.14.2 → eqc_models-0.14.4}/eqc_models/ml/classifierqboost.py

@@ -106,6 +106,10 @@ class QBoostClassifier(ClassifierBase):
 
     solver_access: Solver access type: cloud or direct; default: cloud.
 
+    api_url: API URL used when cloud access is used; default: None.
+
+    api_token: API token used when cloud access is used; default: None.
+
     ip_addr: IP address of the device when direct access is used; default: None.
 
     port: Port number of the device when direct access is used; default: None.
@@ -182,6 +186,8 @@ class QBoostClassifier(ClassifierBase):
         relaxation_schedule=2,
         num_samples=1,
         solver_access="cloud",
+        api_url=None,
+        api_token=None,
         ip_addr=None,
         port=None,
         lambda_coef=0,
@@ -217,6 +223,8 @@ class QBoostClassifier(ClassifierBase):
         self.relaxation_schedule = relaxation_schedule
         self.num_samples = num_samples
         self.solver_access = solver_access
+        self.api_url = api_url
+        self.api_token = api_token
         self.ip_addr = ip_addr
         self.port = port
         self.lambda_coef = lambda_coef
@@ -235,14 +243,13 @@ class QBoostClassifier(ClassifierBase):
         self.classes_ = None
 
     def topNPairs(self, X, n):
-        
-        assert n <= int(X.shape[1] * (X.shape[1] - 3) /2)
-        
+        assert n <= int(X.shape[1] * (X.shape[1] - 3) / 2)
+
         cov = np.corrcoef(X, rowvar=False)
         abscov = np.abs(cov)
         flatcov = []
         for i in range(X.shape[1]):
-            for j in range(i+1, X.shape[1]):
+            for j in range(i + 1, X.shape[1]):
                 flatcov.append((abscov[i, j], (i, j)))
         flatcov.sort()
         return [idx for val, idx in flatcov[-n:]]
@@ -286,7 +293,7 @@ class QBoostClassifier(ClassifierBase):
                     X[:, [i, j]],
                     y,
                     self.weak_cls_type,
-                    self.weak_cls_params,                    
+                    self.weak_cls_params,
                 )
                 weak_classifier.train()
                 self.ind_list.append([i, j])

{eqc_models-0.14.2 → eqc_models-0.14.4}/eqc_models/ml/classifierqsvm.py

@@ -26,10 +26,14 @@ class QSVMClassifier(ClassifierBase):
 
     solver_access: Solver access type: cloud or direct; default: cloud.
 
+    api_url: API URL used when cloud access is used; default: None.
+
+    api_token: API token used when cloud access is used; default: None.
+
     ip_addr: IP address of the device when direct access is used; default: None.
-    
-    port: Port number of the device when direct access is used; default: None.    
-    
+
+    port: Port number of the device when direct access is used; default: None.
+
     lambda_coef: The penalty multipler
 
     Examples
@@ -74,19 +78,23 @@ class QSVMClassifier(ClassifierBase):
         relaxation_schedule=1,
         num_samples=1,
         solver_access="cloud",
+        api_url=None,
+        api_token=None,
         ip_addr=None,
-        port=None,            
+        port=None,
         lambda_coef=1.0,
     ):
         super(QSVMClassifier).__init__()
 
         assert solver_access in ["cloud", "direct"]
-        
+
         self.relaxation_schedule = relaxation_schedule
         self.num_samples = num_samples
         self.solver_access = solver_access
+        self.api_url = api_url
+        self.api_token = api_token
         self.ip_addr = ip_addr
-        self.port = port        
+        self.port = port
         self.lambda_coef = lambda_coef
         self.fea_scaler = MinMaxScaler(feature_range=(-1, 1))
 
@@ -112,7 +120,7 @@ class QSVMClassifier(ClassifierBase):
         assert set(y) == {-1, 1}, "Target values should be in {-1, 1}"
 
         X = self.fea_scaler.fit_transform(X)
-        
+
         J, C, sum_constraint = self.get_hamiltonian(X, y)
 
         assert J.shape[0] == J.shape[1], "Inconsistent hamiltonian size!"
@@ -145,7 +153,7 @@ class QSVMClassifier(ClassifierBase):
         The predicted classes.
         """
         n_records = X.shape[0]
-        X = self.fea_scaler.transform(X)        
+        X = self.fea_scaler.transform(X)
         X_tilde = np.concatenate((X, np.ones((n_records, 1))), axis=1)
 
         y = np.einsum("i,ki->k", self.params, X_tilde)
@@ -215,10 +223,14 @@ class QSVMClassifierDual(ClassifierBase):
 
     solver_access: Solver access type: cloud or direct; default: cloud.
 
+    api_url: API URL used when cloud access is used; default: None.
+
+    api_token: API token used when cloud access is used; default: None.
+
     ip_addr: IP address of the device when direct access is used; default: None.
-    
-    port: Port number of the device when direct access is used; default: None.    
-    
+
+    port: Port number of the device when direct access is used; default: None.
+
     upper_limit: Coefficient upper limit; a regularization parameter;
     default: 1.0.
 
@@ -274,8 +286,10 @@ class QSVMClassifierDual(ClassifierBase):
         relaxation_schedule=2,
         num_samples=1,
         solver_access="cloud",
+        api_url=None,
+        api_token=None,
         ip_addr=None,
-        port=None,            
+        port=None,
         upper_limit=1.0,
         gamma=1.0,
         eta=1.0,
@@ -284,12 +298,14 @@ class QSVMClassifierDual(ClassifierBase):
         super(QSVMClassifierDual).__init__()
 
         assert solver_access in ["cloud", "direct"]
-        
+
         self.relaxation_schedule = relaxation_schedule
         self.num_samples = num_samples
         self.solver_access = solver_access
+        self.api_url = api_url
+        self.api_token = api_token
         self.ip_addr = ip_addr
-        self.port = port        
+        self.port = port
         self.upper_limit = upper_limit
         self.gamma = gamma
         self.eta = eta

{eqc_models-0.14.2 → eqc_models-0.14.4}/eqc_models/ml/clustering.py

@@ -11,25 +11,29 @@ class GraphClustering(ClusteringBase):
 
     Parameters
     ----------
-    
+
     graph: A NetwrokX graph object representing the data.
     num_clusters: Number of clusters.
-    
+
     alpha: A penalty term multilplier; default: 1.0.
-    
+
     relaxation_schedule: Relaxation schedule used by Dirac-3; default:
     2.
-    
+
     num_samples: Number of samples used by Dirac-3; default: 1.
-    
+
     device: The device used, dirac-1 or dirac-3; default: dirac-3.
 
     solver_access: Solver access type: cloud or direct; default: cloud.
 
+    api_url: API URL used when cloud access is used; default: None.
+
+    api_token: API token used when cloud access is used; default: None.
+
     ip_addr: IP address of the device when direct access is used; default: None.
 
     port: Port number of the device when direct access is used; default: None.
-    
+
     Examples
     ---------
 
@@ -46,7 +50,7 @@ class GraphClustering(ClusteringBase):
     >>> G.add_edge(7, 9, weight=5)
     >>> G.add_edge(3, 4, weight=0.5)
     >>> G.add_edge(6, 7, weight=0.5)
-    >>> from eqc_models.ml.clustering import GraphClustering    
+    >>> from eqc_models.ml.clustering import GraphClustering
     >>> from contextlib import redirect_stdout
     >>> import io
     >>> f = io.StringIO()
@@ -57,7 +61,7 @@ class GraphClustering(ClusteringBase):
     ...         graph=G,
     ...         num_clusters=3,
     ...         alpha=10.0,
-    ...         device="dirac-3",    
+    ...         device="dirac-3",
     ...     )
     ...     labels = obj.fit_predict()
     """
@@ -71,15 +75,17 @@ class GraphClustering(ClusteringBase):
         num_samples=1,
         device="dirac-3",
         solver_access="cloud",
+        api_url=None,
+        api_token=None,
         ip_addr=None,
-        port=None,            
+        port=None,
     ):
         super(GraphClustering).__init__()
 
         assert device in ["dirac-1", "dirac-3"]
 
         assert solver_access in ["cloud", "direct"]
-        
+
         self.graph = graph
         self.num_nodes = graph.number_of_nodes()
         self.num_edges = graph.number_of_edges()
@@ -89,8 +95,10 @@ class GraphClustering(ClusteringBase):
         self.num_samples = num_samples
         self.device = device
         self.solver_access = solver_access
+        self.api_url = api_url
+        self.api_token = api_token
         self.ip_addr = ip_addr
-        self.port = port        
+        self.port = port
         self.labels = None
 
     def get_hamiltonian(self):
@@ -155,7 +163,7 @@ class GraphClustering(ClusteringBase):
         self.set_model(J, C, sum_constraint)
 
         sol, response = self.solve()
-        
+
         assert len(sol) == C.shape[0], "Inconsistent solution size!"
         assert len(sol) == self.num_clusters * self.num_nodes
 
@@ -189,26 +197,30 @@ class Clustering(ClusteringBase):
 
     Parameters
     ----------
-    
+
     num_clusters: Number of clusters.
-    
+
     alpha: A penalty term multilplier; default: 1.0.
-    
+
     relaxation_schedule: Relaxation schedule used by Dirac-3; default:
     2.
-    
+
     num_samples: Number of samples used by Dirac-3; default: 1.
-    
+
     distance_func: Distance function used; default: squared_l2_norm.
-    
+
     device: The device used, dirac-1 or dirac-3; default: dirac-3.
 
     solver_access: Solver access type: cloud or direct; default: cloud.
 
+    api_url: API URL used when cloud access is used; default: None.
+
+    api_token: API token used when cloud access is used; default: None.
+
     ip_addr: IP address of the device when direct access is used; default: None.
 
     port: Port number of the device when direct access is used; default: None.
-    
+
     Examples
     ---------
 
@@ -217,7 +229,7 @@ class Clustering(ClusteringBase):
     >>> cluster2 = np.random.randn(15, 2) * 0.5 + np.array([8, 3])
     >>> cluster3 = np.random.randn(15, 2) * 0.5 + np.array([5, 8])
     >>> X = np.vstack((cluster1, cluster2, cluster3))
-    >>> from eqc_models.ml.clustering import Clustering    
+    >>> from eqc_models.ml.clustering import Clustering
     >>> from contextlib import redirect_stdout
     >>> import io
     >>> f = io.StringIO()
@@ -243,15 +255,17 @@ class Clustering(ClusteringBase):
         distance_func: str = "squared_l2_norm",
         device: str = "dirac-3",
         solver_access="cloud",
+        api_url=None,
+        api_token=None,
         ip_addr=None,
-        port=None,            
+        port=None,
     ):
         super(Clustering).__init__()
 
         assert device in ["dirac-1", "dirac-3"]
 
         assert solver_access in ["cloud", "direct"]
-        
+
         self.num_clusters = num_clusters
         self.alpha = alpha
         self.relaxation_schedule = relaxation_schedule
@@ -259,8 +273,10 @@ class Clustering(ClusteringBase):
         self.distance_func = distance_func
         self.device = device
         self.solver_access = solver_access
+        self.api_url = api_url
+        self.api_token = api_token
         self.ip_addr = ip_addr
-        self.port = port        
+        self.port = port
         self.labels = None
 
         assert distance_func in ["squared_l2_norm"], (

{eqc_models-0.14.2 → eqc_models-0.14.4}/eqc_models/ml/clusteringbase.py

@@ -9,6 +9,7 @@ from eqc_models.solvers.qciclient import (
 )
 from eqc_models.solvers.eqcdirect import Dirac3DirectSolver
 
+
 class ClusteringBase(QuadraticModel):
     """
     A base class for clustering algorithms
@@ -20,8 +21,10 @@ class ClusteringBase(QuadraticModel):
         num_samples=1,
         device="dirac-3",
         solver_access="cloud",
+        api_url=None,
+        api_token=None,
         ip_addr=None,
-        port=None,            
+        port=None,
     ):
         super(self).__init__(None, None, None)
 
@@ -32,11 +35,13 @@ class ClusteringBase(QuadraticModel):
         if device == "dirac-1" and solver_access == "direct":
             print("Dirac-1 is only available on cloud")
             solver_access = "cloud"
-        
+
         self.relaxation_schedule = relaxation_schedule
         self.num_samples = num_samples
         self.device = device
         self.solver_access = solver_access
+        self.api_url = api_url
+        self.api_token = api_token
         self.ip_addr = ip_addr
         self.port = port
 
@@ -80,7 +85,8 @@ class ClusteringBase(QuadraticModel):
                 solver.connect(self.ip_addr, self.port)
             else:
                 solver = Dirac3CloudSolver()
-                
+                solver.connect(self.api_url, self.api_token)
+
             response = solver.solve(
                 self,
                 sum_constraint=self._sum_constraint,
@@ -94,10 +100,10 @@ class ClusteringBase(QuadraticModel):
         elif self.solver_access == "direct":
             energies = response["energy"]
             solutions = response["solution"]
-            
+
         min_id = np.argmin(energies)
         sol = solutions[min_id]
-            
+
         print(response)
 
         return sol, response

{eqc_models-0.14.2 → eqc_models-0.14.4}/eqc_models/ml/decomposition.py

@@ -17,6 +17,7 @@ from eqc_models.solvers.qciclient import (
 )
 from eqc_models.solvers.eqcdirect import Dirac3DirectSolver
 
+
 class DecompBase(QuadraticModel):
     """An Base class for decomposition algorithms.
 
@@ -30,9 +31,13 @@ class DecompBase(QuadraticModel):
 
     solver_access: Solver access type: cloud or direct; default: cloud.
 
+    api_url: API URL used when cloud access is used; default: None.
+
+    api_token: API token used when cloud access is used; default: None.
+
     ip_addr: IP address of the device when direct access is used; default: None.
 
-    port: Port number of the device when direct access is used; default: None.    
+    port: Port number of the device when direct access is used; default: None.
     """
 
     def __init__(
@@ -40,16 +45,20 @@ class DecompBase(QuadraticModel):
         relaxation_schedule=2,
         num_samples=1,
         solver_access="cloud",
+        api_url=None,
+        api_token=None,
         ip_addr=None,
-        port=None,                        
+        port=None,
     ):
         super(self).__init__(None, None, None)
 
         assert solver_access in ["cloud", "direct"]
-        
+
         self.relaxation_schedule = relaxation_schedule
         self.num_samples = num_samples
         self.solver_access = solver_access
+        self.api_url = api_url
+        self.api_token = api_token
         self.ip_addr = ip_addr
         self.port = port
 
@@ -73,13 +82,13 @@ class DecompBase(QuadraticModel):
         return
 
     def _solve(self):
-
         if self.solver_access == "direct":
             solver = Dirac3DirectSolver()
             solver.connect(self.ip_addr, self.port)
         else:
             solver = Dirac3CloudSolver()
-                
+            solver.connect(self.api_url, self.api_token)
+
         response = solver.solve(
             self,
             sum_constraint=self._sum_constraint,
@@ -93,10 +102,10 @@ class DecompBase(QuadraticModel):
         elif self.solver_access == "direct":
             energies = response["energy"]
             solutions = response["solution"]
-            
+
         min_id = np.argmin(energies)
         sol = solutions[min_id]
-            
+
         print(response)
 
         return sol, response
@@ -209,10 +218,14 @@ class PCA(DecompBase):
 
     solver_access: Solver access type: cloud or direct; default: cloud.
 
+    api_url: API URL used when cloud access is used; default: None.
+
+    api_token: API token used when cloud access is used; default: None.
+
     ip_addr: IP address of the device when direct access is used; default: None.
 
     port: Port number of the device when direct access is used; default: None.
-    
+
     mode: Compute the largest or smallest principal components,
     largest_components vs. smallest_components; default:
     largest_components.
@@ -246,22 +259,25 @@ class PCA(DecompBase):
         relaxation_schedule=2,
         num_samples=1,
         solver_access="cloud",
+        api_url=None,
+        api_token=None,
         ip_addr=None,
-        port=None,                        
+        port=None,
         mode="largest_components",
     ):
-
         assert solver_access in ["cloud", "direct"]
         assert mode in ["largest_components", "smallest_components"], (
             "Invalid value of mode <%s>" % mode
         )
-        
+
         self.n_components = n_components
         self.relaxation_schedule = relaxation_schedule
         self.num_samples = num_samples
         self.solver_access = solver_access
+        self.api_url = api_url
+        self.api_token = api_token
         self.ip_addr = ip_addr
-        self.port = port        
+        self.port = port
         self.mode = mode
         self.X = None
         self.X_pca = None
@@ -297,7 +313,7 @@ class PCA(DecompBase):
         assert J.shape[0] == C.shape[0], "Inconsistent hamiltonian size!"
 
         sum_constraint = 0.5 * (1.0 + C.shape[0])
-        
+
         self._set_model(J, C, 1.0)
 
         sol, response = self._solve()
@@ -306,7 +322,7 @@ class PCA(DecompBase):
 
         sol = np.array(sol)
         sol = 2.0 * sol - 1.0
-        
+
         fct = np.linalg.norm(sol)
         if fct > 0:
             fct = 1.0 / fct