Merge branch 'master' into suppress_tokens_re

.github/workflows/build.yml

@@ -152,21 +152,21 @@ jobs:
 
  ubuntu-22-cmake-sycl:
  runs-on: ubuntu-22.04
- 
+
  strategy:
  fail-fast: false
  matrix:
  dwhisper_sycl: [ON]
  dcmake_c_compiler: [icx]
- dcmake_cxx_compiler: [icpx] 
+ dcmake_cxx_compiler: [icpx]
  arch: [linux/amd64, linux/arm64, linux/arm/v7, linux/ppc64le]
 
  continue-on-error: true
 
  steps:
  - name: Clone
  uses: actions/checkout@v3
- 
+
  - name: add oneAPI to apt
  shell: bash
  run: |
@@ -190,7 +190,7 @@ jobs:
  - name: Clone
  id: checkout
  uses: actions/checkout@v3
- 
+
  - name: Build
  id: cmake_build
  run: |
@@ -202,21 +202,21 @@ jobs:
 
  ubuntu-22-cmake-sycl-fp16:
  runs-on: ubuntu-22.04
- 
+
  strategy:
  fail-fast: false
  matrix:
  dwhisper_sycl: [ON]
  dcmake_c_compiler: [icx]
- dcmake_cxx_compiler: [icpx] 
+ dcmake_cxx_compiler: [icpx]
  arch: [linux/amd64, linux/arm64, linux/arm/v7, linux/ppc64le]
 
  continue-on-error: true
 
  steps:
  - name: Clone
  uses: actions/checkout@v3
- 
+
  - name: add oneAPI to apt
  shell: bash
  run: |
@@ -240,7 +240,7 @@ jobs:
  - name: Clone
  id: checkout
  uses: actions/checkout@v3
- 
+
  - name: Build
  id: cmake_build
  run: |
@@ -249,7 +249,65 @@ jobs:
  cd build
  cmake -DWHISPER_SYCL_F16=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx ..
  cmake --build . --config Release -j $(nproc)
- 
+
+ windows-msys2:
+ runs-on: windows-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - { sys: UCRT64, env: ucrt-x86_64, build: Release }
+ - { sys: CLANG64, env: clang-x86_64, build: Release }
+
+ steps:
+ - name: Clone
+ uses: actions/checkout@v3
+
+ - name: Setup ${{ matrix.sys }}
+ uses: msys2/setup-msys2@v2
+ with:
+ update: true
+ msystem: ${{matrix.sys}}
+ install: >-
+ base-devel
+ mingw-w64-${{matrix.env}}-toolchain
+ mingw-w64-${{matrix.env}}-cmake
+ mingw-w64-${{matrix.env}}-SDL2
+ mingw-w64-${{matrix.env}}-openblas
+
+ - name: Build using make
+ shell: msys2 {0}
+ run: |
+ make -j $(nproc)
+
+ - name: Clean after building using make
+ shell: msys2 {0}
+ run: |
+ make clean
+
+ - name: Build using make w/ OpenBLAS
+ shell: msys2 {0}
+ run: |
+ make WHISPER_OPENBLAS=1 -j $(nproc)
+
+ - name: Build using CMake
+ shell: msys2 {0}
+ run: |
+ cmake -B build
+ cmake --build build --config ${{ matrix.build }} -j $(nproc)
+
+ - name: Clean after building using CMake
+ shell: msys2 {0}
+ run: |
+ rm -rf build
+
+ - name: Build using CMake w/ OpenBLAS
+ shell: msys2 {0}
+ run: |
+ cmake -B build -DWHISPER_OPENBLAS=ON
+ cmake --build build --config ${{ matrix.build }} -j $(nproc)
+
  windows:
  runs-on: windows-latest
 

CMakeLists.txt

@@ -74,7 +74,9 @@ else()
  option(WHISPER_BLAS "whisper: use BLAS libraries" OFF)
  option(WHISPER_BLAS_VENDOR "whisper: BLAS library vendor" Generic)
  option(WHISPER_OPENBLAS "whisper: prefer OpenBLAS" OFF)
- option(WHISPER_CUBLAS "whisper: support for cuBLAS" OFF)
+ option(WHISPER_OPENBLAS_INTERFACE64 "whisper: use OpenBLAS w/ 64-bit interface" OFF)
+ option(WHISPER_CUDA "whisper: support for CUDA" OFF)
+ option(WHISPER_CUBLAS "whisper: support for CUDA (deprecated)" OFF)
  option(WHISPER_HIPBLAS "whisper: support for hipBLAS" OFF)
  option(WHISPER_CLBLAST "whisper: use CLBlast" OFF)
  option(WHISPER_SYCL "whisper: use SYCL" OFF)
@@ -206,30 +208,82 @@ endif()
 if (WHISPER_OPENBLAS)
  set(WHISPER_BLAS_VENDOR "OpenBLAS")
  set(WHISPER_BLAS ON)
+ # BLA_PKGCONFIG_BLAS is supported since CMake 3.25.
+ # FindBLAS.cmake pkg-config logic seems incomplete, because when
+ # BLA_SIZEOF_INTEGER is 8, then it should search for blas64 instead of blas.
+ # blas.pc/blas64.pc are not always provided, so let's be more specific
+ # and go with openblas.pc/openblas64.pc if WHISPER_OPENBLAS is on.
+ if (WHISPER_OPENBLAS_INTERFACE64)
+ set(WHISPER_BLAS_LIB "openblas64")
+ else ()
+ set(WHISPER_BLAS_LIB "openblas")
+ endif ()
+ set(BLA_PKGCONFIG_BLAS ${WHISPER_BLAS_LIB})
+ # OpenBLAS prebuilt libraries for Windows do not have "64" suffix in filename.
+ # (But .pc file has "64" suffix in filename for USE_64BITINT=1 Windows build.)
+ if (MSVC)
+ set(WHISPER_BLAS_LIB "openblas")
+ endif ()
 endif()
 
 if (WHISPER_BLAS)
- if (WIN32)
- if(DEFINED ENV{OPENBLAS_PATH})
- set(BLAS_LIBRARIES $ENV{OPENBLAS_PATH}/lib/libopenblas.dll.a)
- message(STATUS "Libraries ${BLAS_LIBRARIES}")
- set(WHISPER_EXTRA_FLAGS ${WHISPER_EXTRA_FLAGS} -DGGML_USE_OPENBLAS)
- include_directories($ENV{OPENBLAS_PATH}/include)
- set(WHISPER_EXTRA_LIBS ${WHISPER_EXTRA_LIBS} ${BLAS_LIBRARIES})
+ if (NOT "$ENV{OPENBLAS_PATH}" STREQUAL "")
+ if (WHISPER_STATIC)
+ set(WHISPER_BLAS_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
+ set(WHISPER_BLAS_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
  else ()
- message(FATAL_ERROR "BLAS library was not found. Environment variable OPENBLAS_PATH not defined.")
+ if (CMAKE_IMPORT_LIBRARY_SUFFIX)
+ set(WHISPER_BLAS_LIB_PREFIX ${CMAKE_IMPORT_LIBRARY_PREFIX})
+ set(WHISPER_BLAS_LIB_SUFFIX ${CMAKE_IMPORT_LIBRARY_SUFFIX})
+ else ()
+ set(WHISPER_BLAS_LIB_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
+ set(WHISPER_BLAS_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+ endif ()
  endif ()
+ # OpenBLAS prebuilt libraries hardcode "lib" prefix in filename even on Windows
+ if (WHISPER_OPENBLAS)
+ set(WHISPER_BLAS_LIB_PREFIX "lib")
+ endif ()
+ message(STATUS "BLAS compatible library path provided")
+ set(BLAS_LIBRARIES "$ENV{OPENBLAS_PATH}/lib/${WHISPER_BLAS_LIB_PREFIX}${WHISPER_BLAS_LIB}${WHISPER_BLAS_LIB_SUFFIX}")
+ message(STATUS "Libraries ${BLAS_LIBRARIES}")
+ set(BLAS_INCLUDE_DIRS "$ENV{OPENBLAS_PATH}/include")
+ message(STATUS "Include dirs ${BLAS_INCLUDE_DIRS}")
+ if (NOT EXISTS "${BLAS_LIBRARIES}")
+ message(FATAL_ERROR "BLAS library was not found. Environment variable OPENBLAS_PATH misdefined.")
+ endif ()
+ set(WHISPER_EXTRA_FLAGS ${WHISPER_EXTRA_FLAGS} -DGGML_USE_OPENBLAS)
+ include_directories(${BLAS_INCLUDE_DIRS})
+ set(WHISPER_EXTRA_LIBS ${WHISPER_EXTRA_LIBS} ${BLAS_LIBRARIES})
  else ()
- set(BLA_STATIC 1)
+ if (WHISPER_STATIC)
+ # FindBLAS.cmake pkg-config logic seems incomplete, because when
+ # BLA_STATIC is on, then it should use pkg_check_modules_static
+ # instead of pkg_check_modules.
+ # Some manual variable overriding may be necessary if you don't
+ # achieve desired results.
+ set(BLA_STATIC 1)
+ endif ()
  set(BLA_VENDOR ${WHISPER_BLAS_VENDOR})
- set(BLA_SIZEOF_INTEGER 8)
+ if (WHISPER_OPENBLAS_INTERFACE64)
+ set(BLA_SIZEOF_INTEGER 8)
+ else ()
+ set(BLA_SIZEOF_INTEGER 4)
+ endif()
  set(BLA_PREFER_PKGCONFIG 1)
  find_package(BLAS)
 
  if(BLAS_FOUND)
  message(STATUS "BLAS compatible library found")
  message(STATUS "Libraries ${BLAS_LIBRARIES}")
- find_path(BLAS_INCLUDE_DIRS cblas.h /usr/include/openblas /usr/local/include/openblas $ENV{BLAS_HOME}/include)
+ if (NOT DEFINED BLAS_INCLUDE_DIRS)
+ if (PKGC_BLAS_FOUND)
+ set(BLAS_INCLUDE_DIRS "${PKGC_BLAS_INCLUDE_DIRS}")
+ else ()
+ find_path(BLAS_INCLUDE_DIRS cblas.h /usr/include/openblas)
+ endif()
+ endif()
+ message(STATUS "Include dirs ${BLAS_INCLUDE_DIRS}")
  set(WHISPER_EXTRA_FLAGS ${WHISPER_EXTRA_FLAGS} -DGGML_USE_OPENBLAS)
  include_directories(${BLAS_INCLUDE_DIRS})
  set(WHISPER_EXTRA_LIBS ${WHISPER_EXTRA_LIBS} ${BLAS_LIBRARIES})
@@ -240,6 +294,11 @@ if (WHISPER_BLAS)
 endif ()
 
 if (WHISPER_CUBLAS)
+ message(WARNING "WHISPER_CUBLAS is deprecated and will be removed in the future.\nUse WHISPER_CUDA instead")
+ set(WHISPER_CUDA ON)
+endif()
+
+if (WHISPER_CUDA)
  cmake_minimum_required(VERSION 3.17)
 
  find_package(CUDAToolkit)
@@ -249,9 +308,11 @@ if (WHISPER_CUBLAS)
 
  enable_language(CUDA)
 
- set(GGML_SOURCES_CUDA ggml-cuda.cu ggml-cuda.h)
+ file(GLOB GGML_SOURCES_CUDA "ggml-cuda/*.cu")
+ list(APPEND GGML_SOURCES_CUDA ggml-cuda.h)
+ list(APPEND GGML_SOURCES_CUDA ggml-cuda.cu)
 
- add_compile_definitions(GGML_USE_CUBLAS)
+ add_compile_definitions(GGML_USE_CUDA)
 
  if (WHISPER_STATIC)
  if (WIN32)
@@ -286,7 +347,7 @@ if (WHISPER_HIPBLAS)
 
  if (${hipblas_FOUND} AND ${hip_FOUND})
  message(STATUS "HIP and hipBLAS found")
- add_compile_definitions(GGML_USE_HIPBLAS GGML_USE_CUBLAS)
+ add_compile_definitions(GGML_USE_HIPBLAS GGML_USE_CUDA)
  add_library(ggml-rocm OBJECT ggml-cuda.cu ggml-cuda.h)
  set_property(TARGET ggml-rocm PROPERTY POSITION_INDEPENDENT_CODE ON)
  set_source_files_properties(ggml-cuda.cu PROPERTIES LANGUAGE CXX)