diff --git a/source/bin/omnitrace-causal/impl.cpp b/source/bin/omnitrace-causal/impl.cpp index 5e901fa4c..04f4f0300 100644 --- a/source/bin/omnitrace-causal/impl.cpp +++ b/source/bin/omnitrace-causal/impl.cpp @@ -607,6 +607,11 @@ parse_args(int argc, char** argv, std::vector& _env, .action([&](parser_t& p) { update_env(_env, "OMNITRACE_CAUSAL_DURATION", p.get("duration")); }); + + parser + .add_argument({ "--nrccl" }, + "Don't set Use_RCCLP environment variable to true.") + .max_count(1); int64_t _niterations = 1; auto _virtual_speedups = std::vector{}; @@ -828,7 +833,17 @@ parse_args(int argc, char** argv, std::vector& _env, #endif #if defined(OMNITRACE_USE_RCCL) && OMNITRACE_USE_RCCL > 0 - add_default_env(_env, "OMNITRACE_USE_RCCLP", true); + bool add_to_env = true; + for(int i = 0; i < argc; ++i) + { + if(std::string_view{ argv[i] } == "--nrccl") + { + add_to_env = false; + } + } + if (add_to_env){ + add_default_env(_env, "OMNITRACE_USE_RCCLP", true); + } #endif } diff --git a/tests/omnitrace-testing.cmake b/tests/omnitrace-testing.cmake index 32250900b..7478ddebb 100644 --- a/tests/omnitrace-testing.cmake +++ b/tests/omnitrace-testing.cmake @@ -637,7 +637,7 @@ function(OMNITRACE_ADD_CAUSAL_TEST) if(TARGET ${TEST_TARGET}) set(COMMAND_PREFIX $ --reset -m ${TEST_CAUSAL_MODE} - ${TEST_CAUSAL_ARGS} --) + ${TEST_CAUSAL_ARGS} --nrccl --) if(NOT TEST_SKIP_BASELINE) add_test(