openscvx 0.4.1.dev84__tar.gz → 0.4.1.dev89__tar.gz

{openscvx-0.4.1.dev84/openscvx.egg-info → openscvx-0.4.1.dev89}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscvx
-Version: 0.4.1.dev84
+Version: 0.4.1.dev89
 Summary: A general Python-based successive convexification implementation which uses a JAX backend.
 Author-email: Chris Hayner and Griffin Norris <haynec@uw.edu>
 License: Apache Software License

{openscvx-0.4.1.dev84 → openscvx-0.4.1.dev89}/openscvx/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.1.dev84'
-__version_tuple__ = version_tuple = (0, 4, 1, 'dev84')
+__version__ = version = '0.4.1.dev89'
+__version_tuple__ = version_tuple = (0, 4, 1, 'dev89')
 
-__commit_id__ = commit_id = 'g86a8a0af6'
+__commit_id__ = commit_id = 'gacffe2b5c'

{openscvx-0.4.1.dev84 → openscvx-0.4.1.dev89}/openscvx/problem.py

@@ -241,6 +241,7 @@ class Problem:
         self.timing_init = None
         self.timing_solve = None
         self.timing_post = None
+        self._profiling_session = None
 
         # Discretizer (handles linearization + discretization)
         self._discretizer = LinearizeDiscretize()
@@ -527,8 +528,11 @@ class Problem:
         """
         printing.intro()
 
-        # Enable the profiler
-        pr = profiling.profiling_start(self.settings.dev.profiling)
+        # Create a new profiling session (shared across initialize/solve/post_process)
+        self._profiling_session = (
+            profiling._create_session() if self.settings.dev.profiling else None
+        )
+        pr = profiling.profiling_start(self.settings.dev.profiling, self._profiling_session)
 
         t_0_while = time.time()
         # Ensure parameter sizes and normalization are correct
@@ -775,8 +779,8 @@ class Problem:
         if any(r is None for r in required):
             raise ValueError("Problem has not been initialized. Call initialize() before solve()")
 
-        # Enable the profiler
-        pr = profiling.profiling_start(self.settings.dev.profiling)
+        # Enable the profiler (reuse session from initialize)
+        pr = profiling.profiling_start(self.settings.dev.profiling, self._profiling_session)
 
         t_0_while = time.time()
         # Print top header for solver results
@@ -824,8 +828,8 @@ class Problem:
         if self._solution is None:
             raise ValueError("No solution available. Call solve() first.")
 
-        # Enable the profiler
-        pr = profiling.profiling_start(self.settings.dev.profiling)
+        # Enable the profiler (reuse session from initialize)
+        pr = profiling.profiling_start(self.settings.dev.profiling, self._profiling_session)
 
         # Create result from stored solution state
         result = self._format_result(self._solution, self._solution.k <= self.settings.scp.k_max)

{openscvx-0.4.1.dev84 → openscvx-0.4.1.dev89}/openscvx/symbolic/expr/expr.py

@@ -572,7 +572,7 @@ def traverse(expr: Expr, visit: Callable[[Expr], None]):
         traverse(child, visit)
 
 
-class Constant(Expr):
+class Constant(Leaf):
     """Constant value expression.
 
     Represents a constant numeric value in the expression tree. Constants are
@@ -601,40 +601,7 @@ class Constant(Expr):
         if not isinstance(value, np.ndarray):
             value = np.array(value, dtype=float)
         self.value = np.squeeze(value)
-
-    def canonicalize(self) -> "Expr":
-        """Constants are already in canonical form.
-
-        Returns:
-            Expr: Returns self since constants are already canonical
-        """
-        return self
-
-    def check_shape(self) -> Tuple[int, ...]:
-        """Return the shape of this constant's value.
-
-        Returns:
-            tuple: The shape of the constant's numpy array value
-        """
-        # Verify the invariant: constants should already be squeezed during construction
-        original_shape = self.value.shape
-        squeezed_shape = np.squeeze(self.value).shape
-        if original_shape != squeezed_shape:
-            raise ValueError(
-                f"Constant not properly normalized: has shape {original_shape} "
-                "but should have shape {squeezed_shape}. "
-                "Constants should be squeezed during construction."
-            )
-        return self.value.shape
-
-    def sparsity(self, n_x: int, n_u: int) -> Tuple[np.ndarray, np.ndarray]:
-        """Constants have no decision-variable dependence."""
-        shape = self.value.shape
-        n_out = int(np.prod(shape)) if shape else 1
-        return (
-            np.zeros((n_out, n_x), dtype=bool),
-            np.zeros((n_out, n_u), dtype=bool),
-        )
+        super().__init__(name="__constant__", shape=self.value.shape)
 
     def _hash_into(self, hasher: "hashlib._Hash") -> None:
         """Hash constant by its value.

openscvx-0.4.1.dev89/openscvx/utils/profiling.py

@@ -0,0 +1,54 @@
+import cProfile
+import os
+from datetime import datetime
+from typing import Callable, Optional
+
+
+def _create_session():
+    """Create a new profiling session. Returns a function that generates .prof paths."""
+    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+    run_dir = os.path.join("profiling", timestamp)
+    os.makedirs(run_dir, exist_ok=True)
+    counts = {}
+
+    def path_for(identifier: str) -> str:
+        count = counts.get(identifier, 0)
+        counts[identifier] = count + 1
+        suffix = f"-{count}" if count > 0 else ""
+        return os.path.join(run_dir, f"{identifier}{suffix}.prof")
+
+    return path_for
+
+
+def profiling_start(
+    profiling_enabled: bool, session: Optional[Callable[[str], str]] = None
+) -> Optional[tuple[cProfile.Profile, Callable[[str], str]]]:
+    """Start profiling if enabled.
+
+    Args:
+        profiling_enabled: Whether to enable profiling.
+        session: Existing session to reuse. If None, a new session is created.
+
+    Returns:
+        (Profile, session) tuple if enabled, None otherwise.
+    """
+    if profiling_enabled:
+        if session is None:
+            session = _create_session()
+        pr = cProfile.Profile()
+        pr.enable()
+        return (pr, session)
+    return None
+
+
+def profiling_end(ctx: Optional[tuple[cProfile.Profile, Callable[[str], str]]], identifier: str):
+    """Stop profiling and save results.
+
+    Args:
+        ctx: (Profile, session) tuple from profiling_start, or None.
+        identifier: Identifier for the profiling stage (e.g., "solve", "initialize").
+    """
+    if ctx is not None:
+        pr, session = ctx
+        pr.disable()
+        pr.dump_stats(session(identifier))

{openscvx-0.4.1.dev84 → openscvx-0.4.1.dev89/openscvx.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscvx
-Version: 0.4.1.dev84
+Version: 0.4.1.dev89
 Summary: A general Python-based successive convexification implementation which uses a JAX backend.
 Author-email: Chris Hayner and Griffin Norris <haynec@uw.edu>
 License: Apache Software License

openscvx-0.4.1.dev84/openscvx/utils/profiling.py

@@ -1,37 +0,0 @@
-from datetime import datetime
-from typing import TYPE_CHECKING, Optional
-
-if TYPE_CHECKING:
-    import cProfile
-
-
-def profiling_start(profiling_enabled: bool) -> "Optional[cProfile.Profile]":
-    """Start profiling if enabled.
-
-    Args:
-        profiling_enabled: Whether to enable profiling.
-
-    Returns:
-        Profile object if enabled, None otherwise.
-    """
-    if profiling_enabled:
-        import cProfile
-
-        pr = cProfile.Profile()
-        pr.enable()
-        return pr
-    return None
-
-
-def profiling_end(pr: "Optional[cProfile.Profile]", identifier: str):
-    """Stop profiling and save results with timestamp.
-
-    Args:
-        pr: Profile object from profiling_start, or None.
-        identifier: Identifier for the profiling session (e.g., "solve", "initialize").
-    """
-    if pr is not None:
-        pr.disable()
-        # Save results so it can be visualized with snakeviz
-        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-        pr.dump_stats(f"profiling/{timestamp}_{identifier}.prof")