mirrors/kaldifeat
1
0
Fork 0
mirror of https://github.com/csukuangfj/kaldifeat.git synced 2025-08-09 10:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support torch 2.1.2 (#89)

Browse Source
This commit is contained in:
Fangjun Kuang 2023-12-21 21:43:52 +08:00 committed by GitHub
parent f834ad861d
commit 4fd12b48b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/run-tests-macos-cpu.yml vendored
View File

@ -75,7 +75,7 @@ jobs:
run: | run: |
mkdir build_release mkdir build_release
cd build_release cd build_release
cmake .. cmake -DCMAKE_CXX_STANDARD=17 ..
make VERBOSE=1 -j3 make VERBOSE=1 -j3
- name: Run tests - name: Run tests

2
.github/workflows/run-tests-ubuntu-cpu.yml vendored
View File

@ -78,7 +78,7 @@ jobs:
run: | run: |
mkdir build_release mkdir build_release
cd build_release cd build_release
cmake .. cmake -DCMAKE_CXX_STANDARD=17 ..
make VERBOSE=1 -j3 make VERBOSE=1 -j3
- name: Run tests - name: Run tests

2
.github/workflows/run-tests-ubuntu-cuda.yml vendored
View File

@ -102,7 +102,7 @@ jobs:
run: | run: |
mkdir build_release mkdir build_release
cd build_release cd build_release
cmake .. cmake -DCMAKE_CXX_STANDARD=17 ..
make VERBOSE=1 -j3 make VERBOSE=1 -j3
- name: Run tests - name: Run tests

4
.github/workflows/run-tests-windows-cpu.yml vendored
View File

@ -90,7 +90,7 @@ jobs:
- name: Build kaldifeat - name: Build kaldifeat
run: | run: |
cd build_release cd build_release
cmake --build . --target _kaldifeat --config Release cmake --build -DCMAKE_CXX_STANDARD=17 . --target _kaldifeat --config Release
- name: Display generated files - name: Display generated files
shell: bash shell: bash
@ -116,6 +116,6 @@ jobs:
shell: bash shell: bash
run: | run: |
cd build_release cd build_release
cmake --build . --target ALL_BUILD --config Release cmake -DCMAKE_CXX_STANDARD=17 --build . --target ALL_BUILD --config Release
ls -lh bin/*/* ls -lh bin/*/*
ctest -C Release --verbose --output-on-failure ctest -C Release --verbose --output-on-failure

2
.github/workflows/run-tests-windows-cuda.yml vendored
View File

@ -168,6 +168,6 @@ jobs:
shell: bash shell: bash
run: | run: |
cd build_release cd build_release
cmake --build . --target ALL_BUILD --config Release cmake -DCMAKE_CXX_STANDARD=17 --build . --target ALL_BUILD --config Release
ls -lh bin/*/* ls -lh bin/*/*
ctest -C Release --verbose --output-on-failure ctest -C Release --verbose --output-on-failure

2
CMakeLists.txt
View File

@ -7,7 +7,7 @@ project(kaldifeat)
# remember to change the version in # remember to change the version in
# scripts/conda/kaldifeat/meta.yaml # scripts/conda/kaldifeat/meta.yaml
# scripts/conda-cpu/kaldifeat/meta.yaml # scripts/conda-cpu/kaldifeat/meta.yaml
set(kaldifeat_VERSION "1.25.3") set(kaldifeat_VERSION "1.25.4")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")

1
cmake/cmake_extension.py
View File

@ -76,6 +76,7 @@ class BuildExtension(build_ext):
extra_cmake_args += f" -DCMAKE_INSTALL_PREFIX={Path(self.build_lib).resolve()}/kaldifeat " # noqa extra_cmake_args += f" -DCMAKE_INSTALL_PREFIX={Path(self.build_lib).resolve()}/kaldifeat " # noqa
major, minor = get_pytorch_version().split(".")[:2] major, minor = get_pytorch_version().split(".")[:2]
print("major, minor", major, minor)
major = int(major) major = int(major)
minor = int(minor) minor = int(minor)
if major > 2 or (major == 2 and minor >= 1): if major > 2 or (major == 2 and minor >= 1):

2
scripts/conda-cpu/kaldifeat/meta.yaml
View File

@ -1,6 +1,6 @@
package: package:
name: kaldifeat name: kaldifeat
version: "1.25.3" version: "1.25.4"
source: source:
path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}" path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"

2
scripts/conda/kaldifeat/meta.yaml
View File

@ -1,6 +1,6 @@
package: package:
name: kaldifeat name: kaldifeat
version: "1.25.3" version: "1.25.4"
source: source:
path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}" path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"

8
scripts/github_actions/generate_build_matrix.py
View File

@ -159,10 +159,16 @@ def generate_build_matrix(enable_cuda, for_windows, for_macos, test_only_latest_
if not for_windows if not for_windows
else ["11.8.0", "12.1.0"], else ["11.8.0", "12.1.0"],
}, },
"2.1.2": {
"python-version": ["3.8", "3.9", "3.10", "3.11"],
"cuda": ["11.8", "12.1"] # default 12.1
if not for_windows
else ["11.8.0", "12.1.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.1.1" latest = "2.1.2"
matrix = {latest: matrix[latest]} matrix = {latest: matrix[latest]}
if for_windows or for_macos: if for_windows or for_macos: