diff --git a/.github/workflows/macos-cpu-wheels.yml b/.github/workflows/macos-cpu-wheels.yml index 5cd97a6..50d8e7c 100644 --- a/.github/workflows/macos-cpu-wheels.yml +++ b/.github/workflows/macos-cpu-wheels.yml @@ -84,7 +84,7 @@ jobs: ls -lh ./wheelhouse/ - name: Upload Wheel - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: torch-${{ matrix.torch }}-python-${{ matrix.python-version }}-macos-latest-cpu path: wheelhouse/*.whl diff --git a/.github/workflows/run-tests-windows-cpu.yml b/.github/workflows/run-tests-windows-cpu.yml index 8d33247..d02568c 100644 --- a/.github/workflows/run-tests-windows-cpu.yml +++ b/.github/workflows/run-tests-windows-cpu.yml @@ -107,7 +107,7 @@ jobs: python3 -c "import kaldifeat; print(kaldifeat.__version__)" - name: Upload Wheel - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: python-${{ matrix.python-version }}-${{ matrix.os }}-cpu path: dist/*.whl diff --git a/.github/workflows/run-tests-windows-cuda.yml b/.github/workflows/run-tests-windows-cuda.yml index 9845b56..21cd46e 100644 --- a/.github/workflows/run-tests-windows-cuda.yml +++ b/.github/workflows/run-tests-windows-cuda.yml @@ -159,7 +159,7 @@ jobs: python3 -c "import kaldifeat; print(kaldifeat.__version__)" - name: Upload Wheel - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: python-${{ matrix.python-version }}-${{ matrix.os }}-cuda-${{ matrix.cuda }} path: dist/*.whl diff --git a/.github/workflows/ubuntu-cpu-wheels.yml b/.github/workflows/ubuntu-cpu-wheels.yml index b11c342..dd40dd2 100644 --- a/.github/workflows/ubuntu-cpu-wheels.yml +++ b/.github/workflows/ubuntu-cpu-wheels.yml @@ -73,7 +73,7 @@ jobs: ls -lh ./wheelhouse/ - name: Upload Wheel - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: torch-${{ matrix.torch }}-python-${{ matrix.python-version }}-ubuntu-latest-cpu path: wheelhouse/*.whl diff --git a/.github/workflows/ubuntu-cuda-wheels.yml b/.github/workflows/ubuntu-cuda-wheels.yml index 710e37e..bd4c006 100644 --- a/.github/workflows/ubuntu-cuda-wheels.yml +++ b/.github/workflows/ubuntu-cuda-wheels.yml @@ -3,7 +3,7 @@ name: build-wheels-cuda-ubuntu on: push: branches: - - fix-wheel-2 + - fix-cuda-12.6 tags: - '*' workflow_dispatch: @@ -75,6 +75,12 @@ jobs: python3 --version which python3 + ls -lh /opt/python/ + + echo "---" + + ls -lh /opt/python/*/bin + pushd /usr/local rm cuda ln -s cuda-$CUDA_VERSION cuda @@ -93,7 +99,7 @@ jobs: ls -lh ./wheelhouse/ - name: Upload Wheel - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: torch-${{ matrix.torch }}-python-${{ matrix.python-version }}-ubuntu-latest-cuda path: wheelhouse/*.whl diff --git a/.github/workflows/windows-x64-cpu-wheels.yml b/.github/workflows/windows-x64-cpu-wheels.yml index d2256c6..e9b12e1 100644 --- a/.github/workflows/windows-x64-cpu-wheels.yml +++ b/.github/workflows/windows-x64-cpu-wheels.yml @@ -63,7 +63,7 @@ jobs: ls -lh ./wheelhouse/ - name: Upload Wheel - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: torch-${{ matrix.torch }}-python-${{ matrix.python-version }}-windows-latest-cpu path: wheelhouse/*.whl diff --git a/scripts/github_actions/build-ubuntu-cuda.sh b/scripts/github_actions/build-ubuntu-cuda.sh index 5d0ae06..4f2451f 100755 --- a/scripts/github_actions/build-ubuntu-cuda.sh +++ b/scripts/github_actions/build-ubuntu-cuda.sh @@ -28,6 +28,7 @@ if [[ $TORCH_VERSION =~ 2.2.* && $CUDA_VERSION =~ 12.* ]]; then fi +if false; then yum -y install openssl-devel bzip2-devel libffi-devel xz-devel wget redhat-lsb-core @@ -61,6 +62,8 @@ export LD_LIBRARY_PATH=$PYTHON_INSTALL_DIR/lib:$LD_LIBRARY_PATH ls -lh $PYTHON_INSTALL_DIR ls -lh $PYTHON_INSTALL_DIR/lib/ +fi + python3 --version which python3 diff --git a/scripts/github_actions/generate_build_matrix.py b/scripts/github_actions/generate_build_matrix.py index b536158..4994da0 100755 --- a/scripts/github_actions/generate_build_matrix.py +++ b/scripts/github_actions/generate_build_matrix.py @@ -288,7 +288,8 @@ def generate_build_matrix(enable_cuda, for_windows, for_macos, test_only_latest_ "2.6.0": { "python-version": ["3.9", "3.10", "3.11", "3.12", "3.13"], "cuda": ( - ["11.8", "12.4", "12.6"] # default 12.4 + # ["11.8", "12.4", "12.6"] # default 12.4 + ["12.6"] # default 12.4 if not for_windows else ["11.8.0", "12.4.0", "12.6.0"] ), diff --git a/scripts/github_actions/install_torch.sh b/scripts/github_actions/install_torch.sh index 80de75a..b0cea34 100755 --- a/scripts/github_actions/install_torch.sh +++ b/scripts/github_actions/install_torch.sh @@ -280,4 +280,6 @@ else retry python3 -m pip install -q $package -f $url fi -rm -rfv ~/.cache/pip +python3 -m torch.utils.collect_env + +rm -rf ~/.cache/pip