From 7e30b6bfaf91aaa730a198c657488dca7ceddaba Mon Sep 17 00:00:00 2001 From: Roy Shilkrot Date: Mon, 1 Apr 2024 21:49:18 -0400 Subject: [PATCH] Remove CUDA Toolkit installation and curl submodule --- .github/workflows/build-project.yaml | 14 -------------- .gitmodules | 3 --- cmake/BuildWhispercpp.cmake | 2 +- cmake/common/buildspec_common.cmake | 7 ------- vendor/curl | 1 - 5 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 .gitmodules delete mode 160000 vendor/curl diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml index d554e05..cdb1a33 100644 --- a/.github/workflows/build-project.yaml +++ b/.github/workflows/build-project.yaml @@ -237,20 +237,6 @@ jobs: submodules: recursive fetch-depth: 0 - - name: Install CUDA Toolkit - if: ${{ matrix.cublas != 'cpu' }} - id: cuda-toolkit - uses: Jimver/cuda-toolkit@v0.2.11 - with: - cuda: '${{ matrix.cublas }}' - - - name: Set CUDA_TOOLKIT_ROOT_DIR if CUDA is installed - if: ${{ matrix.cublas != 'cpu' }} - run: | - ls "$env:CUDA_PATH\bin" - ls -d 2 "$env:CUDA_PATH\lib" - "CUDA_TOOLKIT_ROOT_DIR=$env:CUDA_PATH" >> $env:GITHUB_ENV - - name: Set Up Environment 🔧 id: setup run: | diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3c6156a..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vendor/curl"] - path = vendor/curl - url = https://github.com/curl/curl.git diff --git a/cmake/BuildWhispercpp.cmake b/cmake/BuildWhispercpp.cmake index 4a9d3b2..e54a75b 100644 --- a/cmake/BuildWhispercpp.cmake +++ b/cmake/BuildWhispercpp.cmake @@ -137,7 +137,7 @@ endif() add_library(Whispercpp INTERFACE) add_dependencies(Whispercpp Whispercpp_Build) target_link_libraries(Whispercpp INTERFACE Whispercpp::Whisper) -if(WIN32 AND $ENV{CPU_OR_CUDA} STREQUAL "cpu") +if(WIN32 AND "$ENV{CPU_OR_CUDA}" STREQUAL "cpu") target_link_libraries(Whispercpp INTERFACE Whispercpp::OpenBLAS) endif() if(APPLE) diff --git a/cmake/common/buildspec_common.cmake b/cmake/common/buildspec_common.cmake index d0f43c7..b2c2414 100644 --- a/cmake/common/buildspec_common.cmake +++ b/cmake/common/buildspec_common.cmake @@ -73,13 +73,6 @@ function(_setup_obs_studio) set(_cmake_version "3.0.0") endif() - message(STATUS "Patch libobs") - execute_process( - COMMAND patch --forward "libobs/CMakeLists.txt" "${CMAKE_CURRENT_SOURCE_DIR}/patch_libobs.diff" - RESULT_VARIABLE _process_result - WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}") - message(STATUS "Patch - done") - message(STATUS "Configure ${label} (${arch})") execute_process( COMMAND diff --git a/vendor/curl b/vendor/curl deleted file mode 160000 index 98044e8..0000000 --- a/vendor/curl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 98044e81705dc24a56daaf3544f30c13f0fc3a31