Skip to content

Commit 2dfaad6

Browse files
committed
Update submodule thread_pool
1 parent 447450d commit 2dfaad6

5 files changed

Lines changed: 6 additions & 9 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -march=native")
1111
set(CMAKE_CXX_STANDARD 11)
1212
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1313
set(CMAKE_CXX_EXTENSIONS OFF)
14-
set(THREADS_PREFER_PTHREAD_FLAG ON)
15-
16-
find_package(Threads REQUIRED)
1714

1815
add_executable(sword
1916
src/chain.cpp
@@ -35,6 +32,6 @@ if (NOT TARGET thread_pool)
3532
add_subdirectory(vendor/thread_pool EXCLUDE_FROM_ALL)
3633
endif()
3734

38-
target_link_libraries(sword thread_pool Threads::Threads)
35+
target_link_libraries(sword thread_pool)
3936

4037
install(TARGETS sword DESTINATION ${CMAKE_INSTALL_BINDIR})

src/database_alignment.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ void alignDatabase(std::vector<AlignmentSet>& dst, AlignmentType algorithm_,
232232
std::vector<std::future<void>> thread_futures;
233233

234234
for (uint32_t i = 0; i < queries.size(); ++i) {
235-
thread_futures.emplace_back(thread_pool->submit_task(scoreChains,
235+
thread_futures.emplace_back(thread_pool->submit(scoreChains,
236236
std::ref(dst[i]), std::ref(queries[i]), std::ref(indexes[i]),
237237
std::ref(database), database_start, algorithm, max_evalue,
238238
evalue_params, max_alignments, scorer));
@@ -269,7 +269,7 @@ void alignDatabase(std::vector<AlignmentSet>& dst, AlignmentType algorithm_,
269269
std::vector<std::future<void>> thread_futures;
270270

271271
for (uint32_t i = 0; i < queries.size(); ++i) {
272-
thread_futures.emplace_back(thread_pool->submit_task(alignChains,
272+
thread_futures.emplace_back(thread_pool->submit(alignChains,
273273
std::ref(dst[i]), std::ref(queries[i]), std::ref(database),
274274
algorithm, scorer));
275275
}

src/database_search.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ uint64_t searchDatabase(Indexes& dst, const std::string& database_path,
312312
std::vector<std::future<void>> thread_futures;
313313

314314
for (uint32_t i = 0; i < tasks.size() - 1; ++i) {
315-
thread_futures.emplace_back(thread_pool->submit_task(scoreChains,
315+
thread_futures.emplace_back(thread_pool->submit(scoreChains,
316316
std::ref(entries), std::ref(entry_mutexes), max_candidates,
317317
std::ref(queries), std::ref(database_part), tasks[i],
318318
tasks[i + 1], kmers));

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "database_alignment.hpp"
1414
#include "utils.hpp"
1515

16-
static const char* version = "v1.0.2";
16+
static const char* version = "v1.0.3";
1717

1818
static struct option options[] = {
1919
{"query", required_argument, 0, 'i'},

0 commit comments

Comments
 (0)