update build instuctions

PolusAI · Jan 18, 2025 · 32170c5 · 32170c5
1 parent 352b39e
commit 32170c5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
@@ -76,7 +76,7 @@ jobs:
                                    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo &&
                                    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && 
                                    yum -y install maven java
-          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0
+          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0 setuptools
           CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v
 
       - name: Install Dependencies
@@ -120,7 +120,7 @@ jobs:
           CIBW_BUILD: ${{ matrix.cibw_build }}
           CIBW_BUILD_VERBOSITY: 3
           CIBW_ARCHS_MACOS: arm64
-          CIBW_BEFORE_ALL_MACOS:  brew install nasm libjpeg-turbo &&
+          CIBW_BEFORE_ALL_MACOS:  brew install nasm &&
                                   brew install llvm@16 && 
                                   sudo xcode-select -s /Applications/Xcode_14.2.app &&
                                   bash ci-utils/install_prereq_linux.sh &&
@@ -130,7 +130,7 @@ jobs:
           CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/argolid_bld/local_install/lib:/tmp/argolid_bld/local_install/lib64" ON_GITHUB="TRUE" ARGOLID_DEP_DIR="/tmp/argolid_bld/local_install" CMAKE_ARGS="-DTENSORSTORE_USE_SYSTEM_JPEG=ON"
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0
+          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0 setuptools
           CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v
 
       - name: Install Dependencies

diff --git a/.github/workflows/wheel_build.yml b/.github/workflows/wheel_build.yml
@@ -74,7 +74,7 @@ jobs:
                                    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo &&
                                    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && 
                                    yum -y install maven java
-          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0
+          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0 setuptools
           CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v
 
       - name: Upload Artifact
@@ -115,7 +115,7 @@ jobs:
           CIBW_BUILD: ${{ matrix.cibw_build }}
           CIBW_BUILD_VERBOSITY: 3
           CIBW_ARCHS_MACOS: arm64
-          CIBW_BEFORE_ALL_MACOS:  brew install nasm libjpeg-turbo &&
+          CIBW_BEFORE_ALL_MACOS:  brew install nasm &&
                                   brew install llvm@16 && 
                                   sudo xcode-select -s /Applications/Xcode_14.2.app &&
                                   bash ci-utils/install_prereq_linux.sh &&
@@ -125,7 +125,7 @@ jobs:
           CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/argolid_bld/local_install/lib:/tmp/argolid_bld/local_install/lib64" ON_GITHUB="TRUE" ARGOLID_DEP_DIR="/tmp/argolid_bld/local_install" CMAKE_ARGS="-DTENSORSTORE_USE_SYSTEM_JPEG=ON"
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
-          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0
+          CIBW_TEST_REQUIRES: bfio tensorstore numpy==1.24.0 setuptools
           CIBW_TEST_COMMAND: python -W default -m unittest discover -s {project}/tests -v
 
       - name: Upload Artifact

diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh
@@ -30,4 +30,15 @@ mkdir build_man
 cd build_man
 cmake -DCMAKE_INSTALL_PREFIX=../../$LOCAL_INSTALL_DIR/  -DPYBIND11_TEST=OFF ..
 make install -j4
-cd ../../
+cd ../../
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+      curl -L https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.1.0.zip -o 3.1.0.zip
+      unzip 3.1.0.zip
+      cd libjpeg-turbo-3.1.0
+      mkdir build_man
+      cd build_man
+      cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_STATIC=FALSE -DCMAKE_BUILD_TYPE=Release ..
+      make install -j4
+      cd ../../
+fi