Skip to content

Commit

Permalink
Update numpy, scipy, OpenBLAS, and setuptools version (amzn#296)
Browse files Browse the repository at this point in the history
* Update scipy/numpy version

* update OpenBLAS version and remove pin on setuptools

* bump QEMU simulator action version
  • Loading branch information
vpung authored Aug 10, 2024
1 parent ca1a91b commit f222c94
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
11 changes: 3 additions & 8 deletions .github/build_pypi_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest_aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"',
Expand Down

0 comments on commit f222c94

Please sign in to comment.