Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi threading #201

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Multi threading #201

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
516b1b4
libsamplerate multi-thread (OpenMP) implementation
ss3git Sep 14, 2023
df1aaae
MT disable by default.
ss3git Sep 14, 2023
8c0f676
error handlings and small refactor
ss3git Sep 15, 2023
2799ec3
some more optimize
ss3git Sep 16, 2023
797a807
correct indentation
ss3git Sep 17, 2023
9c9959d
- Windows (MSVC) support
ss3git Nov 12, 2023
7c3ec94
ensure the number of threads actually used by omp to have the barrier…
ss3git Nov 14, 2023
58c7d5f
change threading strategy because overhead of allocating extra work b…
ss3git Nov 14, 2023
9bce93e
allow odd numbers of threads
ss3git Nov 16, 2023
6d3132a
format style
ss3git Nov 16, 2023
99d4396
fix for debug build
ss3git Nov 16, 2023
7348582
change WIN32 to MSVC for openmp build option switch
ss3git Nov 17, 2023
bd6aec3
cache once-calculated coeffs if src_ratio is integer
ss3git Nov 17, 2023
0738d4d
fix type and clarify zero
ss3git Nov 17, 2023
1c01a77
unnecessary (wrongly merged) cast removal
ss3git Nov 17, 2023
6d4abeb
change _WIN32 to _MSC_VER
ss3git Nov 18, 2023
c0aa879
loop termination condition fix
ss3git Dec 16, 2023
d509240
undo loop termination condition fix, and make the decision equivalent…
ss3git Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
cmake_minimum_required(VERSION 3.1..3.18)

if (BUILD_MULTI_THREADING)
set(MULTI_THREADING 1)
add_definitions(-DMULTI_THREADING)
endif()

# Policies

# Include file check macros honor CMAKE_REQUIRED_LIBRARIES, CMake >= 3.12
Expand Down
10 changes: 10 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ add_library(samplerate
# ALIAS to use if libsamplerate is included from other project with add_subdirectory()
add_library(SampleRate::samplerate ALIAS samplerate)

if(MULTI_THREADING)
if(WIN32)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we need to check MSVC variable. MinGW compiler probably will fail.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commit: 7348582

target_link_libraries(samplerate PRIVATE libomp)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp:llvm")
else()
target_link_libraries(samplerate PRIVATE omp)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
endif()
endif()

# CMake generates wrong DLL names for MinGW and Cygwin, fix it
if(BUILD_SHARED_LIBS AND WIN32)
if(LIBSAMPLERATE_COMPATIBLE_NAME)
Expand Down
Loading
Loading