NVIDIA/nvbench
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvbench.git synced 2026-03-14 20:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update option_parser for recent refactorings.

Browse Source
This commit is contained in:
Allison Vacanti
2021-03-02 17:13:52 -05:00
parent c83bf8cdb8
commit 3f3c648358
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nvbench/option_parser.cu
View File

@@ -312,7 +312,7 @@ void option_parser::parse_impl()
// Make sure there's a default printer if needed:
if (!m_have_stdout_printer)
{
this->add_markdown_format("stdout");
this->add_markdown_printer("stdout");
}
}
@@ -361,13 +361,13 @@ void option_parser::parse_range(option_parser::arg_iterator_t first,
else if (arg == "--markdown" || arg == "--md")
{
check_params(1);
this->add_markdown_format(first[1]);
this->add_markdown_printer(first[1]);
first += 2;
}
else if (arg == "--csv")
{
check_params(1);
this->add_csv_format(first[1]);
this->add_csv_printer(first[1]);
first += 2;
}
else if (arg == "--benchmark" || arg == "-b")
@@ -410,10 +410,10 @@ void option_parser::parse_range(option_parser::arg_iterator_t first,
}
}
void option_parser::add_markdown_format(const std::string &spec)
void option_parser::add_markdown_printer(const std::string &spec)
try
{
std::ostream &stream = this->output_format_spec_to_ostream(spec);
std::ostream &stream = this->printer_spec_to_ostream(spec);
auto &printer = m_printer.emplace<nvbench::markdown_printer>(stream);
if (spec == "stdout")
{
@@ -428,10 +428,10 @@ catch (std::exception &e)
e.what());
}
void option_parser::add_csv_format(const std::string &spec)
void option_parser::add_csv_printer(const std::string &spec)
try
{
std::ostream &stream = this->output_format_spec_to_ostream(spec);
std::ostream &stream = this->printer_spec_to_ostream(spec);
m_printer.emplace<nvbench::csv_printer>(stream);
}
catch (std::exception &e)
@@ -442,8 +442,7 @@ catch (std::exception &e)
e.what());
}
std::ostream &
option_parser::output_format_spec_to_ostream(const std::string &spec)
std::ostream &option_parser::printer_spec_to_ostream(const std::string &spec)
{
if (spec == "stdout")
{

6
nvbench/option_parser.cuh
View File

@@ -60,10 +60,10 @@ private:
using arg_iterator_t = std::vector<std::string>::const_iterator;
void parse_range(arg_iterator_t first, arg_iterator_t last);
void add_markdown_format(const std::string &spec);
void add_csv_format(const std::string &spec);
void add_markdown_printer(const std::string &spec);
void add_csv_printer(const std::string &spec);
std::ostream &output_format_spec_to_ostream(const std::string &spec);
std::ostream &printer_spec_to_ostream(const std::string &spec);
void print_list() const;