resolve conflict

src/ngraph/runtime/gpu/gpu_external_function.cpp

@@ -160,13 +160,12 @@ static StaticInitializers s_static_initializers;
 
 #define TI(x) type_index(typeid(x))
 
-<<<<<<< HEAD
 static const ngraph::runtime::gpu::OpMap dispatcher{
     {TI(ngraph::op::Add), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Add>},
     {TI(ngraph::op::Dot), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Dot>},
     {TI(ngraph::op::Multiply), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Multiply>},
     {TI(ngraph::op::Parameter), &ngraph::runtime::gpu::GPU_Emitter::nop},
-    {TI(ngraph::op::Abs), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Abs>},
+    {TI(ngraph::op::Abs), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
     {TI(ngraph::op::Concat), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Concat>},
     {TI(ngraph::op::Divide), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Divide>},
     {TI(ngraph::op::Equal), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Equal>},
@@ -176,7 +175,7 @@ static const ngraph::runtime::gpu::OpMap dispatcher{
     {TI(ngraph::op::GreaterEq), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::GreaterEq>},
     {TI(ngraph::op::Less), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Less>},
     {TI(ngraph::op::LessEq), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::LessEq>},
-    {TI(ngraph::op::Log), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Log>},
+    {TI(ngraph::op::Log), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
     {TI(ngraph::op::Maximum), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Maximum>},
     {TI(ngraph::op::Minimum), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Minimum>},
     {TI(ngraph::op::Negative), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Negative>},
@@ -191,24 +190,24 @@ static const ngraph::runtime::gpu::OpMap dispatcher{
     {TI(ngraph::op::FunctionCall),
      &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::FunctionCall>},
     {TI(ngraph::op::Reduce), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Reduce>},
-    {TI(ngraph::op::Sign), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Sign>},
+    {TI(ngraph::op::Sign), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
     {TI(ngraph::op::Slice), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Slice>},
     {TI(ngraph::op::Sum), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Sum>},
-    {TI(ngraph::op::Exp), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Exp>},
-    {TI(ngraph::op::Sin), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Sin>},
-    {TI(ngraph::op::Sinh), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Sinh>},
-    {TI(ngraph::op::Cos), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Cos>},
-    {TI(ngraph::op::Cosh), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Cosh>},
-    {TI(ngraph::op::Tan), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Tan>},
-    {TI(ngraph::op::Tanh), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Tanh>},
-    {TI(ngraph::op::Asin), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Asin>},
-    {TI(ngraph::op::Acos), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Acos>},
-    {TI(ngraph::op::Atan), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Atan>},
+    {TI(ngraph::op::Exp), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
+    {TI(ngraph::op::Sin), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
+    {TI(ngraph::op::Sinh), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
+    {TI(ngraph::op::Cos), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
+    {TI(ngraph::op::Cosh), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
+    {TI(ngraph::op::Tan), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
+    {TI(ngraph::op::Tanh), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
+    {TI(ngraph::op::Asin), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
+    {TI(ngraph::op::Acos), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
+    {TI(ngraph::op::Atan), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
     {TI(ngraph::op::ReplaceSlice),
      &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::ReplaceSlice>},
     {TI(ngraph::op::OneHot), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::OneHot>},
-    {TI(ngraph::op::Floor), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Floor>},
-    {TI(ngraph::op::Ceiling), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Ceiling>},
+    {TI(ngraph::op::Floor), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
+    {TI(ngraph::op::Ceiling), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
     {TI(ngraph::op::Sqrt), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Sqrt>},
     {TI(ngraph::op::Convolution),
      &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Convolution>},
@@ -216,7 +215,7 @@ static const ngraph::runtime::gpu::OpMap dispatcher{
      &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::ConvolutionBackpropFilters>},
     {TI(ngraph::op::ConvolutionBackpropData),
      &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::ConvolutionBackpropData>},
-    {TI(ngraph::op::Not), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Not>},
+    {TI(ngraph::op::Not), &ngraph::runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
     {TI(ngraph::op::MaxPool), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::MaxPool>},
     {TI(ngraph::op::Reverse), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Reverse>},
     {TI(ngraph::op::Result), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Result>},
@@ -240,60 +239,6 @@ static const ngraph::runtime::gpu::OpMap dispatcher{
     {TI(ngraph::op::ReluBackprop),
      &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::ReluBackprop>},
     {TI(ngraph::op::Softmax), &ngraph::runtime::gpu::GPU_Emitter::emit<ngraph::op::Softmax>},
-=======
-static const runtime::gpu::OpMap dispatcher{
-    {TI(ngraph::op::Add), &runtime::gpu::GPU_Emitter::EmitAdd},
-    {TI(ngraph::op::Dot), &runtime::gpu::GPU_Emitter::EmitDot},
-    {TI(ngraph::op::Multiply), &runtime::gpu::GPU_Emitter::EmitMultiply},
-    {TI(ngraph::op::Parameter), &runtime::gpu::GPU_Emitter::EmitNop},
-    {TI(ngraph::op::Abs), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Concat), &runtime::gpu::GPU_Emitter::EmitConcat},
-    {TI(ngraph::op::Divide), &runtime::gpu::GPU_Emitter::EmitDivide},
-    {TI(ngraph::op::Equal), &runtime::gpu::GPU_Emitter::EmitEqual},
-    {TI(ngraph::op::Greater), &runtime::gpu::GPU_Emitter::EmitGreater},
-    {TI(ngraph::op::GreaterEq), &runtime::gpu::GPU_Emitter::EmitGreaterEq},
-    {TI(ngraph::op::Less), &runtime::gpu::GPU_Emitter::EmitLess},
-    {TI(ngraph::op::LessEq), &runtime::gpu::GPU_Emitter::EmitLessEq},
-    {TI(ngraph::op::Log), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Maximum), &runtime::gpu::GPU_Emitter::EmitMaximum},
-    {TI(ngraph::op::Minimum), &runtime::gpu::GPU_Emitter::EmitMinimum},
-    {TI(ngraph::op::Negative), &runtime::gpu::GPU_Emitter::EmitNegative},
-    {TI(ngraph::op::NotEqual), &runtime::gpu::GPU_Emitter::EmitNotEqual},
-    {TI(ngraph::op::Power), &runtime::gpu::GPU_Emitter::EmitPower},
-    {TI(ngraph::op::Select), &runtime::gpu::GPU_Emitter::EmitSelect},
-    {TI(ngraph::op::Subtract), &runtime::gpu::GPU_Emitter::EmitSubtract},
-    {TI(ngraph::op::Broadcast), &runtime::gpu::GPU_Emitter::EmitBroadcast},
-    {TI(ngraph::op::Convert), &runtime::gpu::GPU_Emitter::EmitConvert},
-    {TI(ngraph::op::Constant), &runtime::gpu::GPU_Emitter::EmitConstant},
-    {TI(ngraph::op::Reshape), &runtime::gpu::GPU_Emitter::EmitReshape},
-    {TI(ngraph::op::FunctionCall), &runtime::gpu::GPU_Emitter::EmitFunctionCall},
-    {TI(ngraph::op::Reduce), &runtime::gpu::GPU_Emitter::EmitReduce},
-    {TI(ngraph::op::Sign), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Slice), &runtime::gpu::GPU_Emitter::EmitSlice},
-    {TI(ngraph::op::Sum), &runtime::gpu::GPU_Emitter::EmitSum},
-    {TI(ngraph::op::Exp), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Sin), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Sinh), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Cos), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Cosh), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Tan), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Tanh), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Asin), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Acos), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Atan), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::ReplaceSlice), &runtime::gpu::GPU_Emitter::EmitReplaceSlice},
-    {TI(ngraph::op::OneHot), &runtime::gpu::GPU_Emitter::EmitOneHot},
-    {TI(ngraph::op::Floor), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Ceiling), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::Sqrt), &runtime::gpu::GPU_Emitter::EmitSqrt},
-    {TI(ngraph::op::Convolution), &runtime::gpu::GPU_Emitter::EmitConvolution},
-    {TI(ngraph::op::Not), &runtime::gpu::GPU_Emitter::EmitUnaryElementwise},
-    {TI(ngraph::op::MaxPool), &runtime::gpu::GPU_Emitter::EmitMaxPool},
-    {TI(ngraph::op::Reverse), &runtime::gpu::GPU_Emitter::EmitReverse},
-    {TI(ngraph::op::ReduceWindow), &runtime::gpu::GPU_Emitter::EmitReduceWindow},
-    {TI(ngraph::op::SelectAndScatter), &runtime::gpu::GPU_Emitter::EmitSelectAndScatter},
-    {TI(ngraph::op::Result), &runtime::gpu::GPU_Emitter::EmitResult},
->>>>>>> origin/master
 };
 
 ngraph::runtime::gpu::GPU_ExternalFunction::GPU_ExternalFunction(