From 4fd12b48b8e514c844012bf3443664da721bbbfe Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Thu, 21 Dec 2023 21:43:52 +0800 Subject: [PATCH] Support torch 2.1.2 (#89) --- .github/workflows/run-tests-macos-cpu.yml | 2 +- .github/workflows/run-tests-ubuntu-cpu.yml | 2 +- .github/workflows/run-tests-ubuntu-cuda.yml | 2 +- .github/workflows/run-tests-windows-cpu.yml | 4 ++-- .github/workflows/run-tests-windows-cuda.yml | 2 +- CMakeLists.txt | 2 +- cmake/cmake_extension.py | 1 + scripts/conda-cpu/kaldifeat/meta.yaml | 2 +- scripts/conda/kaldifeat/meta.yaml | 2 +- scripts/github_actions/generate_build_matrix.py | 8 +++++++- 10 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/run-tests-macos-cpu.yml b/.github/workflows/run-tests-macos-cpu.yml index a61129d..02e3118 100644 --- a/.github/workflows/run-tests-macos-cpu.yml +++ b/.github/workflows/run-tests-macos-cpu.yml @@ -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 diff --git a/.github/workflows/run-tests-ubuntu-cpu.yml b/.github/workflows/run-tests-ubuntu-cpu.yml index 0e4cb73..baa9a03 100644 --- a/.github/workflows/run-tests-ubuntu-cpu.yml +++ b/.github/workflows/run-tests-ubuntu-cpu.yml @@ -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 diff --git a/.github/workflows/run-tests-ubuntu-cuda.yml b/.github/workflows/run-tests-ubuntu-cuda.yml index a168ec8..ec00213 100644 --- a/.github/workflows/run-tests-ubuntu-cuda.yml +++ b/.github/workflows/run-tests-ubuntu-cuda.yml @@ -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 diff --git a/.github/workflows/run-tests-windows-cpu.yml b/.github/workflows/run-tests-windows-cpu.yml index 4525bad..12cbf53 100644 --- a/.github/workflows/run-tests-windows-cpu.yml +++ b/.github/workflows/run-tests-windows-cpu.yml @@ -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 @@ -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 diff --git a/.github/workflows/run-tests-windows-cuda.yml b/.github/workflows/run-tests-windows-cuda.yml index 9220e12..db9d6b5 100644 --- a/.github/workflows/run-tests-windows-cuda.yml +++ b/.github/workflows/run-tests-windows-cuda.yml @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 214d369..d1e0789 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/cmake/cmake_extension.py b/cmake/cmake_extension.py index 819c0eb..ec82bf6 100644 --- a/cmake/cmake_extension.py +++ b/cmake/cmake_extension.py @@ -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): diff --git a/scripts/conda-cpu/kaldifeat/meta.yaml b/scripts/conda-cpu/kaldifeat/meta.yaml index 6ec0877..18167b9 100644 --- a/scripts/conda-cpu/kaldifeat/meta.yaml +++ b/scripts/conda-cpu/kaldifeat/meta.yaml @@ -1,6 +1,6 @@ package: name: kaldifeat - version: "1.25.3" + version: "1.25.4" source: path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}" diff --git a/scripts/conda/kaldifeat/meta.yaml b/scripts/conda/kaldifeat/meta.yaml index 9364472..2bb7afe 100644 --- a/scripts/conda/kaldifeat/meta.yaml +++ b/scripts/conda/kaldifeat/meta.yaml @@ -1,6 +1,6 @@ package: name: kaldifeat - version: "1.25.3" + version: "1.25.4" source: path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}" diff --git a/scripts/github_actions/generate_build_matrix.py b/scripts/github_actions/generate_build_matrix.py index 60fc06d..1c1ac2a 100755 --- a/scripts/github_actions/generate_build_matrix.py +++ b/scripts/github_actions/generate_build_matrix.py @@ -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: