Minor fixes.

This commit is contained in:
Fangjun Kuang 2022-06-03 17:40:35 +08:00
parent 1f4d4c7e43
commit 1b9c2a21e1
2 changed files with 24 additions and 5 deletions

View File

@ -19,7 +19,7 @@ name: Nightly tests windows pip cuda
on:
push:
branches:
- nightly-test-2
- nightly-test
schedule:
# minute (0-59)
@ -44,8 +44,8 @@ jobs:
id: set-matrix
run: |
# outputting for debugging purposes
python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows
MATRIX=$(python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows)
python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows --test-only-latest-torch
MATRIX=$(python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows --test-only-latest-torch)
echo "::set-output name=matrix::${MATRIX}"
run_nightly_tests_windows_pip_cuda:
@ -75,7 +75,7 @@ jobs:
# See https://github.com/Jimver/cuda-toolkit/blob/master/src/links/windows-links.ts
# for available CUDA versions
- uses: Jimver/cuda-toolkit@v0.2.5
- uses: Jimver/cuda-toolkit@v0.2.7
id: cuda-toolkit
with:
cuda: ${{ matrix.cuda }}
@ -86,6 +86,21 @@ jobs:
echo "Cuda install location: ${{steps.cuda-toolkit.outputs.CUDA_PATH}}"
nvcc --version
- name: Download cuDNN
shell: bash
run: |
GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/cudnn-for-windows
cd cudnn-for-windows
git lfs pull --include="cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip"
unzip cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip
ls -lh *
ls -lh */*
cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive
sed -i '59i#define CUDNN_MAJOR 8' cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive/include/cudnn.h
echo "PWD: $PWD"
- name: Install PyTorch ${{ matrix.torch }}
shell: bash
run: |
@ -105,6 +120,7 @@ jobs:
- name: Install from PyPI
shell: bash
run: |
export KALDIFEAT_CMAKE_ARGS="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCUDNN_INCLUDE_PATH=/d/a/kaldifeat/kaldifeat/cudnn-for-windows/cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive/include -DCUDNN_LIBRARY_PATH=/d/a/kaldifeat/kaldifeat/cudnn-for-windows/cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive/lib/cudnn.lib"
export KALDIFEAT_MAKE_ARGS="-j 3"
pip install --verbose kaldifeat

View File

@ -94,8 +94,9 @@ jobs:
ls -lh *
ls -lh */*
echo "PWD: $PWD"
sed -i '59i#define CUDNN_MAJOR 8' cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive/include/cudnn.h
echo "PWD: $PWD"
- name: Install PyTorch ${{ matrix.torch }}
shell: bash
@ -130,6 +131,7 @@ jobs:
ls -lh
- name: Build kaldifeat
shell: bash
run: |
cd build_release
cmake --build . --target _kaldifeat --config Release
@ -143,6 +145,7 @@ jobs:
- name: Build wheel
shell: bash
run: |
export KALDIFEAT_CMAKE_ARGS="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCUDNN_INCLUDE_PATH=/d/a/kaldifeat/kaldifeat/cudnn-for-windows/cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive/include -DCUDNN_LIBRARY_PATH=/d/a/kaldifeat/kaldifeat/cudnn-for-windows/cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive/lib/cudnn.lib"
python3 setup.py bdist_wheel
ls -lh dist/
pip install ./dist/*.whl