From 50cc6f64899d6a4a385cc133c13a2e72a2207209 Mon Sep 17 00:00:00 2001 From: Adam Leggett Date: Tue, 15 Oct 2024 13:40:28 +0100 Subject: [PATCH 1/4] Upgraded CMake, GTest versions and added condition for download of models --- .gitignore | 4 ++++ CMakeLists.txt | 7 +++++-- cmake/add_googletest.cmake | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 86fb33d..2ad3368 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ build docs/build + +# Ignore CLion files +cmake-build-debug +.idea \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e4da6c..5b129e8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,11 @@ -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.28.1) project(spleeter++) set(CMAKE_CXX_STANDARD 14) option(spleeter_enable_tests "Enable unit tests" ON) +option(spleeter_download_models "Download the models from the spleeter repository" ON) option(spleeter_regenerate_models "Build the models from deezer/spleeter repository (requires conda)" OFF) option(spleeter_enable_filter "Enable the filter interface (for online processing)" ON) option(spleeter_enable_high_resolution "Process the spectrum up the 16KHz" OFF) @@ -36,7 +37,9 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") if (${spleeter_regenerate_models}) include(add_spleeter) else() - include(add_spleeter_models) + if(${spleeter_download_models}) + include(add_spleeter_models) + endif() endif() include(add_eigen) include(add_tensorflow) diff --git a/cmake/add_googletest.cmake b/cmake/add_googletest.cmake index 60ae0d9..c6261fa 100644 --- a/cmake/add_googletest.cmake +++ b/cmake/add_googletest.cmake @@ -3,7 +3,8 @@ include(FetchContent) FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.8.0 + #GIT_TAG release-1.8.0 + GIT_TAG v1.14.0 ) FetchContent_GetProperties(googletest) From 7fdef77be5bc6f27d6800ab3177e776d3d803471 Mon Sep 17 00:00:00 2001 From: Joe Loftus <152509645+joeloftusdev@users.noreply.github.com> Date: Sun, 5 Jan 2025 19:11:54 +0000 Subject: [PATCH 2/4] Update circular_frame_buffer.h Add cstdint for class CircularFrameBuffer on Linux --- src/artff/buffer/circular_frame_buffer.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/artff/buffer/circular_frame_buffer.h b/src/artff/buffer/circular_frame_buffer.h index 53c0f5c..77cb9a5 100644 --- a/src/artff/buffer/circular_frame_buffer.h +++ b/src/artff/buffer/circular_frame_buffer.h @@ -4,6 +4,10 @@ #include #include +#ifdef __linux__ +#include +#endif + namespace artff { class CircularFrameBuffer { public: From 5ffa9e7b11c3e4d627a9a41fded210024447e639 Mon Sep 17 00:00:00 2001 From: Joe Loftus <152509645+joeloftusdev@users.noreply.github.com> Date: Thu, 9 Jan 2025 13:05:17 +0000 Subject: [PATCH 3/4] Update circular_frame_buffer.h --- src/artff/buffer/circular_frame_buffer.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/artff/buffer/circular_frame_buffer.h b/src/artff/buffer/circular_frame_buffer.h index 77cb9a5..e1534db 100644 --- a/src/artff/buffer/circular_frame_buffer.h +++ b/src/artff/buffer/circular_frame_buffer.h @@ -4,9 +4,7 @@ #include #include -#ifdef __linux__ -#include -#endif + namespace artff { class CircularFrameBuffer { From 883302e3f1394d36fd275ddb2a4ed765dc213669 Mon Sep 17 00:00:00 2001 From: Joe Loftus <152509645+joeloftusdev@users.noreply.github.com> Date: Thu, 9 Jan 2025 13:05:42 +0000 Subject: [PATCH 4/4] Update circular_frame_buffer.h --- src/artff/buffer/circular_frame_buffer.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/artff/buffer/circular_frame_buffer.h b/src/artff/buffer/circular_frame_buffer.h index e1534db..77cb9a5 100644 --- a/src/artff/buffer/circular_frame_buffer.h +++ b/src/artff/buffer/circular_frame_buffer.h @@ -4,7 +4,9 @@ #include #include - +#ifdef __linux__ +#include +#endif namespace artff { class CircularFrameBuffer {