allow disabling hwloc

kahypar · Nov 29, 2024 · 9e5e1f0 · 9e5e1f0
1 parent 303d729
commit 9e5e1f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/python_build_ci.yml b/.github/workflows/python_build_ci.yml
@@ -34,7 +34,7 @@ jobs:
           CIBW_BUILD: cp3*-manylinux*
         run: |
           # run cmake to create pyproject.toml from pyproject.toml.in
-          cmake -B configure_python --preset=minimal -DKAHYPAR_SETUP_PYTHON=On -DKAHYPAR_TBB_DIR=$TBB_INSTALL_DIR
+          cmake -B configure_python --preset=minimal -DKAHYPAR_SETUP_PYTHON=On -DKAHYPAR_TBB_DIR=$TBB_INSTALL_DIR -DKAHYPAR_DISABLE_HWLOC=Off
           rm -rf configure_python
           python3 -m cibuildwheel --output-dir wheels
 
@@ -58,7 +58,7 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          brew install tbb boost hwloc pipx
+          brew install tbb boost pipx
 
       - name: Build Python Wheels
         env:
@@ -68,7 +68,7 @@ jobs:
           MACOSX_DEPLOYMENT_TARGET: 10.13
         run: |
           # run cmake to create pyproject.toml from pyproject.toml.in
-          cmake -B configure_python --preset=minimal -DKAHYPAR_SETUP_PYTHON=On -DKAHYPAR_TBB_DIR=$TBB_INSTALL_DIR
+          cmake -B configure_python --preset=minimal -DKAHYPAR_SETUP_PYTHON=On -DKAHYPAR_TBB_DIR=$TBB_INSTALL_DIR -DKAHYPAR_DISABLE_HWLOC=On
           rm -rf configure_python
           pipx run cibuildwheel --output-dir wheels
 

diff --git a/pyproject.toml.in b/pyproject.toml.in
@@ -32,6 +32,7 @@ cmake.args = [
     "-DKAHYPAR_DOWNLOAD_BOOST=ON",
     "-DKAHYPAR_DOWNLOAD_TBB=ON",
     "-DKAHYPAR_TBB_DIR=@KAHYPAR_TBB_DIR@",
+    "-DKAHYPAR_DISABLE_HWLOC=@KAHYPAR_DISABLE_HWLOC@",
 ]
 install.components = ["MtKaHyPar_Python"]
 
@@ -48,7 +49,6 @@ repair-wheel-command = """
 """
 
 [tool.cibuildwheel.macos]
-before-build = "brew install hwloc"
 repair-wheel-command = """
   export DYLD_LIBRARY_PATH="@KAHYPAR_TBB_DIR@:$DYLD_LIBRARY_PATH"
   delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}