Skip to content

N
ngraph
Commit 2b7db6d7 authored by Jaikrishnan Menon's avatar Jaikrishnan Menon Committed by Jayaram Bobba
Browse files
Options

CPU: Rename PREFER_EIGEN to something clearer (#777) 

* CPU: Rename PREFER_EIGEN to something clearer

* More renaming
parent 5c206d26
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 43 deletions
src/ngraph/runtime/cpu/cpu_emitter.cpp
View file @ 2b7db6d7
...@@ -106,7 +106,8 @@ ...@@ -106,7 +106,8 @@
using namespace std; using namespace std;
using namespace ngraph; using namespace ngraph;
#define PREFER_EIGEN 0 // Enables old unoptimized Eigen code paths
#define USE_EIGEN_CORE_INLINE 0
static bool s_use_ref_kernels = (std::getenv("NGRAPH_CPU_USE_REF_KERNELS") != nullptr); static bool s_use_ref_kernels = (std::getenv("NGRAPH_CPU_USE_REF_KERNELS") != nullptr);
...@@ -134,7 +135,7 @@ namespace ngraph ...@@ -134,7 +135,7 @@ namespace ngraph
// TODO: Audit all uses of Add and fix this to use // TODO: Audit all uses of Add and fix this to use
// the right alignment instead of Eigen::Unaligned // the right alignment instead of Eigen::Unaligned
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << "Eigen::Map<Eigen::Array<" << out[0].get_element_type().c_type_string() writer << "Eigen::Map<Eigen::Array<" << out[0].get_element_type().c_type_string()
<< ", " << out[0].get_size() << ", 1>, Eigen::Unaligned> out(" << ", " << out[0].get_size() << ", 1>, Eigen::Unaligned> out("
<< out[0].get_name() << ");\n"; << out[0].get_name() << ");\n";
...@@ -627,7 +628,7 @@ namespace ngraph ...@@ -627,7 +628,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Multiply) void CPU_Emitter::EMITTER_DECL(ngraph::op::Multiply)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << " *\n" << " " << emit_array1d(args[0]) << " *\n"
<< " " << emit_array1d(args[1]) << ";\n"; << " " << emit_array1d(args[1]) << ";\n";
...@@ -658,7 +659,7 @@ namespace ngraph ...@@ -658,7 +659,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Abs) void CPU_Emitter::EMITTER_DECL(ngraph::op::Abs)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n"; writer << emit_array1d(out[0]) << " =\n";
writer << "Eigen::abs(" << emit_array1d(args[0]) << ");\n"; writer << "Eigen::abs(" << emit_array1d(args[0]) << ");\n";
#else #else
...@@ -682,7 +683,7 @@ namespace ngraph ...@@ -682,7 +683,7 @@ namespace ngraph
{ {
auto result_shape = out[0].get_shape(); auto result_shape = out[0].get_shape();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
if (result_shape.size() == 1) if (result_shape.size() == 1)
{ {
writer.block_begin(); writer.block_begin();
...@@ -803,7 +804,7 @@ namespace ngraph ...@@ -803,7 +804,7 @@ namespace ngraph
<< "[i] == 0) throw std::runtime_error(\"integer divide by zero\");\n"; << "[i] == 0) throw std::runtime_error(\"integer divide by zero\");\n";
writer.block_end(); writer.block_end();
} }
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << " /\n" << " " << emit_array1d(args[0]) << " /\n"
<< " " << emit_array1d(args[1]) << ";\n"; << " " << emit_array1d(args[1]) << ";\n";
...@@ -822,7 +823,7 @@ namespace ngraph ...@@ -822,7 +823,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Equal) void CPU_Emitter::EMITTER_DECL(ngraph::op::Equal)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " (" << emit_array1d(args[0]) << " ==\n" << " (" << emit_array1d(args[0]) << " ==\n"
<< " " << emit_array1d(args[1]) << ").template cast<char>();\n"; << " " << emit_array1d(args[1]) << ").template cast<char>();\n";
...@@ -841,7 +842,7 @@ namespace ngraph ...@@ -841,7 +842,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Greater) void CPU_Emitter::EMITTER_DECL(ngraph::op::Greater)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " (" << emit_array1d(args[0]) << " >\n" << " (" << emit_array1d(args[0]) << " >\n"
<< " " << emit_array1d(args[1]) << ").template cast<char>();\n"; << " " << emit_array1d(args[1]) << ").template cast<char>();\n";
...@@ -860,7 +861,7 @@ namespace ngraph ...@@ -860,7 +861,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::GreaterEq) void CPU_Emitter::EMITTER_DECL(ngraph::op::GreaterEq)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " (" << emit_array1d(args[0]) << " >=\n" << " (" << emit_array1d(args[0]) << " >=\n"
<< " " << emit_array1d(args[1]) << ").template cast<char>();\n"; << " " << emit_array1d(args[1]) << ").template cast<char>();\n";
...@@ -879,7 +880,7 @@ namespace ngraph ...@@ -879,7 +880,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Less) void CPU_Emitter::EMITTER_DECL(ngraph::op::Less)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " (" << emit_array1d(args[0]) << " <\n" << " (" << emit_array1d(args[0]) << " <\n"
<< " " << emit_array1d(args[1]) << ").template cast<char>();\n"; << " " << emit_array1d(args[1]) << ").template cast<char>();\n";
...@@ -898,7 +899,7 @@ namespace ngraph ...@@ -898,7 +899,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::LessEq) void CPU_Emitter::EMITTER_DECL(ngraph::op::LessEq)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " (" << emit_array1d(args[0]) << " <=\n" << " (" << emit_array1d(args[0]) << " <=\n"
<< " " << emit_array1d(args[1]) << ").template cast<char>();\n"; << " " << emit_array1d(args[1]) << ").template cast<char>();\n";
...@@ -917,7 +918,7 @@ namespace ngraph ...@@ -917,7 +918,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Log) void CPU_Emitter::EMITTER_DECL(ngraph::op::Log)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " Eigen::log(" << emit_array1d(args[0]) << ");\n"; << " Eigen::log(" << emit_array1d(args[0]) << ");\n";
#else #else
...@@ -934,7 +935,7 @@ namespace ngraph ...@@ -934,7 +935,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Maximum) void CPU_Emitter::EMITTER_DECL(ngraph::op::Maximum)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".max(\n" << " " << emit_array1d(args[0]) << ".max(\n"
<< " " << emit_array1d(args[1]) << ");\n"; << " " << emit_array1d(args[1]) << ");\n";
...@@ -954,7 +955,7 @@ namespace ngraph ...@@ -954,7 +955,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Minimum) void CPU_Emitter::EMITTER_DECL(ngraph::op::Minimum)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".min(\n" << " " << emit_array1d(args[0]) << ".min(\n"
<< " " << emit_array1d(args[1]) << ");\n"; << " " << emit_array1d(args[1]) << ");\n";
...@@ -974,7 +975,7 @@ namespace ngraph ...@@ -974,7 +975,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Negative) void CPU_Emitter::EMITTER_DECL(ngraph::op::Negative)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " -" << emit_array1d(args[0]) << ";\n"; << " -" << emit_array1d(args[0]) << ";\n";
#else #else
...@@ -991,7 +992,7 @@ namespace ngraph ...@@ -991,7 +992,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::NotEqual) void CPU_Emitter::EMITTER_DECL(ngraph::op::NotEqual)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " (" << emit_array1d(args[0]) << " !=\n" << " (" << emit_array1d(args[0]) << " !=\n"
<< " " << emit_array1d(args[1]) << ").template cast<char>();\n"; << " " << emit_array1d(args[1]) << ").template cast<char>();\n";
...@@ -1010,7 +1011,7 @@ namespace ngraph ...@@ -1010,7 +1011,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Select) void CPU_Emitter::EMITTER_DECL(ngraph::op::Select)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << "\n" << " " << emit_array1d(args[0]) << "\n"
<< " .select(" << emit_array1d(args[1]) << ",\n" << " .select(" << emit_array1d(args[1]) << ",\n"
...@@ -1030,7 +1031,7 @@ namespace ngraph ...@@ -1030,7 +1031,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Subtract) void CPU_Emitter::EMITTER_DECL(ngraph::op::Subtract)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << " -\n" << " " << emit_array1d(args[0]) << " -\n"
<< " " << emit_array1d(args[1]) << ";\n"; << " " << emit_array1d(args[1]) << ";\n";
...@@ -1051,7 +1052,7 @@ namespace ngraph ...@@ -1051,7 +1052,7 @@ namespace ngraph
auto broadcast = static_cast<const ngraph::op::Broadcast*>(node); auto broadcast = static_cast<const ngraph::op::Broadcast*>(node);
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
auto arg_shape = args[0].get_shape(); auto arg_shape = args[0].get_shape();
auto result_shape = out[0].get_shape(); auto result_shape = out[0].get_shape();
...@@ -1135,7 +1136,7 @@ namespace ngraph ...@@ -1135,7 +1136,7 @@ namespace ngraph
auto& result_element_type = out[0].get_element_type(); auto& result_element_type = out[0].get_element_type();
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << "\n" << " " << emit_array1d(args[0]) << "\n"
<< " .template cast<" << result_element_type.c_type_string() << ">();\n"; << " .template cast<" << result_element_type.c_type_string() << ">();\n";
...@@ -1172,7 +1173,7 @@ namespace ngraph ...@@ -1172,7 +1173,7 @@ namespace ngraph
{ {
auto reshape = static_cast<const ngraph::op::Reshape*>(node); auto reshape = static_cast<const ngraph::op::Reshape*>(node);
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
auto arg_shape = args[0].get_shape(); auto arg_shape = args[0].get_shape();
auto arg_rank = arg_shape.size(); auto arg_rank = arg_shape.size();
...@@ -1301,7 +1302,7 @@ namespace ngraph ...@@ -1301,7 +1302,7 @@ namespace ngraph
auto& f_result_element_type = out[0].get_element_type(); auto& f_result_element_type = out[0].get_element_type();
auto result_shape = out[0].get_shape(); auto result_shape = out[0].get_shape();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
auto& reduction_axes = reduce->get_reduction_axes(); auto& reduction_axes = reduce->get_reduction_axes();
// Trivial case: no reduction axes (this includes the scalar-reductee case). // Trivial case: no reduction axes (this includes the scalar-reductee case).
if (reduction_axes.empty()) if (reduction_axes.empty())
...@@ -1482,7 +1483,7 @@ namespace ngraph ...@@ -1482,7 +1483,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Sign) void CPU_Emitter::EMITTER_DECL(ngraph::op::Sign)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".sign();\n"; << " " << emit_array1d(args[0]) << ".sign();\n";
#else #else
...@@ -1502,7 +1503,7 @@ namespace ngraph ...@@ -1502,7 +1503,7 @@ namespace ngraph
const ngraph::op::Slice* slice = static_cast<const ngraph::op::Slice*>(node); const ngraph::op::Slice* slice = static_cast<const ngraph::op::Slice*>(node);
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
size_t arg_rank = args[0].get_shape().size(); size_t arg_rank = args[0].get_shape().size();
const Coordinate& lower_bounds = slice->get_lower_bounds(); const Coordinate& lower_bounds = slice->get_lower_bounds();
...@@ -1579,7 +1580,7 @@ namespace ngraph ...@@ -1579,7 +1580,7 @@ namespace ngraph
{ {
const ngraph::op::Sum* sum = static_cast<const ngraph::op::Sum*>(node); const ngraph::op::Sum* sum = static_cast<const ngraph::op::Sum*>(node);
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
const Shape& arg_shape = args[0].get_shape(); const Shape& arg_shape = args[0].get_shape();
size_t arg_rank = arg_shape.size(); size_t arg_rank = arg_shape.size();
const AxisSet& reduction_axes = sum->get_reduction_axes(); const AxisSet& reduction_axes = sum->get_reduction_axes();
...@@ -1641,7 +1642,7 @@ namespace ngraph ...@@ -1641,7 +1642,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Exp) void CPU_Emitter::EMITTER_DECL(ngraph::op::Exp)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".exp();\n"; << " " << emit_array1d(args[0]) << ".exp();\n";
#else #else
...@@ -1658,7 +1659,7 @@ namespace ngraph ...@@ -1658,7 +1659,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Sin) void CPU_Emitter::EMITTER_DECL(ngraph::op::Sin)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".sin();\n"; << " " << emit_array1d(args[0]) << ".sin();\n";
#else #else
...@@ -1675,7 +1676,7 @@ namespace ngraph ...@@ -1675,7 +1676,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Sinh) void CPU_Emitter::EMITTER_DECL(ngraph::op::Sinh)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".sinh();\n"; << " " << emit_array1d(args[0]) << ".sinh();\n";
#else #else
...@@ -1692,7 +1693,7 @@ namespace ngraph ...@@ -1692,7 +1693,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Cos) void CPU_Emitter::EMITTER_DECL(ngraph::op::Cos)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".cos();\n"; << " " << emit_array1d(args[0]) << ".cos();\n";
#else #else
...@@ -1709,7 +1710,7 @@ namespace ngraph ...@@ -1709,7 +1710,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Cosh) void CPU_Emitter::EMITTER_DECL(ngraph::op::Cosh)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".cosh();\n"; << " " << emit_array1d(args[0]) << ".cosh();\n";
#else #else
...@@ -1726,7 +1727,7 @@ namespace ngraph ...@@ -1726,7 +1727,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Tan) void CPU_Emitter::EMITTER_DECL(ngraph::op::Tan)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".tan();\n"; << " " << emit_array1d(args[0]) << ".tan();\n";
#else #else
...@@ -1747,7 +1748,7 @@ namespace ngraph ...@@ -1747,7 +1748,7 @@ namespace ngraph
// TODO: Implement our own internal fast/approximate tanh if this actually gets used // TODO: Implement our own internal fast/approximate tanh if this actually gets used
// by models // by models
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 0 #if USE_EIGEN_CORE_INLINE == 0
writer << "#pragma omp parallel for\n"; writer << "#pragma omp parallel for\n";
#endif #endif
writer << "for (size_t i=0; i<" << out[0].get_size() << "; i++)\n"; writer << "for (size_t i=0; i<" << out[0].get_size() << "; i++)\n";
...@@ -1761,7 +1762,7 @@ namespace ngraph ...@@ -1761,7 +1762,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Asin) void CPU_Emitter::EMITTER_DECL(ngraph::op::Asin)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".asin();\n"; << " " << emit_array1d(args[0]) << ".asin();\n";
#else #else
...@@ -1778,7 +1779,7 @@ namespace ngraph ...@@ -1778,7 +1779,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Acos) void CPU_Emitter::EMITTER_DECL(ngraph::op::Acos)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".acos();\n"; << " " << emit_array1d(args[0]) << ".acos();\n";
#else #else
...@@ -1795,7 +1796,7 @@ namespace ngraph ...@@ -1795,7 +1796,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Atan) void CPU_Emitter::EMITTER_DECL(ngraph::op::Atan)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " =\n" writer << emit_array1d(out[0]) << " =\n"
<< " " << emit_array1d(args[0]) << ".atan();\n"; << " " << emit_array1d(args[0]) << ".atan();\n";
#else #else
...@@ -1812,7 +1813,7 @@ namespace ngraph ...@@ -1812,7 +1813,7 @@ namespace ngraph
void CPU_Emitter::EMITTER_DECL(ngraph::op::Power) void CPU_Emitter::EMITTER_DECL(ngraph::op::Power)
{ {
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
writer << emit_array1d(out[0]) << " = \n"; writer << emit_array1d(out[0]) << " = \n";
writer.indent++; writer.indent++;
writer << emit_array1d(args[0]) << ".pow(\n "; writer << emit_array1d(args[0]) << ".pow(\n ";
...@@ -1834,7 +1835,7 @@ namespace ngraph ...@@ -1834,7 +1835,7 @@ namespace ngraph
{ {
auto replace_slice = static_cast<const ngraph::op::Slice*>(node); auto replace_slice = static_cast<const ngraph::op::Slice*>(node);
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
size_t arg0_rank = args[0].get_shape().size(); size_t arg0_rank = args[0].get_shape().size();
auto& lower_bounds = replace_slice->get_lower_bounds(); auto& lower_bounds = replace_slice->get_lower_bounds();
...@@ -2002,7 +2003,7 @@ namespace ngraph ...@@ -2002,7 +2003,7 @@ namespace ngraph
{ {
writer.block_begin(); writer.block_begin();
size_t element_count = out[0].get_size(); size_t element_count = out[0].get_size();
#if PREFER_EIGEN == 0 #if USE_EIGEN_CORE_INLINE == 0
writer << "#pragma omp parallel for\n"; writer << "#pragma omp parallel for\n";
#endif #endif
writer << "for (size_t i = 0; i < " << element_count << "; i++)\n"; writer << "for (size_t i = 0; i < " << element_count << "; i++)\n";
...@@ -2017,7 +2018,7 @@ namespace ngraph ...@@ -2017,7 +2018,7 @@ namespace ngraph
{ {
writer.block_begin(); writer.block_begin();
size_t element_count = out[0].get_size(); size_t element_count = out[0].get_size();
#if PREFER_EIGEN == 0 #if USE_EIGEN_CORE_INLINE == 0
writer << "#pragma omp parallel for\n"; writer << "#pragma omp parallel for\n";
#endif #endif
writer << "for (size_t i = 0; i < " << element_count << "; i++)\n"; writer << "for (size_t i = 0; i < " << element_count << "; i++)\n";
...@@ -2032,7 +2033,7 @@ namespace ngraph ...@@ -2032,7 +2033,7 @@ namespace ngraph
{ {
writer.block_begin(); writer.block_begin();
size_t element_count = out[0].get_size(); size_t element_count = out[0].get_size();
#if PREFER_EIGEN == 0 #if USE_EIGEN_CORE_INLINE == 0
writer << "#pragma omp parallel for\n"; writer << "#pragma omp parallel for\n";
#endif #endif
writer << "for (size_t i = 0; i < " << element_count << "; i++)\n"; writer << "for (size_t i = 0; i < " << element_count << "; i++)\n";
...@@ -2864,7 +2865,7 @@ namespace ngraph ...@@ -2864,7 +2865,7 @@ namespace ngraph
{ {
const ngraph::op::Product* product = static_cast<const ngraph::op::Product*>(node); const ngraph::op::Product* product = static_cast<const ngraph::op::Product*>(node);
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
const Shape& arg_shape = args[0].get_shape(); const Shape& arg_shape = args[0].get_shape();
size_t arg_rank = arg_shape.size(); size_t arg_rank = arg_shape.size();
const AxisSet& reduction_axes = product->get_reduction_axes(); const AxisSet& reduction_axes = product->get_reduction_axes();
...@@ -2928,7 +2929,7 @@ namespace ngraph ...@@ -2928,7 +2929,7 @@ namespace ngraph
{ {
const ngraph::op::Max* max = static_cast<const ngraph::op::Max*>(node); const ngraph::op::Max* max = static_cast<const ngraph::op::Max*>(node);
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
const Shape& arg_shape = args[0].get_shape(); const Shape& arg_shape = args[0].get_shape();
size_t arg_rank = arg_shape.size(); size_t arg_rank = arg_shape.size();
const AxisSet& reduction_axes = max->get_reduction_axes(); const AxisSet& reduction_axes = max->get_reduction_axes();
...@@ -2998,7 +2999,7 @@ namespace ngraph ...@@ -2998,7 +2999,7 @@ namespace ngraph
{ {
const ngraph::op::Min* min = static_cast<const ngraph::op::Min*>(node); const ngraph::op::Min* min = static_cast<const ngraph::op::Min*>(node);
writer.block_begin(); writer.block_begin();
#if PREFER_EIGEN == 1 #if USE_EIGEN_CORE_INLINE == 1
const Shape& arg_shape = args[0].get_shape(); const Shape& arg_shape = args[0].get_shape();
size_t arg_rank = arg_shape.size(); size_t arg_rank = arg_shape.size();
const AxisSet& reduction_axes = min->get_reduction_axes(); const AxisSet& reduction_axes = min->get_reduction_axes();
......
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