Commit 83a232ca authored by Robert Kimball's avatar Robert Kimball Committed by Scott Cyphers

Add lots more fun output to nbench (#1672)

* update nbench output to be more consistent for single vs. directory benchmark.

* wip

* add types used in model

* fix test

* style

* catch all exceptions when running any option
parent 233d5cd2
...@@ -174,6 +174,6 @@ namespace ngraph ...@@ -174,6 +174,6 @@ namespace ngraph
std::ostream& element::operator<<(std::ostream& out, const element::Type& obj) std::ostream& element::operator<<(std::ostream& out, const element::Type& obj)
{ {
out << "element::Type{" << obj.m_bitwidth << ", " << obj.m_is_real << ", " << obj.m_is_signed out << "element::Type{" << obj.m_bitwidth << ", " << obj.m_is_real << ", " << obj.m_is_signed
<< "," << obj.m_cname << "}"; << ", \"" << obj.m_cname << "\"}";
return out; return out;
} }
This diff is collapsed.
...@@ -497,9 +497,10 @@ void test_binary(std::string node_type, ...@@ -497,9 +497,10 @@ void test_binary(std::string node_type,
} }
catch (const NodeValidationError& error) catch (const NodeValidationError& error)
{ {
EXPECT_HAS_SUBSTRING(error.what(), EXPECT_HAS_SUBSTRING(
std::string("Argument 0 element type element::Type{32, 1, " error.what(),
"1,float} differs in element type from argument 1")); std::string("Argument 0 element type element::Type{32, 1, "
"1, \"float\"} differs in element type from argument 1"));
} }
catch (...) catch (...)
{ {
...@@ -592,9 +593,10 @@ void test_binary_logical(std::string node_type, ...@@ -592,9 +593,10 @@ void test_binary_logical(std::string node_type,
} }
catch (const NodeValidationError& error) catch (const NodeValidationError& error)
{ {
EXPECT_HAS_SUBSTRING(error.what(), EXPECT_HAS_SUBSTRING(
std::string("Argument 0 element type element::Type{8, 0, 1,char} " error.what(),
"differs in element type from argument 1")); std::string("Argument 0 element type element::Type{8, 0, 1, \"char\"} "
"differs in element type from argument 1"));
} }
catch (...) catch (...)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment