Merge branch 'develop' into ins_fp32_fp16

src/tf/tf.cpp

@@ -108,6 +108,7 @@ 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_binary_op("Add", op::add{});
         add_binary_op("Mul", op::mul{});

test/tf/relu6_test.pb

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

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

test/tf/tf_test.cpp

@@ -253,6 +253,16 @@ TEST_CASE(relu_test)
     EXPECT(p == prog);
 }
 
+TEST_CASE(relu6_test)
+{
+    migraphx::program p;
+    auto l0 = p.add_parameter("0", migraphx::shape{migraphx::shape::float_type, {1, 3, 16, 16}});
+    p.add_instruction(migraphx::op::clip{6.0, 0.0}, l0);
+    auto prog = migraphx::parse_tf("relu6_test.pb", false);
+
+    EXPECT(p == prog);
+}
+
 TEST_CASE(reshape_test)
 {
     migraphx::program p;