Skip to content

Commit

Permalink
Update CUDA Toolkit version to v0.2.15 in build workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
royshil committed May 29, 2024
1 parent 125a45c commit d344b84
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
- name: Install CUDA Toolkit
if: ${{ matrix.cublas != 'cpu' && matrix.cublas != 'clblast' }}
id: cuda-toolkit
uses: Jimver/[email protected].11
uses: Jimver/[email protected].15
with:
cuda: '${{ matrix.cublas }}'

Expand Down
9 changes: 3 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ option(WHISPERCPP_WITH_CLBLAST "Build Whisper with CLBlast support" OFF)

set(CMAKE_OSX_ARCHITECTURES_ "$ENV{MACOS_ARCH}")

set(Whispercpp_Build_GIT_TAG "v1.5.5")
set(Whispercpp_Build_GIT_TAG "v1.6.2")

if(${CMAKE_BUILD_TYPE} STREQUAL Release OR ${CMAKE_BUILD_TYPE} STREQUAL RelWithDebInfo)
set(Whispercpp_BUILD_TYPE Release)
Expand Down Expand Up @@ -105,7 +105,8 @@ if(WIN32)
set(OpenBLAS_DIR ${openblas_SOURCE_DIR})
message(STATUS "OpenBLAS_DIR: ${OpenBLAS_DIR}")
set(WHISPER_ADDITIONAL_ENV "OPENBLAS_PATH=${openblas_SOURCE_DIR}")
set(WHISPER_ADDITIONAL_CMAKE_ARGS -DWHISPER_BLAS=ON -DWHISPER_OPENBLAS=ON -DWHISPER_CUBLAS=OFF)
set(WHISPER_ADDITIONAL_CMAKE_ARGS -DWHISPER_BLAS=ON -DWHISPER_OPENBLAS=ON -DWHISPER_CUBLAS=OFF
-DWHISPER_CLBLAST=OFF)
endif()

ExternalProject_Add(
Expand All @@ -130,10 +131,6 @@ if(WIN32)
-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_} -DCMAKE_CXX_FLAGS=${WHISPER_EXTRA_CXX_FLAGS}
-DCMAKE_C_FLAGS=${WHISPER_EXTRA_CXX_FLAGS} -DBUILD_SHARED_LIBS=ON -DWHISPER_BUILD_TESTS=OFF
-DWHISPER_BUILD_EXAMPLES=OFF -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake ${WHISPER_ADDITIONAL_CMAKE_ARGS})

if(NOT WHISPERCPP_WITH_CUDA AND NOT WHISPERCPP_WITH_CLBLAST)
add_dependencies(Whispercpp_Build OpenBLAS)
endif()
else()
# On Linux and MacOS build a static Whisper library
ExternalProject_Add(
Expand Down

0 comments on commit d344b84

Please sign in to comment.