eqc-models 0.9.8__tar.gz → 0.10.0__tar.gz

{eqc_models-0.9.8/eqc_models.egg-info → eqc_models-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: eqc-models
-Version: 0.9.8
+Version: 0.10.0
 Summary: Optimization and ML modeling package targeting EQC devices
 Author: Quantum Computing Inc.
 Author-email: support@quantumcomputinginc.com
@@ -13,6 +13,7 @@ License-File: LICENSE.txt
 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
 Provides-Extra: direct

eqc_models-0.10.0/compile_extensions.py

@@ -0,0 +1,67 @@
+import os
+import sys
+from setuptools import Extension
+from setuptools.command.build_py import build_py as _build_py
+import numpy
+
+# # Set cvqboost compile args
+# if sys.platform == "darwin":
+#     openmp_prefix = os.environ.get(
+#         "LIBOMP_PREFIX", "/opt/homebrew/opt/libomp"
+#     )
+#     openmp_include = os.path.join(openmp_prefix, "include")
+#     openmp_lib = os.path.join(openmp_prefix, "lib", "libomp.a")
+#     extra_compile_args_cvq = [
+#         "-Xpreprocessor",
+#         "-fopenmp",
+#         "-O3",
+#         "-ffast-math",
+#         "-march=native",
+#     ]
+#     extra_link_args_cvq = [openmp_lib, "-O3", "-march=native"]
+# elif sys.platform.startswith("linux"):
+#     extra_compile_args_cvq = [
+#         "-static-libgcc",
+#         "-fopenmp",
+#         "-O3",
+#         "-ffast-math",
+#     ]
+#     extra_link_args_cvq = [
+#         "-static-libgcc",
+#         "-static-libstdc++",
+#         "-fopenmp",
+#         "-O3",
+#     ]
+# elif sys.platform == "win32":
+#     extra_compile_args_cvq = ["/openmp"]
+#     extra_link_args_cvq = []
+
+# Modules to be compiled and include_dirs when necessary
+extensions = [
+    Extension(
+        "eqc_models.base.polyeval",
+        ["eqc_models/base/polyeval.pyx"],
+        include_dirs=[numpy.get_include()],
+        extra_compile_args=["-O3", "-ffast-math"],
+    ),
+    # Extension(
+    #     "eqc_models.ml.cvqboost_hamiltonian",
+    #     ["eqc_models/ml/cvqboost_hamiltonian.pyx"],
+    #     include_dirs=[numpy.get_include()],
+    #     extra_compile_args=extra_compile_args_cvq,
+    #     extra_link_args=extra_link_args_cvq,
+    # ),
+]
+
+
+class build_py(_build_py):
+    def run(self):
+        self.run_command("build_ext")
+        return super().run()
+
+    def initialize_options(self):
+        super().initialize_options()
+        if self.distribution.ext_modules == None:
+            self.distribution.ext_modules = []
+
+        self.distribution.ext_modules.extend(extensions)

{eqc_models-0.9.8 → eqc_models-0.10.0}/docs/build/html/_static/pygments.css

@@ -6,9 +6,9 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
 .highlight .hll { background-color: #ffffcc }
 .highlight { background: #f8f8f8; }
 .highlight .c { color: #3D7B7B; font-style: italic } /* Comment */
-.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .err { border: 1px solid #F00 } /* Error */
 .highlight .k { color: #008000; font-weight: bold } /* Keyword */
-.highlight .o { color: #666666 } /* Operator */
+.highlight .o { color: #666 } /* Operator */
 .highlight .ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */
 .highlight .cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */
 .highlight .cp { color: #9C6500 } /* Comment.Preproc */
@@ -25,34 +25,34 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
 .highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
 .highlight .gs { font-weight: bold } /* Generic.Strong */
 .highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.highlight .gt { color: #0044DD } /* Generic.Traceback */
+.highlight .gt { color: #04D } /* Generic.Traceback */
 .highlight .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
 .highlight .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
 .highlight .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
 .highlight .kp { color: #008000 } /* Keyword.Pseudo */
 .highlight .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
 .highlight .kt { color: #B00040 } /* Keyword.Type */
-.highlight .m { color: #666666 } /* Literal.Number */
+.highlight .m { color: #666 } /* Literal.Number */
 .highlight .s { color: #BA2121 } /* Literal.String */
 .highlight .na { color: #687822 } /* Name.Attribute */
 .highlight .nb { color: #008000 } /* Name.Builtin */
-.highlight .nc { color: #0000FF; font-weight: bold } /* Name.Class */
-.highlight .no { color: #880000 } /* Name.Constant */
-.highlight .nd { color: #AA22FF } /* Name.Decorator */
+.highlight .nc { color: #00F; font-weight: bold } /* Name.Class */
+.highlight .no { color: #800 } /* Name.Constant */
+.highlight .nd { color: #A2F } /* Name.Decorator */
 .highlight .ni { color: #717171; font-weight: bold } /* Name.Entity */
 .highlight .ne { color: #CB3F38; font-weight: bold } /* Name.Exception */
-.highlight .nf { color: #0000FF } /* Name.Function */
+.highlight .nf { color: #00F } /* Name.Function */
 .highlight .nl { color: #767600 } /* Name.Label */
-.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.highlight .nn { color: #00F; font-weight: bold } /* Name.Namespace */
 .highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */
 .highlight .nv { color: #19177C } /* Name.Variable */
-.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mb { color: #666666 } /* Literal.Number.Bin */
-.highlight .mf { color: #666666 } /* Literal.Number.Float */
-.highlight .mh { color: #666666 } /* Literal.Number.Hex */
-.highlight .mi { color: #666666 } /* Literal.Number.Integer */
-.highlight .mo { color: #666666 } /* Literal.Number.Oct */
+.highlight .ow { color: #A2F; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #BBB } /* Text.Whitespace */
+.highlight .mb { color: #666 } /* Literal.Number.Bin */
+.highlight .mf { color: #666 } /* Literal.Number.Float */
+.highlight .mh { color: #666 } /* Literal.Number.Hex */
+.highlight .mi { color: #666 } /* Literal.Number.Integer */
+.highlight .mo { color: #666 } /* Literal.Number.Oct */
 .highlight .sa { color: #BA2121 } /* Literal.String.Affix */
 .highlight .sb { color: #BA2121 } /* Literal.String.Backtick */
 .highlight .sc { color: #BA2121 } /* Literal.String.Char */
@@ -67,9 +67,9 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
 .highlight .s1 { color: #BA2121 } /* Literal.String.Single */
 .highlight .ss { color: #19177C } /* Literal.String.Symbol */
 .highlight .bp { color: #008000 } /* Name.Builtin.Pseudo */
-.highlight .fm { color: #0000FF } /* Name.Function.Magic */
+.highlight .fm { color: #00F } /* Name.Function.Magic */
 .highlight .vc { color: #19177C } /* Name.Variable.Class */
 .highlight .vg { color: #19177C } /* Name.Variable.Global */
 .highlight .vi { color: #19177C } /* Name.Variable.Instance */
 .highlight .vm { color: #19177C } /* Name.Variable.Magic */
-.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */
+.highlight .il { color: #666 } /* Literal.Number.Integer.Long */

{eqc_models-0.9.8 → eqc_models-0.10.0}/eqc_models/assignment/setpartition.py

@@ -1,8 +1,9 @@
 from typing import List, Tuple, Dict, Union
 import numpy as np
 from eqc_models.base import ConstraintsMixIn, PolynomialModel
+from eqc_models.base.polynomial import ConstrainedPolynomialModel
 
-class SetPartitionModel(ConstraintsMixIn, PolynomialModel):
+class SetPartitionModel(ConstrainedPolynomialModel):
     """
     This class represents a set partitioning model for optimization problems that require selecting subsets
     to partition a universal set while minimizing an objective function defined by weights. Given a collection
@@ -83,24 +84,15 @@ class SetPartitionModel(ConstraintsMixIn, PolynomialModel):
             A.append(row)
         A = np.array(A)
         b = np.ones((A.shape[0],))
-
-        # Define penalty terms
-        J = A.T @ A
-        h = -2 * b.T @ A
-        n = h.shape[0]
-        h = h.reshape((n, 1))
-        offset = b.T @ b
-
-        # Assign the constraints to the mixin's properties
-        self.constraints = (A, b)
-
-        # Initialize PolynomialModel with J and h, properly formatted as indices and coefficients
-        indices, coefficients = self._construct_polynomial_terms(h, J)
-        super().__init__(coefficients, indices)
+        n = A.shape[1]
 
         # Define the linear objective function based on subset weights
         self.linear_objective = np.array(weights).reshape((n, 1))
-        self.quad_objective = np.zeros_like(J)
+        self.quad_objective = np.zeros((n, n)) #np.zeros_like(J)
+
+        # Initialize PolynomialModel with J and h, properly formatted as indices and coefficients
+        indices, coefficients = self._construct_polynomial_terms(self.linear_objective, self.quad_objective)
+        super().__init__(coefficients, indices, A, b)
 
     def _construct_polynomial_terms(self, h: np.ndarray, J: np.ndarray) -> Tuple[List[List[int]], List[np.ndarray]]:
         """
@@ -140,19 +132,6 @@ class SetPartitionModel(ConstraintsMixIn, PolynomialModel):
 
         return indices, coefficients
 
-    @property
-    def H(self) -> Tuple[np.ndarray, np.ndarray]:
-        """
-        Hamiltonian representation as a polynomial, returning the coefficients and indices.
-
-        Returns
-        -------
-        Tuple[np.ndarray, np.ndarray]
-            Tuple where the first element is an array of coefficients, and the second element
-            is an array of indices, each representing polynomial terms for the Hamiltonian.
-        """
-        return self.coefficients, self.indices
-
     def evaluateObjective(self, solution: np.ndarray) -> float:
         """
         Evaluate the objective function by calculating the weighted sum of selected subsets.