codegreen 0.4.1__tar.gz → 0.4.3__tar.gz

{codegreen-0.4.1 → codegreen-0.4.3}/CMakeLists.txt

@@ -1,5 +1,14 @@
 cmake_minimum_required(VERSION 3.16)
-project(CodeGreen VERSION 0.3.0 LANGUAGES CXX)
+
+# Single source of truth: pyproject.toml [project].version
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/pyproject.toml" _PYPROJECT_TOML)
+string(REGEX MATCH "version *= *\"([0-9]+\\.[0-9]+\\.[0-9]+)\"" _VERSION_MATCH "${_PYPROJECT_TOML}")
+if(NOT CMAKE_MATCH_1)
+    message(FATAL_ERROR "Could not parse [project].version from pyproject.toml")
+endif()
+set(_CODEGREEN_VERSION "${CMAKE_MATCH_1}")
+
+project(CodeGreen VERSION ${_CODEGREEN_VERSION} LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

{codegreen-0.4.1/codegreen.egg-info → codegreen-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codegreen
-Version: 0.4.1
+Version: 0.4.3
 Summary: Know the true energy cost of your code
 Author-email: Saurabhsingh Rajput <saurabh@dal.ca>
 Maintainer-email: Saurabhsingh Rajput <saurabh@dal.ca>

{codegreen-0.4.1 → codegreen-0.4.3}/codegreen/__init__.py

@@ -12,7 +12,7 @@ try:
     from importlib.metadata import version as _pkg_version
     __version__ = _pkg_version("codegreen")
 except Exception:
-    __version__ = "0.4.1"  # fallback for dev/editable installs
+    __version__ = "0.4.3"  # fallback for dev/editable installs
 __author__ = "Saurabhsingh Rajput"
 __email__ = "saurabh@dal.ca"
 __description__ = "Know the true energy cost of your code"

{codegreen-0.4.1 → codegreen-0.4.3}/codegreen/analyzer/plot.py

@@ -272,11 +272,11 @@ def _render_session_plotly(tasks: list, path: Path) -> None:
     except ImportError:
         return
     fig = go.Figure()
-    t0_ns = min(s["t"] for t in tasks for s in t["timeseries"])
+    t0_ns = min(s["t_ns"] for t in tasks for s in t["timeseries"])
     for t in tasks:
         ts = t["timeseries"]
-        x = [(s["t"] - t0_ns) / 1e9 for s in ts]
-        y = [s["w"] for s in ts]
+        x = [(s["t_ns"] - t0_ns) / 1e9 for s in ts]
+        y = [s["power_w"] for s in ts]
         fig.add_trace(go.Scatter(
             x=x, y=y, mode="lines", name=t["name"],
             line=dict(width=1),
@@ -302,11 +302,11 @@ def _render_session_matplotlib(tasks: list, path: Path) -> None:
         return
     fig, ax = plt.subplots(figsize=(10, 4), facecolor=BG)
     ax.set_facecolor(CARD)
-    t0_ns = min(s["t"] for t in tasks for s in t["timeseries"])
+    t0_ns = min(s["t_ns"] for t in tasks for s in t["timeseries"])
     for t in tasks:
         ts = t["timeseries"]
-        x = [(s["t"] - t0_ns) / 1e9 for s in ts]
-        y = [s["w"] for s in ts]
+        x = [(s["t_ns"] - t0_ns) / 1e9 for s in ts]
+        y = [s["power_w"] for s in ts]
         ax.plot(x, y, lw=0.8, label=t["name"])
     ax.set_xlabel("Time (s)", color=TXT)
     ax.set_ylabel("Power (W)", color=TXT)

{codegreen-0.4.1 → codegreen-0.4.3}/codegreen/config.json

@@ -1,5 +1,4 @@
 {
-  "version": "0.3.16",
   "paths": {
     "runtime_modules": {
       "python": "runtime/codegreen_runtime.py",
@@ -27,7 +26,7 @@
     "nemb": {
       "enabled": true,
       "coordinator": {
-        "measurement_interval_ms": 1,
+        "measurement_interval_ms": 10,
         "measurement_buffer_size": 100000,
         "auto_restart_failed_providers": true,
         "provider_restart_interval": 5000,
@@ -165,7 +164,6 @@
     "completed": false,
     "timestamp": null,
     "environment_type": "unknown",
-    "detected_sensors": [],
-    "version": "0.3.16"
+    "detected_sensors": []
   }
 }

{codegreen-0.4.1 → codegreen-0.4.3}/codegreen/instrumentation/language_runtimes/python/codegreen_runtime.py

@@ -342,14 +342,16 @@ _DEFAULT_SAMPLE_INTERVAL_MS = 10  # NEMB default; mirror in Session for sizing m
 
 
 def _bundled_sample_interval_ms() -> int:
-    """Read the C++ NEMB default sample interval from bundled config.json."""
+    """Read the NEMB default sample interval from bundled config.json. The
+    correct path is `measurement.nemb.coordinator.measurement_interval_ms`;
+    earlier versions looked it up at the top level and silently fell back."""
     cfg = Path(__file__).resolve().parents[3] / "config.json"
     try:
         with open(cfg) as f:
             d = json.load(f)
-        return int(d.get("coordinator", {}).get("measurement_interval_ms", 1))
+        return int(d["measurement"]["nemb"]["coordinator"]["measurement_interval_ms"])
     except Exception:
-        return 1
+        return _DEFAULT_SAMPLE_INTERVAL_MS
 
 
 def _quality_label(cv_percent: float) -> str:
@@ -364,7 +366,7 @@ def _compute_task_noise(task: "TaskResult", sample_interval_ms: int) -> Optional
     ts = task.timeseries
     if not ts:
         return None
-    powers = [s.get("w", 0.0) for s in ts if s.get("w") is not None]
+    powers = [s.get("power_w", 0.0) for s in ts if s.get("power_w") is not None]
     n = len(powers)
     if n >= 2:
         mean_w = _statistics.fmean(powers)
@@ -496,13 +498,12 @@ class Session:
                         self._buffer_samples = int(buffer_samples)
                     except Exception:
                         pass
-                if sample_interval_ms is not None:
-                    try:
-                        self._client.lib.nemb_set_measurement_interval_ms(
-                            int(sample_interval_ms)
-                        )
-                    except Exception:
-                        pass
+                effective_interval = int(sample_interval_ms) if sample_interval_ms is not None \
+                                     else _bundled_sample_interval_ms()
+                try:
+                    self._client.lib.nemb_set_measurement_interval_ms(effective_interval)
+                except Exception:
+                    pass
         # Effective sample interval for noise / drop-ratio math.
         self._sample_interval_ms = int(sample_interval_ms) if sample_interval_ms is not None \
                                    else _bundled_sample_interval_ms()
@@ -549,7 +550,7 @@ class Session:
             return 0
         with self._ts_lock:
             self._ts_samples.extend(samples)
-        self._ts_last_ts = samples[-1]["t"]
+        self._ts_last_ts = samples[-1]["t_ns"]
         return len(samples)
 
     def _drain_loop(self):
@@ -659,7 +660,7 @@ class Session:
             self._drain_once()  # ensure latest samples are pulled before filtering
             with self._ts_lock:
                 ts = [s for s in self._ts_samples
-                      if t_mono_ns <= s["t"] <= t_end_mono_ns]
+                      if t_mono_ns <= s["t_ns"] <= t_end_mono_ns]
         result = TaskResult(
             name=name, energy_j=e.value, avg_power_w=p.value,
             duration_s=dur.value if dur.value > 0 else (t_end - t_start),
@@ -720,6 +721,7 @@ class Session:
             "energy_j": total_e,
             "duration_s": total_d,
             "n_tasks": len(self._tasks),
+            "sample_interval_ms": self._sample_interval_ms if self._record_ts else None,
             "worst_power_cv_percent": round(worst_cv, 3) if self._record_ts else None,
             "noise_warnings": warnings_list,
         }

{codegreen-0.4.1 → codegreen-0.4.3/codegreen.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codegreen
-Version: 0.4.1
+Version: 0.4.3
 Summary: Know the true energy cost of your code
 Author-email: Saurabhsingh Rajput <saurabh@dal.ca>
 Maintainer-email: Saurabhsingh Rajput <saurabh@dal.ca>

{codegreen-0.4.1 → codegreen-0.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codegreen"
-version = "0.4.1"
+version = "0.4.3"
 description = "Know the true energy cost of your code"
 readme = "README.md"
 license = {file = "LICENSE"}