hapc 0.1.5__tar.gz → 0.2.0__tar.gz

{hapc-0.1.5 → hapc-0.2.0}/CMakeLists.txt

@@ -4,6 +4,8 @@ project(hapc)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+include(FetchContent)
+
 # Windows: Add vcpkg to CMAKE_PREFIX_PATH if it exists
 if(WIN32 AND EXISTS "C:/vcpkg")
     list(APPEND CMAKE_PREFIX_PATH "C:/vcpkg/installed/x64-windows")
@@ -12,8 +14,17 @@ endif()
 # Find Python
 find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
 
-# Find Eigen3
-find_package(Eigen3 REQUIRED NO_MODULE)
+# Find Eigen3 with fallback to FetchContent for Windows
+find_package(Eigen3 QUIET NO_MODULE)
+if(NOT Eigen3_FOUND)
+    message(STATUS "Eigen3 not found, downloading via FetchContent...")
+    FetchContent_Declare(
+        Eigen3
+        URL https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz
+        URL_HASH SHA256=8586084f71f9bde545ee7fa6d00288b264a2b7ac3607b974e54d13e7162c1c72
+    )
+    FetchContent_MakeAvailable(Eigen3)
+endif()
 
 # Find pybind11 via Python
 execute_process(

{hapc-0.1.5/python/hapc.egg-info → hapc-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hapc
-Version: 0.1.5
+Version: 0.2.0
 Summary: Highly Adaptive Principal Components
 Home-page: https://github.com/meixide/hapc
 Author: Carlos García Meixide

{hapc-0.1.5 → hapc-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hapc"
-version = "0.1.5"
+version = "0.2.0"
 description = "Highly Adaptive Principal Components"
 readme = "README.md"
 requires-python = ">=3.8"

{hapc-0.1.5 → hapc-0.2.0}/python/hapc/__init__.py

@@ -1,6 +1,6 @@
 """HAPC: Highly Adaptive Principal Components."""
 
-__version__ = "0.1.5"
+__version__ = "0.2.0"
 
 from .core import (
     pchal_design,

{hapc-0.1.5 → hapc-0.2.0}/python/hapc/core.py

@@ -5,19 +5,7 @@ from typing import NamedTuple, Optional
 import sys
 from pathlib import Path
 
-# Try to import hapc_core module
-try:
-    # This is the standard way for an installed package
-    from . import hapc_core
-except ImportError:
-    # Fallback for development mode
-    try:
-        import hapc_core
-    except ImportError:
-        raise ImportError(
-            "hapc_core module not found. The C++ extension may not be built.\n"
-            "Try: pip install -e . --force-reinstall --no-cache-dir"
-        )
+from . import hapc_core
 
 class DesignOutput(NamedTuple):
     """Output from pchal_design."""

{hapc-0.1.5 → hapc-0.2.0/python/hapc.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hapc
-Version: 0.1.5
+Version: 0.2.0
 Summary: Highly Adaptive Principal Components
 Home-page: https://github.com/meixide/hapc
 Author: Carlos García Meixide

{hapc-0.1.5 → hapc-0.2.0}/python/hapc.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ python/hapc/single.py
 python/hapc.egg-info/PKG-INFO
 python/hapc.egg-info/SOURCES.txt
 python/hapc.egg-info/dependency_links.txt
+python/hapc.egg-info/not-zip-safe
 python/hapc.egg-info/requires.txt
 python/hapc.egg-info/top_level.txt
 src/bindings.cpp

hapc-0.2.0/python/hapc.egg-info/not-zip-safe

@@ -0,0 +1 @@
+

hapc-0.2.0/python/hapc.egg-info/top_level.txt

@@ -0,0 +1,2 @@
+hapc
+hapc/hapc_core

hapc-0.2.0/setup.py

@@ -0,0 +1,89 @@
+"""Setup for HAPC package (root level for remote installation)."""
+
+from setuptools import setup, find_packages, Extension
+from setuptools.command.build_ext import build_ext
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+class CMakeExtension(Extension):
+    def __init__(self, name, sourcedir=''):
+        Extension.__init__(self, name, sources=[])
+        self.sourcedir = os.path.abspath(sourcedir)
+
+class CMakeBuild(build_ext):
+    def run(self):
+        try:
+            out = subprocess.check_output(['cmake', '--version'])
+        except OSError:
+            raise RuntimeError("CMake must be installed to build the following extensions: " +
+                               ", ".join(e.name for e in self.extensions))
+
+        for ext in self.extensions:
+            self.build_extension(ext)
+
+    def build_extension(self, ext):
+        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
+        # required for auto-detection of auxiliary "native" libs
+        if not extdir.endswith(os.path.sep):
+            extdir += os.path.sep
+
+        cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
+                      '-DPYTHON_EXECUTABLE=' + sys.executable]
+
+        cfg = 'Debug' if self.debug else 'Release'
+        build_args = ['--config', cfg]
+
+        cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
+        # Add parallel build flag only on non-Windows platforms
+        # On Windows, MSBuild doesn't support -j flag and handles parallelization automatically
+        if sys.platform != 'win32':
+            build_args += ['--', '-j2']
+
+
+        env = os.environ.copy()
+        env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
+                                                          self.distribution.get_version())
+        if not os.path.exists(self.build_temp):
+            os.makedirs(self.build_temp)
+        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
+        subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
+
+# Try to read version, fallback to default
+version = "0.1.0"
+init_file = Path(__file__).parent / "python" / "hapc" / "__init__.py"
+if init_file.exists():
+    with open(init_file, "r") as f:
+        for line in f:
+            if line.startswith("__version__"):
+                version = line.split("=")[1].strip().strip('"').strip("'")
+                break
+
+# Try to read README
+readme_content = ""
+readme_file = Path(__file__).parent / "README.md"
+if readme_file.exists():
+    with open(readme_file, "r") as f:
+        readme_content = f.read()
+
+setup(
+    name="hapc",
+    version=version,
+    description="Highly Adaptive Principal Components",
+    long_description=readme_content,
+    long_description_content_type="text/markdown",
+    author="Carlos García Meixide",
+    author_email="cgmeixide@gmail.com",
+    url="https://github.com/meixide/hapc",
+    license="MIT",
+    packages=find_packages(where="python"),
+    package_dir={"": "python"},
+    ext_modules=[CMakeExtension('hapc/hapc_core', sourcedir=os.path.dirname(os.path.abspath(__file__)))],
+    cmdclass=dict(build_ext=CMakeBuild),
+    python_requires=">=3.8",
+    # Dependencies are defined in pyproject.toml [project.dependencies]
+    # install_requires is omitted here to avoid conflicts with pyproject.toml
+    include_package_data=True,
+    zip_safe=False,
+)

hapc-0.1.5/python/hapc.egg-info/top_level.txt

@@ -1 +0,0 @@
-hapc

hapc-0.1.5/setup.py

@@ -1,123 +0,0 @@
-"""Setup for HAPC package (root level for remote installation)."""
-
-from setuptools import setup, find_packages, Extension
-from setuptools.command.build_ext import build_ext
-import subprocess
-import sys
-import os
-from pathlib import Path
-
-class CMakeBuild(build_ext):
-    """Custom build using CMake."""
-    def run(self):
-        try:
-            subprocess.check_output(["cmake", "--version"])
-        except OSError:
-            raise RuntimeError("CMake is required to build hapc. Install with: pip install cmake")
-        
-        build_temp = Path(self.build_temp) / "cmake_build"
-        build_temp.mkdir(parents=True, exist_ok=True)
-        
-        project_root = Path(__file__).parent
-        
-        cmake_args = [
-            f"-DCMAKE_BUILD_TYPE=Release",
-            f"-DPYTHON_EXECUTABLE={sys.executable}",
-        ]
-        
-        subprocess.check_call(
-            ["cmake", str(project_root)] + cmake_args,
-            cwd=str(build_temp)
-        )
-        
-        subprocess.check_call(
-            ["cmake", "--build", ".", "--config", "Release"],
-            cwd=str(build_temp)
-        )
-        
-        # Copy library to package
-        lib_dir = project_root / "python" / "hapc"
-        lib_dir.mkdir(parents=True, exist_ok=True)
-        
-        import glob
-        import shutil
-        import time
-        
-        # Search recursively for the built library
-        # Try multiple patterns to ensure we find it on all platforms
-        search_patterns = [
-            os.path.join(str(build_temp), "**", "hapc_core.*"),
-            os.path.join(str(build_temp), "**", "*", "hapc_core.*"),
-            os.path.join(str(build_temp), "**", "*", "*", "hapc_core.*"),
-        ]
-        
-        found = False
-        for pattern in search_patterns:
-            for lib in glob.glob(pattern, recursive=True):
-                if lib.endswith(('.pyd', '.so', '.dylib')):
-                    try:
-                        dest = lib_dir / Path(lib).name
-                        # Retry on Windows if file is locked
-                        max_retries = 3
-                        for attempt in range(max_retries):
-                            try:
-                                shutil.copy2(lib, dest)
-                                print(f"[OK] Copied {lib} to {dest}")
-                                found = True
-                                break
-                            except (OSError, PermissionError) as e:
-                                if attempt < max_retries - 1:
-                                    time.sleep(0.5)
-                                else:
-                                    raise
-                        if found:
-                            break
-                    except Exception as e:
-                        print(f"Warning: Failed to copy {lib}: {e}")
-            if found:
-                break
-        
-        if not found:
-            print(f"ERROR: No compiled library found in build directory {build_temp}")
-            print(f"  Searched for: hapc_core.pyd (Windows), hapc_core.so (Linux), hapc_core.dylib (macOS)")
-            raise RuntimeError("Failed to locate compiled hapc_core extension")
-        
-        # Don't call parent run() to avoid setuptools trying to clean Windows locked files
-        # Just mark as complete
-        self.build_libs = []
-
-# Try to read version, fallback to default
-version = "0.1.0"
-init_file = Path(__file__).parent / "python" / "hapc" / "__init__.py"
-if init_file.exists():
-    with open(init_file, "r") as f:
-        for line in f:
-            if line.startswith("__version__"):
-                version = line.split("=")[1].strip().strip('"').strip("'")
-                break
-
-# Try to read README
-readme_content = ""
-readme_file = Path(__file__).parent / "README.md"
-if readme_file.exists():
-    with open(readme_file, "r") as f:
-        readme_content = f.read()
-
-setup(
-    name="hapc",
-    version=version,
-    description="Highly Adaptive Principal Components",
-    long_description=readme_content,
-    long_description_content_type="text/markdown",
-    author="Carlos García Meixide",
-    author_email="cgmeixide@gmail.com",
-    url="https://github.com/meixide/hapc",
-    license="MIT",
-    packages=find_packages(where="python"),
-    package_dir={"": "python"},
-    # Correctly name the extension to be part of the 'hapc' package
-    ext_modules=[Extension("hapc.hapc_core", [])],
-    cmdclass={"build_ext": CMakeBuild},
-    python_requires=">=3.8",
-    include_package_data=True,
-)