Merge branch 'op_capture' of https://github.com/ROCmSoftwarePlatform/AMDMIGraphX into op_capture

src/include/migraphx/op/sign.hpp

+#ifndef MIGRAPHX_GUARD_OPERATORS_SIGN_HPP
+#define MIGRAPHX_GUARD_OPERATORS_SIGN_HPP
+
+#include <array>
+#include <migraphx/op/unary.hpp>
+#include <migraphx/operation.hpp>
+#include <migraphx/check_shapes.hpp>
+#include <migraphx/stringutils.hpp>
+#include <migraphx/streamutils.hpp>
+#include <migraphx/literal.hpp>
+#include <migraphx/shape_for_each.hpp>
+#include <migraphx/config.hpp>
+#include <cmath>
+#include <utility>
+
+namespace migraphx {
+inline namespace MIGRAPHX_INLINE_NS {
+namespace op {
+
+struct sign : unary<sign>
+{
+    auto apply() const
+    {
+        return [](auto x) { return (x > 0 ? 1 : ((x < 0) ? -1 : 0)); };
+    }
+};
+
+} // namespace op
+} // namespace MIGRAPHX_INLINE_NS
+} // namespace migraphx
+
+#endif

src/include/migraphx/operators.hpp

@@ -59,6 +59,7 @@
 #include <migraphx/op/rsqrt.hpp>
 #include <migraphx/op/scalar.hpp>
 #include <migraphx/op/sigmoid.hpp>
+#include <migraphx/op/sign.hpp>
 #include <migraphx/op/sinh.hpp>
 #include <migraphx/op/sin.hpp>
 #include <migraphx/op/slice.hpp>

src/onnx/onnx.cpp

@@ -55,6 +55,7 @@ struct onnx_parser
         add_generic_op("Acos", op::acos{});
         add_generic_op("Atan", op::atan{});
         add_generic_op("Sqrt", op::sqrt{});
+        add_generic_op("Sign", op::sign{});
 
         add_binary_op("Add", op::add{});
         add_binary_op("Div", op::div{});

src/targets/gpu/CMakeLists.txt

@@ -46,6 +46,7 @@ add_library(migraphx_device
     device/reduce_mean.cpp
     device/pow.cpp
     device/sqdiff.cpp
+    device/sign.cpp
 )
 set_target_properties(migraphx_device PROPERTIES EXPORT_NAME device)
 rocm_clang_tidy_check(migraphx_device)

src/targets/gpu/device/sign.cpp

+#include <migraphx/gpu/device/sign.hpp>
+#include <migraphx/gpu/device/nary.hpp>
+#include <migraphx/gpu/device/types.hpp>
+
+namespace migraphx {
+inline namespace MIGRAPHX_INLINE_NS {
+namespace gpu {
+namespace device {
+
+void sign(hipStream_t stream, const argument& result, const argument& arg)
+{
+    nary(stream, result, arg)([](auto x) { return (x > 0 ? 1 : ((x < 0) ? -1 : 0)); });
+}
+
+} // namespace device
+} // namespace gpu
+} // namespace MIGRAPHX_INLINE_NS
+} // namespace migraphx

src/targets/gpu/include/migraphx/gpu/device/sign.hpp

+#ifndef MIGRAPHX_GUARD_RTGLIB_DEVICE_SIGN_HPP
+#define MIGRAPHX_GUARD_RTGLIB_DEVICE_SIGN_HPP
+
+#include <migraphx/argument.hpp>
+#include <migraphx/config.hpp>
+#include <hip/hip_runtime_api.h>
+
+namespace migraphx {
+inline namespace MIGRAPHX_INLINE_NS {
+namespace gpu {
+namespace device {
+
+void sign(hipStream_t stream, const argument& result, const argument& arg);
+
+} // namespace device
+} // namespace gpu
+} // namespace MIGRAPHX_INLINE_NS
+} // namespace migraphx
+
+#endif

src/targets/gpu/include/migraphx/gpu/sign.hpp

+#ifndef MIGRAPHX_GUARD_RTGLIB_SIGN_HPP
+#define MIGRAPHX_GUARD_RTGLIB_SIGN_HPP
+
+#include <migraphx/gpu/oper.hpp>
+#include <migraphx/gpu/device/sign.hpp>
+
+namespace migraphx {
+inline namespace MIGRAPHX_INLINE_NS {
+namespace gpu {
+
+struct hip_sign : unary_device<hip_sign, device::sign>
+{
+};
+
+} // namespace gpu
+} // namespace MIGRAPHX_INLINE_NS
+} // namespace migraphx
+
+#endif

src/targets/gpu/lowering.cpp

@@ -32,6 +32,7 @@
 #include <migraphx/gpu/erf.hpp>
 #include <migraphx/gpu/log.hpp>
 #include <migraphx/gpu/sin.hpp>
+#include <migraphx/gpu/sign.hpp>
 #include <migraphx/gpu/cos.hpp>
 #include <migraphx/gpu/tan.hpp>
 #include <migraphx/gpu/sinh.hpp>
@@ -114,6 +115,7 @@ struct miopen_apply
         add_generic_op<hip_rsqrt>("rsqrt");
         add_generic_op<hip_pow>("pow");
         add_generic_op<hip_sqdiff>("sqdiff");
+        add_generic_op<hip_sign>("sign");
 
         add_extend_op<miopen_gemm, op::dot>("dot");
         add_extend_op<rocblas_quant_gemm, op::quant_dot>("quant_dot");

src/tf/tf.cpp

@@ -181,6 +181,7 @@ struct tf_parser
         add_mem_op("Pack", &tf_parser::parse_pack, false);
         add_mem_op("Pad", &tf_parser::parse_pad);
         add_mem_op("Reshape", &tf_parser::parse_reshape, false);
+        add_mem_op("Slice", &tf_parser::parse_slice, false);
         add_mem_op("Softmax", &tf_parser::parse_softmax<op::softmax>);
         add_mem_op("Squeeze", &tf_parser::parse_squeeze, false);
         add_mem_op("StridedSlice", &tf_parser::parse_stridedslice);
@@ -733,6 +734,29 @@ struct tf_parser
         }
     }
 
+    instruction_ref
+    parse_slice(const std::string&, const attribute_map&, std::vector<instruction_ref> args)
+    {
+        op::slice op;
+        auto starts     = args[1]->eval().get<int32_t>().to_vector();
+        auto size       = args[2]->eval().get<int32_t>().to_vector();
+        auto axes       = args[0]->get_shape().lens();
+        size_t num_axes = axes.size();
+
+        op.starts = std::vector<int64_t>(starts.begin(), starts.end());
+        op.ends   = std::vector<int64_t>(num_axes);
+        op.axes   = std::vector<int64_t>(num_axes);
+        std::iota(op.axes.begin(), op.axes.end(), 0);
+        for(size_t i = 0; i < num_axes; i++)
+        {
+            if(size[i] == -1)
+                op.ends[i] = axes[i];
+            else
+                op.ends[i] = starts[i] + size[i];
+        }
+        return prog.add_instruction(op, make_contiguous(args[0]));
+    }
+
     // template to facilitate the logsoftmax later
     template <class Op>
     instruction_ref parse_softmax(const std::string&,

test/cpu_ops_test.cpp

@@ -558,6 +558,21 @@ TEST_CASE(sqrt_test)
     EXPECT(migraphx::verify_range(results_vector, gold));
 }
 
+TEST_CASE(sign_test)
+{
+    migraphx::program p;
+    migraphx::shape s{migraphx::shape::float_type, {5}};
+    auto l = p.add_literal(
+        migraphx::literal{s, {1.02481645, 0.85643062, -0.03404123, -0.92791926, 0.0}});
+    p.add_instruction(migraphx::op::sign{}, l);
+    p.compile(migraphx::cpu::target{});
+    auto result = p.eval({});
+    std::vector<float> results_vector;
+    result.visit([&](auto output) { results_vector.assign(output.begin(), output.end()); });
+    std::vector<float> gold = {1.0, 1.0, -1.0, -1.0, 0.0};
+    EXPECT(migraphx::verify_range(results_vector, gold));
+}
+
 TEST_CASE(log_test)
 {
     migraphx::program p;

test/gpu/miopen.cpp

@@ -268,6 +268,18 @@ struct test_sqrt : verify_program<test_sqrt>
     }
 };
 
+struct test_sign : verify_program<test_sign>
+{
+    migraphx::program create_program() const
+    {
+        migraphx::program p;
+        migraphx::shape s{migraphx::shape::double_type, {2, 3, 4, 6}};
+        auto param = p.add_parameter("x", s);
+        p.add_instruction(migraphx::op::sign{}, param);
+        return p;
+    }
+};
+
 struct test_log : verify_program<test_log>
 {
     migraphx::program create_program() const

test/onnx/onnx_test.cpp

@@ -212,6 +212,16 @@ TEST_CASE(sqrt_test)
     EXPECT(p == prog);
 }
 
+TEST_CASE(sign_test)
+{
+    migraphx::program p;
+    auto input = p.add_parameter("x", migraphx::shape{migraphx::shape::double_type, {10, 5}});
+    p.add_instruction(migraphx::op::sign{}, input);
+
+    auto prog = migraphx::parse_onnx("sign_test.onnx");
+    EXPECT(p == prog);
+}
+
 TEST_CASE(log_test)
 {
     migraphx::program p;

test/onnx/sign_test.onnx

+sign-example:C
+
+
x
y"Sign	test_signZ
+
x
+
+
+
+b
+
y
+
+
+
+B	
\ No newline at end of file

test/tf/tf_test.cpp

@@ -412,6 +412,26 @@ TEST_CASE(rsqrt_test)
     EXPECT(p == prog);
 }
 
+TEST_CASE(slice_test)
+{
+    migraphx::program p;
+    std::size_t num_axes = 2;
+    auto l0 = p.add_parameter("0", migraphx::shape{migraphx::shape::float_type, {5, 10}});
+    migraphx::shape s0{migraphx::shape::int32_type, {num_axes}};
+    p.add_literal(migraphx::literal{s0, {1, 0}});
+    p.add_literal(migraphx::literal{s0, {2, -1}});
+
+    migraphx::op::slice op;
+    op.starts = {1, 0};
+    op.ends   = {3, 10};
+    op.axes   = std::vector<int64_t>(num_axes);
+    std::iota(op.axes.begin(), op.axes.end(), 0);
+    p.add_instruction(op, l0);
+    auto prog = optimize_tf("slice_test.pb", false);
+
+    EXPECT(p == prog);
+}
+
 TEST_CASE(softmax_test)
 {
     migraphx::program p;