small fixes

This commit is contained in:
Fangjun Kuang 2024-02-10 20:26:56 +08:00
parent 02f4d69c9d
commit 8d0bb4d8c4
4 changed files with 31 additions and 11 deletions

View File

@ -28,12 +28,15 @@ jobs:
# outputting for debugging purposes # outputting for debugging purposes
python ./scripts/github_actions/generate_build_matrix.py --for-macos python ./scripts/github_actions/generate_build_matrix.py --for-macos
MATRIX=$(python ./scripts/github_actions/generate_build_matrix.py --for-macos) MATRIX=$(python ./scripts/github_actions/generate_build_matrix.py --for-macos)
#
# python ./scripts/github_actions/generate_build_matrix.py --for-macos --test-only-latest-torch
# MATRIX=$(python ./scripts/github_actions/generate_build_matrix.py --for-macos --test-only-latest-torch)
echo "::set-output name=matrix::${MATRIX}" echo "::set-output name=matrix::${MATRIX}"
build_wheels_macos_cpu: build_wheels_macos_cpu:
needs: generate_build_matrix needs: generate_build_matrix
name: ${{ matrix.torch }} ${{ matrix.python-version }} name: ${{ matrix.torch }} ${{ matrix.python-version }}
runs-on: macos-11 runs-on: macos-latest
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -44,15 +47,22 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
# see https://cibuildwheel.readthedocs.io/en/stable/changelog/ - name: Setup Python
# for a list of versions uses: actions/setup-python@v2
- name: Build wheels with:
uses: pypa/cibuildwheel@v2.11.4 python-version: ${{ matrix.python-version }}
env:
CIBW_BEFORE_BUILD: pip install torch==${{ matrix.torch}} cmake numpy - name: Install dependencies
CIBW_BUILD: ${{ matrix.python-version }}-* shell: bash
CIBW_REPAIR_WHEEL_COMMAND_MACOS: "" run: |
CIBW_BUILD_VERBOSITY: 3 pip install -q torch==${{ matrix.torch}} cmake numpy wheel twine setuptools
- name: Build wheel
shell: bash
run: |
python3 setup.py bdist_wheel
mkdir wheelhouse
cp -v dist/* wheelhouse
- name: Display wheels - name: Display wheels
shell: bash shell: bash

View File

@ -28,6 +28,9 @@ jobs:
# outputting for debugging purposes # outputting for debugging purposes
python ./scripts/github_actions/generate_build_matrix.py --enable-cuda python ./scripts/github_actions/generate_build_matrix.py --enable-cuda
MATRIX=$(python ./scripts/github_actions/generate_build_matrix.py --enable-cuda) MATRIX=$(python ./scripts/github_actions/generate_build_matrix.py --enable-cuda)
# python ./scripts/github_actions/generate_build_matrix.py --enable-cuda --test-only-latest-torch
# MATRIX=$(python ./scripts/github_actions/generate_build_matrix.py --enable-cuda --test-only-latest-torch)
echo "::set-output name=matrix::${MATRIX}" echo "::set-output name=matrix::${MATRIX}"
build-manylinux-wheels: build-manylinux-wheels:

View File

@ -22,6 +22,11 @@ if [ -z $CUDA_VERSION ]; then
exit 1 exit 1
fi fi
if [[ $TORCH_VERSION =~ 2.2.* && $CUDA_VERSION =~ 12.* ]]; then
# see https://github.com/pytorch/pytorch/issues/113948
export TORCH_CUDA_ARCH_LIST="8.0 8.6 8.9 9.0"
fi
yum -y install openssl-devel bzip2-devel libffi-devel xz-devel wget redhat-lsb-core yum -y install openssl-devel bzip2-devel libffi-devel xz-devel wget redhat-lsb-core

View File

@ -211,9 +211,11 @@ def generate_build_matrix(enable_cuda, for_windows, for_macos, test_only_latest_
if p in excluded_python_versions: if p in excluded_python_versions:
continue continue
if for_windows or for_macos: if for_windows:
p = "cp" + "".join(p.split(".")) p = "cp" + "".join(p.split("."))
ans.append({"torch": torch, "python-version": p}) ans.append({"torch": torch, "python-version": p})
elif for_macos:
ans.append({"torch": torch, "python-version": p})
else: else:
ans.append( ans.append(
{ {