Skip to content

Commit

Permalink
Support torch 2.1.2 (#89)
Browse files Browse the repository at this point in the history
  • Loading branch information
csukuangfj authored Dec 21, 2023
1 parent f834ad8 commit 4fd12b4
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-tests-macos-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
run: |
mkdir build_release
cd build_release
cmake ..
cmake -DCMAKE_CXX_STANDARD=17 ..
make VERBOSE=1 -j3
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-tests-ubuntu-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
run: |
mkdir build_release
cd build_release
cmake ..
cmake -DCMAKE_CXX_STANDARD=17 ..
make VERBOSE=1 -j3
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-tests-ubuntu-cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
run: |
mkdir build_release
cd build_release
cmake ..
cmake -DCMAKE_CXX_STANDARD=17 ..
make VERBOSE=1 -j3
- name: Run tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-tests-windows-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
- name: Build kaldifeat
run: |
cd build_release
cmake --build . --target _kaldifeat --config Release
cmake --build -DCMAKE_CXX_STANDARD=17 . --target _kaldifeat --config Release
- name: Display generated files
shell: bash
Expand All @@ -116,6 +116,6 @@ jobs:
shell: bash
run: |
cd build_release
cmake --build . --target ALL_BUILD --config Release
cmake -DCMAKE_CXX_STANDARD=17 --build . --target ALL_BUILD --config Release
ls -lh bin/*/*
ctest -C Release --verbose --output-on-failure
2 changes: 1 addition & 1 deletion .github/workflows/run-tests-windows-cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,6 @@ jobs:
shell: bash
run: |
cd build_release
cmake --build . --target ALL_BUILD --config Release
cmake -DCMAKE_CXX_STANDARD=17 --build . --target ALL_BUILD --config Release
ls -lh bin/*/*
ctest -C Release --verbose --output-on-failure
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ project(kaldifeat)
# remember to change the version in
# scripts/conda/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_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
Expand Down
1 change: 1 addition & 0 deletions cmake/cmake_extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def build_extension(self, ext: setuptools.extension.Extension):
extra_cmake_args += f" -DCMAKE_INSTALL_PREFIX={Path(self.build_lib).resolve()}/kaldifeat " # noqa

major, minor = get_pytorch_version().split(".")[:2]
print("major, minor", major, minor)
major = int(major)
minor = int(minor)
if major > 2 or (major == 2 and minor >= 1):
Expand Down
2 changes: 1 addition & 1 deletion scripts/conda-cpu/kaldifeat/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: kaldifeat
version: "1.25.3"
version: "1.25.4"

source:
path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/conda/kaldifeat/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: kaldifeat
version: "1.25.3"
version: "1.25.4"

source:
path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"
Expand Down
8 changes: 7 additions & 1 deletion scripts/github_actions/generate_build_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,16 @@ def generate_build_matrix(enable_cuda, for_windows, for_macos, test_only_latest_
if not for_windows
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
}
if test_only_latest_torch:
latest = "2.1.1"
latest = "2.1.2"
matrix = {latest: matrix[latest]}

if for_windows or for_macos:
Expand Down

0 comments on commit 4fd12b4

Please sign in to comment.