mirror of
https://github.com/csukuangfj/kaldifeat.git
synced 2025-08-09 01:52:39 +00:00
Support torch 2.6.0 (#112)
This commit is contained in:
parent
c1aefb643e
commit
3f79fbbd6d
2
.github/workflows/windows-x64-cpu-wheels.yml
vendored
2
.github/workflows/windows-x64-cpu-wheels.yml
vendored
@ -50,7 +50,7 @@ jobs:
|
|||||||
# see https://cibuildwheel.readthedocs.io/en/stable/changelog/
|
# see https://cibuildwheel.readthedocs.io/en/stable/changelog/
|
||||||
# for a list of versions
|
# for a list of versions
|
||||||
- name: Build wheels
|
- name: Build wheels
|
||||||
uses: pypa/cibuildwheel@v2.16.5
|
uses: pypa/cibuildwheel@v2.22.0
|
||||||
env:
|
env:
|
||||||
CIBW_BEFORE_BUILD: pip install torch==${{ matrix.torch}}+cpu -f https://download.pytorch.org/whl/torch_stable.html cmake numpy || pip install torch==${{ matrix.torch}}+cpu -f https://download.pytorch.org/whl/torch/ cmake numpy
|
CIBW_BEFORE_BUILD: pip install torch==${{ matrix.torch}}+cpu -f https://download.pytorch.org/whl/torch_stable.html cmake numpy || pip install torch==${{ matrix.torch}}+cpu -f https://download.pytorch.org/whl/torch/ cmake numpy
|
||||||
CIBW_BUILD: ${{ matrix.python-version }}-win_amd64
|
CIBW_BUILD: ${{ matrix.python-version }}-win_amd64
|
||||||
|
@ -87,7 +87,7 @@ echo "Installing torch"
|
|||||||
# /Python-3.8.2/py-3.8/lib/python3.8/site-packages/torch/share/cmake/Torch/TorchConfig.cmake:68 (find_package)
|
# /Python-3.8.2/py-3.8/lib/python3.8/site-packages/torch/share/cmake/Torch/TorchConfig.cmake:68 (find_package)
|
||||||
# cmake/torch.cmake:14 (find_package)
|
# cmake/torch.cmake:14 (find_package)
|
||||||
# CMakeLists.txt:62 (include)
|
# CMakeLists.txt:62 (include)
|
||||||
sed -i.bak /9.0a/d /Python-*/py-3.*/lib/python3.*/site-packages/torch/share/cmake/Caffe2/Modules_CUDA_fix/upstream/FindCUDA/select_compute_arch.cmake
|
sed -i.bak /9.0a/d /Python-*/py-3.*/lib/python3.*/site-packages/torch/share/cmake/Caffe2/Modules_CUDA_fix/upstream/FindCUDA/select_compute_arch.cmake || true
|
||||||
|
|
||||||
rm -rf ~/.cache/pip >/dev/null 2>&1
|
rm -rf ~/.cache/pip >/dev/null 2>&1
|
||||||
yum clean all >/dev/null 2>&1
|
yum clean all >/dev/null 2>&1
|
||||||
|
@ -277,10 +277,18 @@ def generate_build_matrix(enable_cuda, for_windows, for_macos, test_only_latest_
|
|||||||
else ["11.8.0", "12.1.0", "12.4.0"]
|
else ["11.8.0", "12.1.0", "12.4.0"]
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
"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
|
||||||
|
if not for_windows
|
||||||
|
else ["11.8.0", "12.4.0", "12.6.0"]
|
||||||
|
),
|
||||||
|
},
|
||||||
# https://github.com/Jimver/cuda-toolkit/blob/master/src/links/windows-links.ts
|
# https://github.com/Jimver/cuda-toolkit/blob/master/src/links/windows-links.ts
|
||||||
}
|
}
|
||||||
if test_only_latest_torch:
|
if test_only_latest_torch:
|
||||||
latest = "2.5.0"
|
latest = "2.6.0"
|
||||||
matrix = {latest: matrix[latest]}
|
matrix = {latest: matrix[latest]}
|
||||||
|
|
||||||
if for_windows or for_macos:
|
if for_windows or for_macos:
|
||||||
|
@ -247,6 +247,23 @@ case ${torch} in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
2.6.*)
|
||||||
|
case ${cuda} in
|
||||||
|
11.8)
|
||||||
|
package="torch==${torch}+cu118"
|
||||||
|
# https://download.pytorch.org/whl/nightly/torch/
|
||||||
|
url=https://download.pytorch.org/whl/torch/
|
||||||
|
;;
|
||||||
|
12.4)
|
||||||
|
package="torch==${torch}+cu124"
|
||||||
|
url=https://download.pytorch.org/whl/torch/
|
||||||
|
;;
|
||||||
|
12.6)
|
||||||
|
package="torch==${torch}+cu126"
|
||||||
|
url=https://download.pytorch.org/whl/torch/
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Unsupported PyTorch version: ${torch}"
|
echo "Unsupported PyTorch version: ${torch}"
|
||||||
exit 1
|
exit 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user