CPU: Implement op::Select and op::Subtract

src/ngraph/runtime/cpu/emitter.cpp

@@ -511,3 +511,43 @@ void Emitter::EMITTER_DECL(EmitNotEqual)
                    EIGEN_VECTOR_FORMAT(inputs[1].get_layout<DenseTensorViewLayout>()->get_size()) ")).template cast<char>();\n"
           "    }\n";
 }
+
+void Emitter::EMITTER_DECL(EmitSelect)
+{
+    const element::Type& et = (dynamic_pointer_cast<const TensorViewType>(
+                                       n->get_arguments().at(1)->get_value_type()))
+                                      ->get_element_type();
+
+    TU += "    {\n"
+          "        auto arg0 = call_frame->get_tensor_view_data<Bool>(" + to_string(inputs[0].get_index()) + ");\n"
+          "        auto arg1 = call_frame->get_tensor_view_data<" + element_type_names[TI(et)] + ">(" + to_string(inputs[1].get_index()) + ");\n"
+          "        auto arg2 = call_frame->get_tensor_view_data<" + element_type_names[TI(et)] + ">(" + to_string(inputs[2].get_index()) + ");\n"
+          "        auto out  = call_frame->get_tensor_view_data<" + element_type_names[TI(et)] + ">(" + to_string(outputs[0].get_index()) + ");\n"
+          "        EigenArray1d<" + element_type_names[TI(et)] + ">(out, "
+                   EIGEN_VECTOR_FORMAT(outputs[0].get_layout<DenseTensorViewLayout>()->get_size()) ") =\n"
+          "        EigenArray1d<Bool>(arg0, " EIGEN_VECTOR_FORMAT(inputs[0].get_layout<DenseTensorViewLayout>()->get_size()) ")\n"
+          ".select(EigenArray1d<" + element_type_names[TI(et)] + ">(arg1, "
+                   EIGEN_VECTOR_FORMAT(inputs[0].get_layout<DenseTensorViewLayout>()->get_size()) "),\n"
+          "        EigenArray1d<" + element_type_names[TI(et)] + ">(arg2, "
+                   EIGEN_VECTOR_FORMAT(inputs[1].get_layout<DenseTensorViewLayout>()->get_size()) "));\n"
+          "    }\n";
+}
+
+void Emitter::EMITTER_DECL(EmitSubtract)
+{
+    const element::Type& et = (dynamic_pointer_cast<const TensorViewType>(
+                                       n->get_arguments().at(0)->get_value_type()))
+                                      ->get_element_type();
+
+    TU += "    {\n"
+          "        auto arg0 = call_frame->get_tensor_view_data<" + element_type_names[TI(et)] + ">(" + to_string(inputs[0].get_index()) + ");\n"
+          "        auto arg1 = call_frame->get_tensor_view_data<" + element_type_names[TI(et)] + ">(" + to_string(inputs[1].get_index()) + ");\n"
+          "        auto out  = call_frame->get_tensor_view_data<" + element_type_names[TI(et)] + ">(" + to_string(outputs[0].get_index()) + ");\n"
+          "        EigenArray1d<" + element_type_names[TI(et)] + ">(out, "
+                   EIGEN_VECTOR_FORMAT(outputs[0].get_layout<DenseTensorViewLayout>()->get_size()) ") =\n"
+          "        EigenArray1d<" + element_type_names[TI(et)] + ">(arg0, "
+                   EIGEN_VECTOR_FORMAT(inputs[0].get_layout<DenseTensorViewLayout>()->get_size()) ") -\n"
+          "        EigenArray1d<" + element_type_names[TI(et)] + ">(arg1, "
+                   EIGEN_VECTOR_FORMAT(inputs[1].get_layout<DenseTensorViewLayout>()->get_size()) ");\n"
+          "    }\n";
+}

src/ngraph/runtime/cpu/emitter.hpp

@@ -61,6 +61,8 @@ namespace ngraph
                 void EMITTER_DECL(EmitMaximum);
                 void EMITTER_DECL(EmitNegative);
                 void EMITTER_DECL(EmitNotEqual);
+                void EMITTER_DECL(EmitSelect);
+                void EMITTER_DECL(EmitSubtract);
 
             };
         }

src/ngraph/runtime/cpu/external_function.cpp

@@ -87,7 +87,9 @@ static const OpMap dispatcher{{TI(ngraph::op::Add), &Emitter::EmitAdd},
                               {TI(ngraph::op::Log), &Emitter::EmitLog},
                               {TI(ngraph::op::Maximum), &Emitter::EmitMaximum},
                               {TI(ngraph::op::Negative), &Emitter::EmitNegative},
-                              {TI(ngraph::op::NotEqual), &Emitter::EmitNotEqual}
+                              {TI(ngraph::op::NotEqual), &Emitter::EmitNotEqual},
+                              {TI(ngraph::op::Select), &Emitter::EmitSelect},
+                              {TI(ngraph::op::Subtract), &Emitter::EmitSubtract}
 
                              };
 

test/cpu.cpp

@@ -971,8 +971,7 @@ TEST(cpu, notequal)
     ASSERT_EQ((vector<char>{0, 0, 1, 1, 1, 0, 0, 1}), result->get_vector());
 }
 
-/*
-TEST(execute, select)
+TEST(cpu, select)
 {
     auto shape = Shape{2, 2, 2};
     auto A = make_shared<op::Parameter>(element::Bool::element_type(), shape);
@@ -981,7 +980,7 @@ TEST(execute, select)
     auto rt = make_shared<TensorViewType>(element::Float32::element_type(), shape);
     auto f = make_shared<Function>(make_shared<op::Select>(A, B, C), rt, op::Parameters{A, B, C});
 
-    auto manager = runtime::Manager::get("NGVM");
+    auto manager = runtime::Manager::get("CPU");
     auto external = manager->compile(f);
     auto backend = manager->allocate_backend();
     auto cf = backend->make_call_frame(external);
@@ -999,7 +998,7 @@ TEST(execute, select)
     ASSERT_EQ((vector<float>{11, 2, 3, 14, 15, 6, 17, 8}), result->get_vector());
 }
 
-TEST(execute, subtract)
+TEST(cpu, subtract)
 {
     auto shape = Shape{2, 2};
     auto A = make_shared<op::Parameter>(element::Float32::element_type(), shape);
@@ -1007,7 +1006,7 @@ TEST(execute, subtract)
     auto rt = make_shared<TensorViewType>(element::Float32::element_type(), shape);
     auto f = make_shared<Function>(make_shared<op::Subtract>(A, B), rt, op::Parameters{A, B});
 
-    auto manager = runtime::Manager::get("NGVM");
+    auto manager = runtime::Manager::get("CPU");
     auto external = manager->compile(f);
     auto backend = manager->allocate_backend();
     auto cf = backend->make_call_frame(external);
@@ -1023,6 +1022,7 @@ TEST(execute, subtract)
     ASSERT_EQ((vector<float>{1, 2, 4, 8}), result->get_vector());
 }
 
+/*
 TEST(execute, scalar_constant)
 {
     auto shape = Shape{};