Merge branch 'develop' into tf-transpose

src/tf/tf.cpp

@@ -153,9 +153,11 @@ struct tf_parser
         add_generic_op("Identity", op::identity{});
         add_generic_op("Relu", op::relu{});
         add_generic_op("Relu6", op::clip{6.0, 0.0});
+        add_generic_op("Tanh", op::tanh{});
 
         add_binary_op("Add", op::add{});
         add_binary_op("Mul", op::mul{});
+        add_binary_op("Sub", op::sub{});
 
         add_mem_op("AvgPool", &tf_parser::parse_pooling);
         add_mem_op("BiasAdd", &tf_parser::parse_biasadd);

test/tf/sub_test.pb

+
+:
+
0Placeholder*
+shape:
*
+dtype0

+:
+
1Placeholder*
+shape:
*
+dtype0

+
+sub1Sub
0
1*
+
T0
"
\ No newline at end of file

test/tf/tanh_test.pb

+
+:
+
0Placeholder*
+dtype0
*
+shape:

+
+tanhTanh
0*
+
T0
"
\ No newline at end of file

test/tf/tf_test.cpp

@@ -367,4 +367,26 @@ TEST_CASE(stridedslice_test)
     EXPECT(p == prog);
 }
 
+TEST_CASE(sub_test)
+{
+    migraphx::program p;
+    auto l0 = p.add_parameter("0", migraphx::shape{migraphx::shape::float_type, {1, 2, 2, 3}});
+    auto l1 = p.add_parameter("1", migraphx::shape{migraphx::shape::float_type, {1, 2, 2, 3}});
+    p.add_instruction(migraphx::op::sub{}, l0, l1);
+    auto prog = migraphx::parse_tf("sub_test.pb", false);
+
+    EXPECT(p == prog);
+}
+
+TEST_CASE(tanh_test)
+{
+    migraphx::program p;
+    auto l0 = p.add_parameter("0", migraphx::shape{migraphx::shape::float_type, {1, 2, 2, 3}});
+    auto l1 = p.add_parameter("1", migraphx::shape{migraphx::shape::float_type, {1, 2, 2, 3}});
+    p.add_instruction(migraphx::op::sub{}, l0, l1);
+    auto prog = migraphx::parse_tf("sub_test.pb", false);
+
+    EXPECT(p == prog);
+}
+
 int main(int argc, const char* argv[]) { test::run(argc, argv); }