OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

using std::from_chars instead of std::stoi

Browse Source
This commit is contained in:
Kai Bao 2024-08-08 16:10:27 +02:00
parent 52da2c9dfe
commit 3d794d2d80
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
opm/simulators/flow/FlowMain.hpp
View File

@ -38,6 +38,7 @@
#include <dune/common/parallel/mpihelper.hh> #include <dune/common/parallel/mpihelper.hh>
#endif #endif
#include <charconv>
#include <cstddef> #include <cstddef>
#include <memory> #include <memory>
@ -376,28 +377,26 @@ namespace Opm {
// OMP_NUM_THREADS is set or command line --threads-per-process used. // OMP_NUM_THREADS is set or command line --threads-per-process used.
// Issue a warning if both OMP_NUM_THREADS and --threads-per-process are set, // Issue a warning if both OMP_NUM_THREADS and --threads-per-process are set,
// but let the environment variable take precedence. // but let the environment variable take precedence.
const int default_threads = 2; constexpr int default_threads = 2;
const int requested_threads = Parameters::get<TypeTag, Parameters::ThreadsPerProcess>(); const int requested_threads = Parameters::get<TypeTag, Parameters::ThreadsPerProcess>();
int threads = requested_threads > 0 ? requested_threads : default_threads; int threads = requested_threads > 0 ? requested_threads : default_threads;
const char* env_var = getenv("OMP_NUM_THREADS"); const char* env_var = getenv("OMP_NUM_THREADS");
int omp_num_threads = -1;
try {
if (env_var) { if (env_var) {
omp_num_threads = std::stoi(env_var); int omp_num_threads = -1;
} auto result = std::from_chars(env_var, env_var + std::strlen(env_var), omp_num_threads);
} catch (const std::invalid_argument& e) { if (result.ec == std::errc() && omp_num_threads > 0) {
// Do nothing if an invalid_argument exception is caught
}
// Set threads to omp_num_threads if it was successfully parsed and is positive // Set threads to omp_num_threads if it was successfully parsed and is positive
if (omp_num_threads > 0) {
threads = omp_num_threads; threads = omp_num_threads;
// Warning in 'Main.hpp', where this code is duplicated // Warning in 'Main.hpp', where this code is duplicated
// if (requested_threads > 0) { // if (requested_threads > 0) {
// OpmLog::warning("Environment variable OMP_NUM_THREADS takes precedence over the --threads-per-process cmdline argument."); // OpmLog::warning("Environment variable OMP_NUM_THREADS takes precedence over the --threads-per-process cmdline argument.");
// } // }
} else {
OpmLog::warning("Invalid value for OMP_NUM_THREADS environment variable.");
} }
}
// We are not limiting this to the number of processes // We are not limiting this to the number of processes
// reported by OpenMP as on some hardware (and some OpenMPI // reported by OpenMP as on some hardware (and some OpenMPI
// versions) this will be 1 when run with mpirun // versions) this will be 1 when run with mpirun

25
opm/simulators/flow/Main.hpp
View File

@ -77,6 +77,7 @@
#endif #endif
#include <cassert> #include <cassert>
#include <charconv>
#include <cstdlib> #include <cstdlib>
#include <filesystem> #include <filesystem>
#include <iostream> #include <iostream>
@ -714,27 +715,27 @@ private:
// That initialization happens after the deck is read and we want this message. // That initialization happens after the deck is read and we want this message.
// Hence we duplicate the code of setupParallelism to get the number of threads. // Hence we duplicate the code of setupParallelism to get the number of threads.
static bool first_time = true; static bool first_time = true;
const int default_threads = 2; constexpr int default_threads = 2;
const int requested_threads = Parameters::get<TypeTag, Parameters::ThreadsPerProcess>(); const int requested_threads = Parameters::get<TypeTag, Parameters::ThreadsPerProcess>();
threads = requested_threads > 0 ? requested_threads : default_threads; threads = requested_threads > 0 ? requested_threads : default_threads;
const char* env_var = getenv("OMP_NUM_THREADS"); const char* env_var = getenv("OMP_NUM_THREADS");
int omp_num_threads = -1;
try {
if (env_var) { if (env_var) {
omp_num_threads = std::stoi(env_var); int omp_num_threads = -1;
} auto result = std::from_chars(env_var, env_var + std::strlen(env_var), omp_num_threads);
} catch (const std::invalid_argument&) { const bool can_output = first_time && FlowGenericVanguard::comm().rank() == 0;
// Do nothing if an invalid_argument exception is caught if (result.ec == std::errc() && omp_num_threads > 0) {
}
// Set threads to omp_num_threads if it was successfully parsed and is positive // Set threads to omp_num_threads if it was successfully parsed and is positive
if (omp_num_threads > 0) { threads = omp_num_threads;
if (first_time && FlowGenericVanguard::comm().rank() == 0 && requested_threads > 0) { if (can_output && requested_threads > 0) {
std::cout << "Warning: Environment variable OMP_NUM_THREADS takes precedence over the --threads-per-process cmdline argument." std::cout << "Warning: Environment variable OMP_NUM_THREADS takes precedence over the --threads-per-process cmdline argument."
<< std::endl; << std::endl;
} }
threads = omp_num_threads; } else {
if (can_output) {
std::cout << ("Warning: Invalid value for OMP_NUM_THREADS environment variable.") << std::endl;
}
}
} }
first_time = false; first_time = false;