From 9e4f9b9f2ec53f2aba8e1c806feb1a2f0f744b54 Mon Sep 17 00:00:00 2001 From: Sameeul Samee Date: Wed, 22 Jan 2025 21:15:29 -0500 Subject: [PATCH] Build arrow for linux wheels --- .github/workflows/build_cuda11_wheels.yml | 3 +-- .github/workflows/build_cuda12_wheels.yml | 3 +-- .github/workflows/build_wheels.yml | 3 +-- .github/workflows/publish_cuda11_pypi.yml | 3 +-- .github/workflows/publish_cuda12_pypi.yml | 3 +-- .github/workflows/publish_pypi.yml | 3 +-- ci-utils/install_prereq_linux.sh | 5 ++--- 7 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_cuda11_wheels.yml b/.github/workflows/build_cuda11_wheels.yml index 609d1a28..56bacbff 100644 --- a/.github/workflows/build_cuda11_wheels.yml +++ b/.github/workflows/build_cuda11_wheels.yml @@ -62,8 +62,7 @@ jobs: sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && yum install -y llvm libevent-devel openssl-devel && bash ci-utils/install_cuda_yum.sh 11 && - bash ci-utils/install_arrow_yum.sh && - bash ci-utils/install_prereq_linux.sh --build_arrow no && + bash ci-utils/install_prereq_linux.sh --build_arrow yes && mkdir -p /tmp/nyxus_bld && cp -r local_install /tmp/nyxus_bld CIBW_BEFORE_ALL_WINDOWS: nvcc -V && diff --git a/.github/workflows/build_cuda12_wheels.yml b/.github/workflows/build_cuda12_wheels.yml index 91e23747..1258d6c6 100644 --- a/.github/workflows/build_cuda12_wheels.yml +++ b/.github/workflows/build_cuda12_wheels.yml @@ -62,8 +62,7 @@ jobs: sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && yum install -y llvm libevent-devel openssl-devel && bash ci-utils/install_cuda_yum.sh 12 && - bash ci-utils/install_arrow_yum.sh && - bash ci-utils/install_prereq_linux.sh --build_arrow no && + bash ci-utils/install_prereq_linux.sh --build_arrow yes && mkdir -p /tmp/nyxus_bld && cp -r local_install /tmp/nyxus_bld CIBW_BEFORE_ALL_WINDOWS: nvcc -V && diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index f62b56af..bb97b762 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -50,8 +50,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 install -y llvm libevent-devel openssl-devel && - bash ci-utils/install_arrow_yum.sh && - bash ci-utils/install_prereq_linux.sh --build_arrow no && + bash ci-utils/install_prereq_linux.sh --build_arrow yes && mkdir -p /tmp/nyxus_bld && cp -r local_install /tmp/nyxus_bld CIBW_BEFORE_ALL_WINDOWS: ci-utils\install_prereq_win.bat && diff --git a/.github/workflows/publish_cuda11_pypi.yml b/.github/workflows/publish_cuda11_pypi.yml index 711a11f7..8e4cd5b6 100644 --- a/.github/workflows/publish_cuda11_pypi.yml +++ b/.github/workflows/publish_cuda11_pypi.yml @@ -64,8 +64,7 @@ jobs: sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && yum install -y llvm libevent-devel openssl-devel && bash ci-utils/install_cuda_yum.sh 11 && - bash ci-utils/install_arrow_yum.sh && - bash ci-utils/install_prereq_linux.sh --build_arrow no && + bash ci-utils/install_prereq_linux.sh --build_arrow yes && mkdir -p /tmp/nyxus_bld && cp -r local_install /tmp/nyxus_bld CIBW_BEFORE_ALL_WINDOWS: nvcc -V && diff --git a/.github/workflows/publish_cuda12_pypi.yml b/.github/workflows/publish_cuda12_pypi.yml index 20db04d0..f7e0055c 100644 --- a/.github/workflows/publish_cuda12_pypi.yml +++ b/.github/workflows/publish_cuda12_pypi.yml @@ -63,8 +63,7 @@ jobs: sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && yum install -y llvm libevent-devel openssl-devel && bash ci-utils/install_cuda_yum.sh 12 && - bash ci-utils/install_arrow_yum.sh && - bash ci-utils/install_prereq_linux.sh --build_arrow no && + bash ci-utils/install_prereq_linux.sh --build_arrow yes && mkdir -p /tmp/nyxus_bld && cp -r local_install /tmp/nyxus_bld CIBW_BEFORE_ALL_WINDOWS: nvcc -V && diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 385d0780..d94a8866 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -52,8 +52,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 install -y llvm libevent-devel openssl-devel && - bash ci-utils/install_arrow_yum.sh && - bash ci-utils/install_prereq_linux.sh --build_arrow no && + bash ci-utils/install_prereq_linux.sh --build_arrow yes && mkdir -p /tmp/nyxus_bld && cp -r local_install /tmp/nyxus_bld CIBW_BEFORE_ALL_WINDOWS: ci-utils\install_prereq_win.bat && diff --git a/ci-utils/install_prereq_linux.sh b/ci-utils/install_prereq_linux.sh index cb76a551..4d39251e 100755 --- a/ci-utils/install_prereq_linux.sh +++ b/ci-utils/install_prereq_linux.sh @@ -233,7 +233,7 @@ if [[ $BULD_DCMTK_DEP -eq 1 ]]; then cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../../"$LOCAL_INSTALL_DIR"/ -DCMAKE_PREFIX_PATH=../../"$LOCAL_INSTALL_DIR"/ -DFMJPEG2K="$ROOTDIR"/"$LOCAL_INSTALL_DIR"/ .. make install -j4 cd ../../ -fi +fis if [[ $BUILD_ARROW_DEP -eq 1 ]]; then @@ -245,8 +245,7 @@ if [[ $BUILD_ARROW_DEP -eq 1 ]]; then cd build cmake -DCMAKE_INSTALL_PREFIX=../../../"$LOCAL_INSTALL_DIR"/ \ -DCMAKE_PREFIX_PATH=../../../"$LOCAL_INSTALL_DIR"/ \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ + -DARROW_OPTIONAL_INSTALL=ON \ -DARROW_COMPUTE=ON \ -DARROW_CSV=ON \ -DARROW_DATASET=ON \