Started work on capture-only audio device, delegated asynchronous callbacks to the class to manage | Removed parakeetcpp since it was merged to master branch of whispercpp (see ggml-org/whisper.cpp#3735) | added cpm usage using FetchCPM.cmake to avoid the same dependency being fetched multiple times - Does cause problems with version-control, but this is the least I can do for now

Author: inonitz

CMakeLists.txt

@@ -8,29 +8,30 @@ else()
     set(STTSERVER_IS_TOP_LEVEL OFF)
 endif()
 
+include(cmake/FetchCPM.cmake)
 include(cmake/SubmoduleUpdate.cmake)
 include(cmake/UseCCache.cmake)
 include(cmake/ColouredOutput.cmake)
 include(cmake/OutputDir.cmake)
 include(cmake/WorkspaceOptions.cmake)
 include(cmake/BuildDiagnostics.cmake)
+include_cpm()
+
 
 # 1. Workspace/Project-Wide Specific Configurations
 enable_coloured_diagnostics_if_available()
 use_ccache_program_if_exists()
 define_aggregate_output_artifact_directory()
-
 update_submodules_on_cmake_configure("dependencies")
 
+
 # 2. Workspace/Project-Wide Options
-OPTION(STTSERVER_FORCE_COLOURED_OUTPUT             "Always produce ANSI-colored output (GNU/Clang only) (Platform Agnostic)"            ON)
 OPTION(STTSERVER_ENABLE_SANITIZER_ADDRESS          "Enable AddressSanitizer"                                                            OFF)
 OPTION(STTSERVER_ENABLE_SANITIZER_UNDEFINED        "Enable UndefinedBehaviorSanitizer"                                                  OFF)
 OPTION(STTSERVER_ENABLE_SANITIZER_MEMORY           "Enable MemorySanitizer"                                                             OFF)
 OPTION(STTSERVER_ENABLE_LINK_TIME_OPTIMIZATION     "Enable Link-Time/Interprocedural Optimization (LTO/IPO)"                            OFF)
 OPTION(STTSERVER_ENABLE_TRACY_PROFILING            "Enable Code-paths for the Tracy Profiler"                                           OFF)
 OPTION(STTSERVER_BUILD_LIBRARY_BACKEND_WHISPER     "Build the server with the master branch of https://github.com/ggml-org/whisper.cpp" OFF)
-OPTION(STTSERVER_BUILD_LIBRARY_BACKEND_PARAKEET    "Build the server with the feature-parakeet branch"                                  OFF)
 OPTION(STTSERVER_BUILD_LIBRARY_BACKEND_SHERPA_ONNX "Build the server with the sherpa-onnx"                                              OFF)
 OPTION(STTSERVER_BUILD_LIBRARY                     "Build The actual Speech-To-Text [ASR] Server"                                       OFF)
 
@@ -43,88 +44,59 @@ if(STTSERVER_ENABLE_SANITIZER_ADDRESS AND STTSERVER_ENABLE_SANITIZER_MEMORY)
     message(FATAL_ERROR "ASan and MSan are mutually exclusive. Please choose only one\n")
 endif()
 
-if(NOT STTSERVER_BUILD_LIBRARY_BACKEND_WHISPER 
-    AND 
-    NOT STTSERVER_BUILD_LIBRARY_BACKEND_PARAKEET 
-    AND 
-    NOT STTSERVER_BUILD_LIBRARY_BACKEND_SHERPA_ONNX
-)
+if(NOT STTSERVER_BUILD_LIBRARY_BACKEND_WHISPER AND NOT STTSERVER_BUILD_LIBRARY_BACKEND_SHERPA_ONNX)
     message(FATAL_ERROR "Must Select Atleast 1 Backend to build the project with")
 endif()
 
+
 # 3. Declare interface libraries - Sanitizer Interface Library depends on these
 declare_optional_interface_library_different_sanitizers()
 declare_optional_interface_library_lto()
 declare_optional_interface_default_project_configuration()
+enable_coloured_diagnostics_if_available()
 
-# 4. Process Actions related to the options above.
-# 4. Process Actions related to the options above.
-if(STTSERVER_FORCE_COLOURED_OUTPUT)
-    set(CMAKE_COLOR_DIAGNOSTICS ON)
-    enable_coloured_diagnostics_if_available()
-endif()
-
-if(STTSERVER_ENABLE_SANITIZER_ADDRESS)
-    add_link_options(STTSERVER_WORKSPACE_CONFIG::AddressSanitizerInterface)
-endif()
-
-if(STTSERVER_ENABLE_SANITIZER_UNDEFINED)
-    add_link_options(STTSERVER_WORKSPACE_CONFIG::UBSanInterface)
-endif()
-
-if(STTSERVER_ENABLE_SANITIZER_MEMORY)
-    add_link_options(STTSERVER_WORKSPACE_CONFIG::MemorySanitizerInterface)
-endif()
-
-if(STTSERVER_ENABLE_LINK_TIME_OPTIMIZATION)
-    add_link_options(STTSERVER_WORKSPACE_CONFIG::LTO)
-endif()
 
 # 5. Print Enabled/Disabled Flags For Verbose Diagnostics
-if(STTSERVER_BUILD_LIBRARY_BACKEND_WHISPER OR STTSERVER_BUILD_LIBRARY_BACKEND_PARAKEET)
+if(STTSERVER_BUILD_LIBRARY_BACKEND_WHISPER)
     setup_whisper_backend_defaults()
 endif()
+
 if(STTSERVER_BUILD_LIBRARY_BACKEND_SHERPA_ONNX)
     setup_sherpa_onnx_backend_defaults()
 endif()
+
 print_all_workspace_flags_and_vars()
 
 # 6. Actual Start
 if(STTSERVER_ENABLE_TRACY_PROFILING)
-    message(STATUS "[STTSERVER_ENABLE_TRACY_PROFILING] Building with Tracy for Profiling!")
-    set(TRACY_ENABLE  ON)
-    set(TRACY_VERBOSE ON)
-    add_subdirectory(dependencies/tracy)
+    safe_cpm_add_package(NAME tracy SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/tracy")
 endif()
-
 if(STTSERVER_BUILD_LIBRARY_BACKEND_WHISPER)
-    message(STATUS "[STTSERVER_BUILD_LIBRARY_BACKEND_WHISPER] Building with backend whisper.cpp (master branch)")
-    add_subdirectory(dependencies/whispercpp)
+    safe_cpm_add_package(NAME whispercpp SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/whispercpp")
 endif()
-
 if(STTSERVER_BUILD_LIBRARY_BACKEND_PARAKEET)
-    message(STATUS "[STTSERVER_BUILD_LIBRARY_BACKEND_PARAKEET] Building with backend whisper.cpp (parakeet feature-branch [dan-bev])")
-    add_subdirectory(dependencies/parakeetcpp)
+    safe_cpm_add_package(NAME parakeetcpp SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/parakeetcpp")
 endif()
-
 if(STTSERVER_BUILD_LIBRARY_BACKEND_SHERPA_ONNX)
-    message(STATUS "[STTSERVER_BUILD_LIBRARY_BACKEND_SHERPA_ONNX] Building with backend sherpa-onnx")
-    add_subdirectory(dependencies/sherpa-onnx)
+    safe_cpm_add_package(NAME sherpa-onnx SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/sherpa-onnx")
 endif()
 
-add_subdirectory(dependencies/cxxopts)
-add_subdirectory(dependencies/miniaudio)
-add_subdirectory(dependencies/util2)
+safe_cpm_add_package(NAME cxxopts   SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/cxxopts")
+safe_cpm_add_package(NAME miniaudio SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/miniaudio")
+safe_cpm_add_package(NAME util2     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/util2")
+
 
-if(STTSERVER_BUILD_LIBRARY)
+if(STTSERVER_BUILD_LIBRARY AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/sttserv")
     add_subdirectory(sttserv)
 endif()
 
 if(STTSERVER_BUILD_TESTS)
-    add_subdirectory(dependencies/googletest)
-    add_subdirectory(test)
+    safe_cpm_add_package(NAME googletest SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/googletest")
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test")
+        add_subdirectory(test)
+    endif()
 endif()
 
-if(STTSERVER_BUILD_BENCHMARKS)
+if(STTSERVER_BUILD_BENCHMARKS AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/benchmark")
     add_subdirectory(benchmark)
 endif()

benchmark/CMakeLists.txt

@@ -17,10 +17,11 @@ PROJECT_NAME="all"
 # For More options see BuildDiagnostics.cmake
 CMAKE_ARGLIST="\
     -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
-    -DSTTSERVER_BUILD_LIBRARY_BACKEND_PARAKEET=ON \
+    -DSTTSERVER_BUILD_LIBRARY_BACKEND_WHISPER=ON \
     -DSTTSERVER_BUILD_LIBRARY_BACKEND_SHERPA_ONNX=ON \
     -DSTTSERVER_BUILD_LIBRARY=ON \
-    -DSTTSERVER_BUILD_TESTS=ON \
+    -DSTTSERVER_BUILD_TESTS=ON
+    STTSERVER_BUILD_BENCHMARKS=OFF \
     -DCMAKE_POSITION_INDEPENDENT_CODE=ON
     "
 

build.sh

@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.16)
+
+
+macro(include_cpm)
+    set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM.cmake")
+    if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
+        message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
+        file(DOWNLOAD https://github.com/cpm-cmake/CPM.cmake/releases/latest/download/get_cpm.cmake ${CPM_DOWNLOAD_LOCATION})
+    endif()
+    include(${CPM_DOWNLOAD_LOCATION})
+endmacro()
+
+
+macro(safe_cpm_add_package)
+    set(options)
+    set(oneValueArgs NAME)
+    set(multiValueArgs)
+    # Parse the arguments to extract the NAME parameter
+    cmake_parse_arguments(SAFE_CPM "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+    if(NOT SAFE_CPM_NAME)
+        message(FATAL_ERROR "[SafeCPM] NAME argument is required.")
+    endif()
+
+    # Check both standard target and namespace alias
+    if(NOT TARGET ${SAFE_CPM_NAME} AND NOT TARGET ${SAFE_CPM_NAME}::${SAFE_CPM_NAME})
+        CPMAddPackage(${ARGN})
+    else()
+        message(WARNING "[SafeCPM] Target '${SAFE_CPM_NAME}' already exists. Skipping fetch.")
+    endif()
+endmacro()

cmake/FetchCPM.cmake

@@ -65,7 +65,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE
     cxx_std_17
 )
 target_link_libraries(${PROJECT_NAME} PUBLIC 
-    WORKSPACE_CONFIG::ProjectDefaultConfig
+    STTSERVER_WORKSPACE_CONFIG::ProjectDefaultConfig
     ${RUNTIME_BACKEND_LIBRARY_NAME}
     miniaudio
     UTIL2::util2