NVIDIA/nvbench
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvbench.git synced 2026-04-29 11:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

More printer cleanups.

Browse Source 
- Initialize color from env_var.
- Change ivar to m_global_benchmark_args to clarify usage.
This commit is contained in:
Allison Vacanti
2021-03-02 17:36:19 -05:00
parent 3f3c648358
commit 2ce12d2201
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
nvbench/option_parser.cu
View File

@@ -294,7 +294,13 @@ void option_parser::parse(std::vector<std::string> args)
void option_parser::parse_impl() void option_parser::parse_impl()
{ {
m_global_args.clear(); m_global_benchmark_args.clear();
// Initialize color variable based on env var:
{
const char *var = std::getenv("NVBENCH_COLOR");
m_color_md_stdout_printer = var && var[0] == '1';
}
this->parse_range(m_args.cbegin(), m_args.cend()); this->parse_range(m_args.cbegin(), m_args.cend());
@@ -515,7 +521,8 @@ catch (std::exception &e)
void option_parser::replay_global_args() void option_parser::replay_global_args()
{ {
this->parse_range(m_global_args.cbegin(), m_global_args.cend()); this->parse_range(m_global_benchmark_args.cbegin(),
m_global_benchmark_args.cend());
} }
void option_parser::update_devices(const std::string &devices) void option_parser::update_devices(const std::string &devices)
@@ -524,8 +531,8 @@ try
// If no active benchmark, save args as global. // If no active benchmark, save args as global.
if (m_benchmarks.empty()) if (m_benchmarks.empty())
{ {
m_global_args.push_back("-devices"); m_global_benchmark_args.push_back("-devices");
m_global_args.push_back(devices); m_global_benchmark_args.push_back(devices);
return; return;
} }
@@ -564,8 +571,8 @@ try
// If no active benchmark, save args as global. // If no active benchmark, save args as global.
if (m_benchmarks.empty()) if (m_benchmarks.empty())
{ {
m_global_args.push_back("--axis"); m_global_benchmark_args.push_back("--axis");
m_global_args.push_back(spec); m_global_benchmark_args.push_back(spec);
return; return;
} }
@@ -700,8 +707,8 @@ try
// If no active benchmark, save args as global. // If no active benchmark, save args as global.
if (m_benchmarks.empty()) if (m_benchmarks.empty())
{ {
m_global_args.push_back(prop_arg); m_global_benchmark_args.push_back(prop_arg);
m_global_args.push_back(prop_val); m_global_benchmark_args.push_back(prop_val);
return; return;
} }
@@ -734,8 +741,8 @@ try
// If no active benchmark, save args as global. // If no active benchmark, save args as global.
if (m_benchmarks.empty()) if (m_benchmarks.empty())
{ {
m_global_args.push_back(prop_arg); m_global_benchmark_args.push_back(prop_arg);
m_global_args.push_back(prop_val); m_global_benchmark_args.push_back(prop_val);
return; return;
} }

2
nvbench/option_parser.cuh
View File

@@ -96,7 +96,7 @@ private:
// Store benchmark modifiers passed in before any benchmarks are requested as // Store benchmark modifiers passed in before any benchmarks are requested as
// "global args". Replay them after every benchmark. // "global args". Replay them after every benchmark.
std::vector<std::string> m_global_args; std::vector<std::string> m_global_benchmark_args;
benchmark_vector m_benchmarks; benchmark_vector m_benchmarks;
// Manages lifetimes of any ofstreams opened for m_printer. // Manages lifetimes of any ofstreams opened for m_printer.