diff --git a/VERSION b/VERSION index f8a696c8dc..661e7aeadf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.2 +1.7.3 diff --git a/source/bin/omnitrace-sample/impl.cpp b/source/bin/omnitrace-sample/impl.cpp index fb6e2d0990..0a0e85cf98 100644 --- a/source/bin/omnitrace-sample/impl.cpp +++ b/source/bin/omnitrace-sample/impl.cpp @@ -64,12 +64,6 @@ auto updated_envs = std::set{}; auto original_envs = std::set{}; } // namespace -std::string -get_command(const char* _argv0) -{ - return omnitrace::path::find_path(_argv0, 0, omnitrace::common::get_env("PATH", "")); -} - std::string get_realpath(const std::string& _v) { diff --git a/source/bin/omnitrace-sample/omnitrace-sample.cpp b/source/bin/omnitrace-sample/omnitrace-sample.cpp index 6b47d9a5b3..662b9a0ec7 100644 --- a/source/bin/omnitrace-sample/omnitrace-sample.cpp +++ b/source/bin/omnitrace-sample/omnitrace-sample.cpp @@ -56,11 +56,10 @@ main(int argc, char** argv) if(!_argv.empty()) { - std::string _argv0 = get_command(_argv[0]); print_command(_argv); _argv.emplace_back(nullptr); _env.emplace_back(nullptr); - return execve(_argv0.c_str(), _argv.data(), _env.data()); + return execvpe(_argv.front(), _argv.data(), _env.data()); } } diff --git a/source/bin/omnitrace-sample/omnitrace-sample.hpp b/source/bin/omnitrace-sample/omnitrace-sample.hpp index 864dffda5b..e09588b1a0 100644 --- a/source/bin/omnitrace-sample/omnitrace-sample.hpp +++ b/source/bin/omnitrace-sample/omnitrace-sample.hpp @@ -26,9 +26,6 @@ #include #include -std::string -get_command(const char*); - std::string get_realpath(const std::string&); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1b739ddb58..11b733c588 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -154,6 +154,15 @@ if(OMNITRACE_CI_MPI_RUN_AS_ROOT) endif() endif() +execute_process( + COMMAND ${MPIEXEC_EXECUTABLE} --oversubscribe -n 1 ls + RESULT_VARIABLE _mpiexec_oversubscribe + OUTPUT_QUIET ERROR_QUIET) + +if(_mpiexec_oversubscribe EQUAL 0) + list(APPEND MPIEXEC_EXECUTABLE_ARGS --oversubscribe) +endif() + # -------------------------------------------------------------------------------------- # set(_VALID_GPU OFF)