codegreen 0.2.1__tar.gz → 0.2.2__tar.gz

{codegreen-0.2.1 → codegreen-0.2.2}/CMakeLists.txt

@@ -16,7 +16,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 # Find required packages
-find_package(PkgConfig REQUIRED)
+find_package(PkgConfig)
 find_package(Threads REQUIRED)
 
 # Optional GPU library support
@@ -47,10 +47,16 @@ else()
     set(HAVE_ROCM_SMI OFF)
 endif()
 
-# Find system libraries
-pkg_check_modules(JSONCPP REQUIRED jsoncpp)
-pkg_check_modules(CURL REQUIRED libcurl)
-pkg_check_modules(SQLITE3 REQUIRED sqlite3)
+# System libraries (required for legacy core on Linux, not for NEMB-only macOS builds)
+if(NOT APPLE)
+    pkg_check_modules(JSONCPP REQUIRED jsoncpp)
+    pkg_check_modules(CURL REQUIRED libcurl)
+    pkg_check_modules(SQLITE3 REQUIRED sqlite3)
+else()
+    pkg_check_modules(JSONCPP jsoncpp)
+    pkg_check_modules(CURL libcurl)
+    pkg_check_modules(SQLITE3 sqlite3)
+endif()
 
 # Global include directories
 include_directories(${CMAKE_SOURCE_DIR}/codegreen/measurement/include)
@@ -248,7 +254,7 @@ add_custom_target(dev-install ALL
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/bin
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/codegreen ${CMAKE_SOURCE_DIR}/bin/
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/lib
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/libcodegreen-nemb.so ${CMAKE_SOURCE_DIR}/lib/
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/libcodegreen-nemb${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SOURCE_DIR}/lib/
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/libcodegreen-core.a ${CMAKE_SOURCE_DIR}/lib/
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/bin/python/instrumentation
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/codegreen/instrumentation/bridge_analyze.py ${CMAKE_SOURCE_DIR}/bin/python/instrumentation/

{codegreen-0.2.1/codegreen.egg-info → codegreen-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codegreen
-Version: 0.2.1
+Version: 0.2.2
 Summary: Energy-aware software development tool for measuring and optimizing code energy consumption
 Author-email: Saurabhsingh Rajput <saurabh@dal.ca>
 Maintainer-email: Saurabhsingh Rajput <saurabh@dal.ca>

{codegreen-0.2.1 → codegreen-0.2.2}/codegreen/__init__.py

@@ -5,7 +5,7 @@ A comprehensive energy measurement and code optimization tool for developers
 and researchers who need precise, fine-grained energy consumption analysis.
 """
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 __author__ = "Saurabhsingh Rajput"
 __email__ = "saurabh@dal.ca"
 __description__ = "Energy-aware software development tool"

{codegreen-0.2.1 → codegreen-0.2.2/codegreen.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codegreen
-Version: 0.2.1
+Version: 0.2.2
 Summary: Energy-aware software development tool for measuring and optimizing code energy consumption
 Author-email: Saurabhsingh Rajput <saurabh@dal.ca>
 Maintainer-email: Saurabhsingh Rajput <saurabh@dal.ca>

{codegreen-0.2.1 → codegreen-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codegreen"
-version = "0.2.1"
+version = "0.2.2"
 description = "Energy-aware software development tool for measuring and optimizing code energy consumption"
 readme = "README.md"
 license = {file = "LICENSE"}
@@ -105,6 +105,7 @@ find = {where = ["."], include = [
 "codegreen" = [
     "config.json",
     "lib/*.so",
+    "lib/*.dylib",
     "lib/runtime/**/*.h",
     "bin/codegreen",
 ]

codegreen-0.2.2/setup.py

@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+"""CodeGreen setup with C++ backend compilation for wheel builds."""
+
+import os
+import platform
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+from setuptools import setup, Distribution
+from setuptools.command.build_py import build_py
+
+_EXCLUDE_DIRS = {"ide", "measurement", "optimizer"}
+_NATIVE_LIB = {
+    "Darwin": "libcodegreen-nemb.dylib",
+    "Linux": "libcodegreen-nemb.so",
+}
+
+
+def _find_native_lib(source_dir: Path) -> Path | None:
+    """Find the NEMB shared library for the current platform."""
+    name = _NATIVE_LIB.get(platform.system())
+    if not name:
+        return None
+    path = source_dir / "lib" / name
+    return path if path.exists() else None
+
+
+class BuildWithCMake(build_py):
+    """Build C++ backend via cmake, then run normal build_py."""
+
+    def run(self):
+        source_dir = Path(__file__).resolve().parent
+        native_lib = _find_native_lib(source_dir)
+
+        if not native_lib:
+            self._try_cmake_build(source_dir)
+            native_lib = _find_native_lib(source_dir)
+
+        super().run()
+        if self.build_lib:
+            self._install_native_artifacts(source_dir, native_lib)
+
+    def _try_cmake_build(self, source_dir: Path) -> None:
+        try:
+            build_dir = source_dir / "build"
+            build_dir.mkdir(exist_ok=True)
+            subprocess.check_call(
+                ["cmake", str(source_dir), "-DCMAKE_BUILD_TYPE=Release",
+                 f"-DPython3_EXECUTABLE={sys.executable}"],
+                cwd=build_dir)
+            subprocess.check_call(
+                ["cmake", "--build", ".", "--config", "Release",
+                 "-j", str(os.cpu_count() or 2)],
+                cwd=build_dir)
+        except (subprocess.CalledProcessError, FileNotFoundError) as e:
+            print(f"NEMB build skipped ({e.__class__.__name__}). "
+                  "Python-only install (no native energy measurement).")
+
+    def _install_native_artifacts(self, source_dir: Path, native_lib: Path | None) -> None:
+        build_src = Path(self.build_lib) / "codegreen"
+        for d in _EXCLUDE_DIRS:
+            bad = build_src / d
+            if bad.exists():
+                shutil.rmtree(bad)
+
+        if not native_lib:
+            return
+
+        dest_lib = build_src / "lib"
+        dest_lib.mkdir(parents=True, exist_ok=True)
+        self.copy_file(str(native_lib), str(dest_lib / native_lib.name))
+
+        bin_file = source_dir / "build" / "bin" / "codegreen"
+        if not bin_file.exists():
+            bin_file = source_dir / "bin" / "codegreen"
+        if bin_file.exists():
+            dest_bin = build_src / "bin"
+            dest_bin.mkdir(parents=True, exist_ok=True)
+            self.copy_file(str(bin_file), str(dest_bin / "codegreen"))
+            os.chmod(str(dest_bin / "codegreen"), 0o755)
+
+        rt_base = source_dir / "codegreen" / "instrumentation" / "language_runtimes"
+        for lang in ("c", "cpp"):
+            header = rt_base / lang / "codegreen_runtime.h"
+            if header.exists():
+                dest_rt = dest_lib / "runtime" / lang
+                dest_rt.mkdir(parents=True, exist_ok=True)
+                self.copy_file(str(header), str(dest_rt / "codegreen_runtime.h"))
+
+
+class BinaryDistribution(Distribution):
+    def has_ext_modules(self):
+        return _find_native_lib(Path(__file__).resolve().parent) is not None
+
+
+PACKAGES = [
+    "codegreen", "codegreen.cli", "codegreen.analyzer", "codegreen.instrumentation", "codegreen.utils",
+    "codegreen.analysis", "codegreen.analysis.cfg",
+    "benchmark", "benchmark.validation", "benchmark.suites",
+]
+
+setup(
+    distclass=BinaryDistribution,
+    packages=PACKAGES,
+    cmdclass={"build_py": BuildWithCMake},
+    package_data={
+        "codegreen.instrumentation": [
+            "configs/*.json",
+            "language_runtimes/python/*.py",
+            "language_runtimes/c/*.h",
+            "language_runtimes/cpp/*.h",
+            "language_runtimes/cpp/*.hpp",
+            "language_runtimes/java/**/*.java",
+        ],
+        "codegreen": [
+            "lib/*.so",
+            "lib/*.dylib",
+            "lib/runtime/**/*.h",
+            "bin/codegreen",
+            "config.json",
+        ],
+    },
+    zip_safe=False,
+)

codegreen-0.2.1/setup.py

@@ -1,105 +0,0 @@
-#!/usr/bin/env python3
-"""CodeGreen setup with C++ backend compilation for wheel builds."""
-
-import os
-import shutil
-import subprocess
-import sys
-from pathlib import Path
-from setuptools import setup, Distribution
-from setuptools.command.build_py import build_py
-
-# Directories that must NOT be in the wheel
-_EXCLUDE_DIRS = {"ide", "measurement", "optimizer"}
-
-
-class BuildWithCMake(build_py):
-    """Build C++ backend via cmake, then run normal build_py."""
-
-    def run(self):
-        source_dir = Path(__file__).resolve().parent
-        lib_dir = source_dir / "lib"
-        so_file = lib_dir / "libcodegreen-nemb.so"
-
-        if not so_file.exists():
-            build_dir = source_dir / "build"
-            build_dir.mkdir(exist_ok=True)
-            subprocess.check_call(
-                ["cmake", str(source_dir), "-DCMAKE_BUILD_TYPE=Release",
-                 f"-DPython3_EXECUTABLE={sys.executable}"],
-                cwd=build_dir)
-            subprocess.check_call(
-                ["cmake", "--build", ".", "--config", "Release",
-                 "-j", str(os.cpu_count() or 2)],
-                cwd=build_dir)
-
-        super().run()
-
-        if not self.build_lib:
-            return
-
-        build_src = Path(self.build_lib) / "codegreen"
-
-        # Remove unwanted directories that setuptools auto-included
-        for d in _EXCLUDE_DIRS:
-            bad = build_src / d
-            if bad.exists():
-                shutil.rmtree(bad)
-
-        # Copy native files
-        if so_file.exists():
-            dest_lib = build_src / "lib"
-            dest_lib.mkdir(parents=True, exist_ok=True)
-            self.copy_file(str(so_file), str(dest_lib / "libcodegreen-nemb.so"))
-
-            bin_file = source_dir / "build" / "bin" / "codegreen"
-            if not bin_file.exists():
-                bin_file = source_dir / "bin" / "codegreen"
-            if bin_file.exists():
-                dest_bin = build_src / "bin"
-                dest_bin.mkdir(parents=True, exist_ok=True)
-                self.copy_file(str(bin_file), str(dest_bin / "codegreen"))
-                os.chmod(str(dest_bin / "codegreen"), 0o755)
-
-            rt_base = source_dir / "codegreen" / "instrumentation" / "language_runtimes"
-            for lang in ("c", "cpp"):
-                header = rt_base / lang / "codegreen_runtime.h"
-                if header.exists():
-                    dest_rt = dest_lib / "runtime" / lang
-                    dest_rt.mkdir(parents=True, exist_ok=True)
-                    self.copy_file(str(header), str(dest_rt / "codegreen_runtime.h"))
-
-
-class BinaryDistribution(Distribution):
-    def has_ext_modules(self):
-        return True
-
-
-PACKAGES = [
-    "codegreen", "codegreen.cli", "codegreen.analyzer", "codegreen.instrumentation", "codegreen.utils",
-    "codegreen.analysis", "codegreen.analysis.cfg",
-    "benchmark", "benchmark.validation", "benchmark.suites",
-]
-
-setup(
-    distclass=BinaryDistribution,
-    packages=PACKAGES,
-    cmdclass={"build_py": BuildWithCMake},
-    package_data={
-        "codegreen.instrumentation": [
-            "configs/*.json",
-            "language_runtimes/python/*.py",
-            "language_runtimes/c/*.h",
-            "language_runtimes/cpp/*.h",
-            "language_runtimes/cpp/*.hpp",
-            "language_runtimes/java/**/*.java",
-        ],
-        "codegreen": [
-            "lib/*.so",
-            "lib/runtime/**/*.h",
-            "bin/codegreen",
-            "config.json",
-        ],
-    },
-    zip_safe=False,
-)