From f222c945ddfd30376742f49ea2cd7d7527f2e97b Mon Sep 17 00:00:00 2001 From: Victor Ung <161058892+vpung@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:04:39 -0700 Subject: [PATCH] Update numpy, scipy, OpenBLAS, and setuptools version (#296) * Update scipy/numpy version * update OpenBLAS version and remove pin on setuptools * bump QEMU simulator action version --- .github/build_pypi_wheel.sh | 11 +++-------- .github/workflows/pytest_aarch64.yml | 2 +- setup.py | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/build_pypi_wheel.sh b/.github/build_pypi_wheel.sh index bd32a321..25866c65 100755 --- a/.github/build_pypi_wheel.sh +++ b/.github/build_pypi_wheel.sh @@ -20,19 +20,14 @@ echo "pip: $($PIP --version)" # Install dependencies echo "Install dependencies..." -# Temporarily pin setuptools version due to a recent bug, which will be fix in their later updates -# See: https://github.com/pypa/setuptools/issues/3532 -# https://github.com/numpy/numpy/issues/22135 -$PIP install 'setuptools<=60.0.*' wheel twine auditwheel +$PIP install setuptools wheel twine auditwheel # Install OpenBLAS -# Using Numpy pre-build OpenBLAS lib v0.3.19 hosted on Anaconda +# Using pre-build OpenBLAS lib v0.3.27 hosted on Anaconda # Refer to: https://github.com/MacPython/openblas-libs # OpenBLAS64 is for ILP64, which is not our case -# Details see Numpy OpenBLAS downloader: -# https://github.com/numpy/numpy/blob/main/tools/openblas_support.py#L19 if [ "$PLAT" = "manylinux2014_x86_64" ] || [ "$PLAT" = "manylinux2014_aarch64" ]; then - OPENBLAS_VER="v0.3.19-22-g5188aede" + OPENBLAS_VER="v0.3.27" OPENBLAS_LIB="openblas-${OPENBLAS_VER}-${PLAT}.tar.gz" OPENBLAS_LIB_URL="https://anaconda.org/multibuild-wheels-staging/openblas-libs/$OPENBLAS_VER/download/$OPENBLAS_LIB" yum install wget -y diff --git a/.github/workflows/pytest_aarch64.yml b/.github/workflows/pytest_aarch64.yml index 96c7a591..1d43d8e5 100644 --- a/.github/workflows/pytest_aarch64.yml +++ b/.github/workflows/pytest_aarch64.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v1 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 with: platforms: all diff --git a/setup.py b/setup.py index 45cbd58b..07037f13 100644 --- a/setup.py +++ b/setup.py @@ -107,13 +107,13 @@ def get_blas_lib_dir(cls): # Requirements numpy_requires = [ 'numpy<1.20.0; python_version<"3.7"', # setup_requires needs correct version for <3.7 - 'numpy>=1.19.5; python_version>="3.7"' + 'numpy>=1.19.5,<2.0.0; python_version>="3.7"' ] setup_requires = numpy_requires + [ 'pytest-runner' ] install_requires = numpy_requires + [ - 'scipy>=1.4.1', + 'scipy>=1.4.1,<1.14.0', 'scikit-learn>=0.24.1', 'torch==1.13; python_version<"3.8"', 'torch>=2.0; python_version>="3.8"',