OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-25 08:41:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5516 from GitPaean/avoiding_unnecessary_exception

Browse Source 
avoiding unnecessary exception from std::stoi("")
This commit is contained in:
Bård Skaflestad 2024-08-08 19:28:49 +02:00 committed by GitHub
commit 6507bba434
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@
#include <dune/common/parallel/mpihelper.hh>
#endif
#include <charconv>
#include <cstddef>
#include <memory>
@ -376,23 +377,30 @@ namespace Opm {
// 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,
// 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>();
int threads = requested_threads > 0 ? requested_threads : default_threads;
const char* env_var = getenv("OMP_NUM_THREADS");
int omp_num_threads = -1;
try {
omp_num_threads = std::stoi(env_var ? env_var : "");
// Warning in 'Main.hpp', where this code is duplicated
// if (requested_threads > 0) {
// OpmLog::warning("Environment variable OMP_NUM_THREADS takes precedence over the --threads-per-process cmdline argument.");
// }
} catch (const std::invalid_argument& e) {
omp_num_threads = requested_threads > 0 ? requested_threads : default_threads;
if (env_var) {
int omp_num_threads = -1;
auto result = std::from_chars(env_var, env_var + std::strlen(env_var), omp_num_threads);
if (result.ec == std::errc() && omp_num_threads > 0) {
// Set threads to omp_num_threads if it was successfully parsed and is positive
threads = omp_num_threads;
// Warning in 'Main.hpp', where this code is duplicated
// if (requested_threads > 0) {
// 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
// reported by OpenMP as on some hardware (and some OpenMPI
// versions) this will be 1 when run with mpirun
omp_set_num_threads(omp_num_threads);
omp_set_num_threads(threads);
#endif
using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;

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

@ -77,6 +77,7 @@
#endif
#include <cassert>
#include <charconv>
#include <cstdlib>
#include <filesystem>
#include <iostream>
@ -713,28 +714,28 @@ private:
// This function is called before the parallel OpenMP stuff gets initialized.
// 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.
static bool first_time = true;
const int default_threads = 2;
static bool first_time = true;
constexpr int default_threads = 2;
const int requested_threads = Parameters::get<TypeTag, Parameters::ThreadsPerProcess>();
threads = requested_threads > 0 ? requested_threads : default_threads;
const char* env_var = getenv("OMP_NUM_THREADS");
int omp_num_threads = -1;
try {
if (env_var) {
omp_num_threads = std::stoi(env_var);
if (env_var) {
int omp_num_threads = -1;
auto result = std::from_chars(env_var, env_var + std::strlen(env_var), omp_num_threads);
const bool can_output = first_time && FlowGenericVanguard::comm().rank() == 0;
if (result.ec == std::errc() && omp_num_threads > 0) {
// Set threads to omp_num_threads if it was successfully parsed and is positive
threads = omp_num_threads;
if (can_output && requested_threads > 0) {
std::cout << "Warning: Environment variable OMP_NUM_THREADS takes precedence over the --threads-per-process cmdline argument."
<< std::endl;
}
} else {
if (can_output) {
std::cout << ("Warning: Invalid value for OMP_NUM_THREADS environment variable.") << std::endl;
}
}
} catch (const std::invalid_argument&) {
// Do nothing if an invalid_argument exception is caught
}
// Set threads to omp_num_threads if it was successfully parsed and is positive
if (omp_num_threads > 0) {
if (first_time && FlowGenericVanguard::comm().rank() == 0 && requested_threads > 0) {
std::cout << "Warning: Environment variable OMP_NUM_THREADS takes precedence over the --threads-per-process cmdline argument."
<< std::endl;
}
threads = omp_num_threads;
}
first_time = false;