diff --git a/CMakeLists.txt b/CMakeLists.txt index 037beb0..d05f601 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,7 @@ include( "${CMAKE_CURRENT_LIST_DIR}/tools/cmake/DownloadDependency.cmake" ) # These are replaced by tools/cmake/update_dependencies.sh to the hashes that are currently checked out. # Thus, do not replace the hashes manually! SET( CLI11_COMMIT_HASH "5cb3efabce007c3a0230e4cc2e27da491c646b6c" ) #CLI11_COMMIT_HASH# -SET( genesis_COMMIT_HASH "76b24dde721eacea3ec8186dd7a9a79915011dd6" ) #genesis_COMMIT_HASH# +SET( genesis_COMMIT_HASH "ca0afb161a540ce2eebda24e3f511cde86dbeaf0" ) #genesis_COMMIT_HASH# # Call the github download function, which takes four arguments: # - LIBPATH : Path to the libracy dir where dependencies are stored. diff --git a/libs/genesis b/libs/genesis index 76b24dd..ca0afb1 160000 --- a/libs/genesis +++ b/libs/genesis @@ -1 +1 @@ -Subproject commit 76b24dde721eacea3ec8186dd7a9a79915011dd6 +Subproject commit ca0afb161a540ce2eebda24e3f511cde86dbeaf0 diff --git a/src/commands/analyze/fst_cathedral.cpp b/src/commands/analyze/fst_cathedral.cpp index 68743a9..2719c04 100644 --- a/src/commands/analyze/fst_cathedral.cpp +++ b/src/commands/analyze/fst_cathedral.cpp @@ -43,8 +43,8 @@ #include "genesis/utils/core/fs.hpp" #include "genesis/utils/core/logging.hpp" #include "genesis/utils/core/std.hpp" -#include "genesis/utils/core/thread_functions.hpp" -#include "genesis/utils/core/thread_pool.hpp" +#include "genesis/utils/threading/thread_functions.hpp" +#include "genesis/utils/threading/thread_pool.hpp" #include "genesis/utils/formats/json/document.hpp" #include "genesis/utils/text/convert.hpp" #include "genesis/utils/text/string.hpp" diff --git a/src/commands/tools/version.cpp b/src/commands/tools/version.cpp index 5655093..5bb4c96 100644 --- a/src/commands/tools/version.cpp +++ b/src/commands/tools/version.cpp @@ -78,7 +78,8 @@ void run_version( VersionOptions const& options ) LOG_BOLD; LOG_BOLD << "grenedalf version: " << grenedalf_version(); LOG_BOLD; - LOG_BOLD << genesis::utils::Options::get().info_compile_time(); + LOG_BOLD << genesis::utils::info_print_compiler(); + LOG_BOLD << genesis::utils::info_print_hardware(); LOG_BOLD; LOG_BOLD << "For citation information, call `grenedalf tools citation`"; LOG_BOLD << "For license information, call `grenedalf tools license`"; diff --git a/src/options/global.hpp b/src/options/global.hpp index d56329a..ec59a6f 100644 --- a/src/options/global.hpp +++ b/src/options/global.hpp @@ -31,7 +31,7 @@ #include "genesis/utils/core/logging.hpp" #include "genesis/utils/core/options.hpp" -#include "genesis/utils/core/thread_pool.hpp" +#include "genesis/utils/threading/thread_pool.hpp" #include #include diff --git a/src/options/variant_input.cpp b/src/options/variant_input.cpp index 0211b77..b6b4786 100644 --- a/src/options/variant_input.cpp +++ b/src/options/variant_input.cpp @@ -321,7 +321,7 @@ void VariantInputOptions::prepare_stream_() const // Get and check the number of input files provided. size_t const file_count = get_input_file_count(); - size_t const max_file_count = genesis::utils::info_max_file_count(); + size_t const max_file_count = genesis::utils::info_process_max_file_count(); size_t const file_count_margin = 10; if( max_file_count > 0 && file_count > max_file_count - file_count_margin ) { LOG_WARN << "In total, " << file_count << " input files are provided. However, the system "