Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support strict settings option in timemory + expanded config syntax #31

Merged
merged 1 commit into from
Jun 8, 2022
Merged

Support strict settings option in timemory + expanded config syntax #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/timemory
Open in desktop
Submodule timemory updated 5 files
+10 −1 source/timemory/components/ompt/context.hpp
+5 −3 source/timemory/components/rusage/backends.hpp
+7 −4 source/timemory/manager/manager.cpp
+184 −27 source/timemory/settings/settings.cpp
+1 −0 source/timemory/settings/settings.hpp
38 changes: 32 additions & 6 deletions source/lib/omnitrace/library/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,17 @@ get_setting_name(std::string _v)
get_setting_name(ENV_NAME).c_str(), ENV_NAME); \
}

// below does not include "omnitrace_library"
#define OMNITRACE_CONFIG_EXT_SETTING(TYPE, ENV_NAME, DESCRIPTION, INITIAL_VALUE, ...) \
{ \
auto _ret = _config->insert<TYPE, TYPE>( \
ENV_NAME, get_setting_name(ENV_NAME), DESCRIPTION, INITIAL_VALUE, \
std::set<std::string>{ "custom", "omnitrace", __VA_ARGS__ }); \
if(!_ret.second) \
OMNITRACE_PRINT("Warning! Duplicate setting: %s / %s\n", \
get_setting_name(ENV_NAME).c_str(), ENV_NAME); \
}

// setting + command line option
#define OMNITRACE_CONFIG_CL_SETTING(TYPE, ENV_NAME, DESCRIPTION, INITIAL_VALUE, \
CMD_LINE, ...) \
Expand Down Expand Up @@ -148,6 +159,15 @@ configure_settings(bool _init)
auto _omnitrace_debug = _config->get<bool>("OMNITRACE_DEBUG");
if(_omnitrace_debug) tim::set_env("TIMEMORY_DEBUG_SETTINGS", "1", 0);

OMNITRACE_CONFIG_SETTING(bool, "OMNITRACE_CI",
"Enable some runtime validation checks (typically enabled "
"for continuous integration)",
false, "debugging");

OMNITRACE_CONFIG_EXT_SETTING(bool, "OMNITRACE_DL_VERBOSE",
"Verbosity within the omnitrace-dl library", false,
"debugging", "omnitrace_dl_library");

OMNITRACE_CONFIG_SETTING(bool, "OMNITRACE_USE_PERFETTO", "Enable perfetto backend",
_default_perfetto_v, "backend", "perfetto");

Expand Down Expand Up @@ -307,9 +327,10 @@ configure_settings(bool _init)
_config->find("OMNITRACE_PERFETTO_FILL_POLICY")
->second->set_choices({ "fill", "discard" });

OMNITRACE_CONFIG_SETTING(int64_t, "OMNITRACE_CRITICAL_TRACE_COUNT",
"Number of critical trace to export (0 == all)", 0, "data",
"critical_trace", "omnitrace-critical-trace");
OMNITRACE_CONFIG_EXT_SETTING(int64_t, "OMNITRACE_CRITICAL_TRACE_COUNT",
"Number of critical trace to export (0 == all)", 0,
"data", "critical_trace", "omnitrace-critical-trace",
"perfetto");

OMNITRACE_CONFIG_SETTING(uint64_t, "OMNITRACE_CRITICAL_TRACE_BUFFER_COUNT",
"Number of critical trace records to store in thread-local "
Expand All @@ -322,10 +343,10 @@ configure_settings(bool _init)
std::min<uint64_t>(8, std::thread::hardware_concurrency()), "parallelism",
"critical_trace");

OMNITRACE_CONFIG_SETTING(
OMNITRACE_CONFIG_EXT_SETTING(
int64_t, "OMNITRACE_CRITICAL_TRACE_PER_ROW",
"How many critical traces per row in perfetto (0 == all in one row)", 0, "io",
"critical_trace");
"critical_trace", "omnitrace-critical-trace", "perfetto");

OMNITRACE_CONFIG_SETTING(
std::string, "OMNITRACE_TIMEMORY_COMPONENTS",
Expand Down Expand Up @@ -567,6 +588,9 @@ configure_settings(bool _init)
_config->disable("width");
_config->disable("max_width");

auto _dl_verbose = _config->find("OMNITRACE_DL_VERBOSE");
tim::set_env(std::string{ _dl_verbose->first }, _dl_verbose->second->as_string(), 0);

#if !defined(TIMEMORY_USE_MPI) || TIMEMORY_USE_MPI == 0
_config->disable("OMNITRACE_PERFETTO_COMBINE_TRACES");
#endif
Expand Down Expand Up @@ -763,7 +787,9 @@ get_debug_env()
bool
get_is_continuous_integration()
{
return tim::get_env<bool>("OMNITRACE_CI", false);
if(!settings_are_configured()) return tim::get_env<bool>("OMNITRACE_CI", false);
static auto _v = get_config()->find("OMNITRACE_CI");
return static_cast<tim::tsettings<bool>&>(*_v->second).get();
}

bool
Expand Down