Merge branch 'activationOperators' into addLogExpOperators

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

-#ifndef MIGRAPH_GUARD_RTGLIB_MIOPEN_LOWERING_HPP
-#define MIGRAPH_GUARD_RTGLIB_MIOPEN_LOWERING_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_MIOPEN_LOWERING_HPP
+#define MIGRAPHX_GUARD_RTGLIB_MIOPEN_LOWERING_HPP
 
 #include <migraphx/program.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/gpu/context.hpp>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct lowering
@@ -17,7 +17,7 @@ struct lowering
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_HPP
-#define MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_HPP
+#ifndef MIGRAPHX_GUARD_MIGRAPHLIB_MIOPEN_HPP
+#define MIGRAPHX_GUARD_MIGRAPHLIB_MIOPEN_HPP
 
 #include <migraphx/manage_ptr.hpp>
 #include <migraphx/operators.hpp>
@@ -7,21 +7,21 @@
 #include <migraphx/config.hpp>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
-using miopen_handle          = MIGRAPH_MANAGE_PTR(miopenHandle_t, miopenDestroy);
-using tensor_descriptor      = MIGRAPH_MANAGE_PTR(miopenTensorDescriptor_t,
-                                             miopenDestroyTensorDescriptor);
-using convolution_descriptor = MIGRAPH_MANAGE_PTR(miopenConvolutionDescriptor_t,
-                                                  miopenDestroyConvolutionDescriptor);
-using pooling_descriptor     = MIGRAPH_MANAGE_PTR(miopenPoolingDescriptor_t,
-                                              miopenDestroyPoolingDescriptor);
-using activation_descriptor  = MIGRAPH_MANAGE_PTR(miopenActivationDescriptor_t,
-                                                 miopenDestroyActivationDescriptor);
-using fusion_plan_descriptor = MIGRAPH_MANAGE_PTR(miopenFusionPlanDescriptor_t,
-                                                  miopenDestroyFusionPlan);
-using fused_operator_args    = MIGRAPH_MANAGE_PTR(miopenOperatorArgs_t, miopenDestroyOperatorArgs);
+using miopen_handle          = MIGRAPHX_MANAGE_PTR(miopenHandle_t, miopenDestroy);
+using tensor_descriptor      = MIGRAPHX_MANAGE_PTR(miopenTensorDescriptor_t,
+                                              miopenDestroyTensorDescriptor);
+using convolution_descriptor = MIGRAPHX_MANAGE_PTR(miopenConvolutionDescriptor_t,
+                                                   miopenDestroyConvolutionDescriptor);
+using pooling_descriptor     = MIGRAPHX_MANAGE_PTR(miopenPoolingDescriptor_t,
+                                               miopenDestroyPoolingDescriptor);
+using activation_descriptor  = MIGRAPHX_MANAGE_PTR(miopenActivationDescriptor_t,
+                                                  miopenDestroyActivationDescriptor);
+using fusion_plan_descriptor = MIGRAPHX_MANAGE_PTR(miopenFusionPlanDescriptor_t,
+                                                   miopenDestroyFusionPlan);
+using fused_operator_args    = MIGRAPHX_MANAGE_PTR(miopenOperatorArgs_t, miopenDestroyOperatorArgs);
 
 template <class Result, class F, class... Ts>
 Result make_obj(F f, Ts... xs)
@@ -30,7 +30,7 @@ Result make_obj(F f, Ts... xs)
     auto status                = f(&x, xs...);
     Result r{x};
     if(status != miopenStatusSuccess)
-        MIGRAPH_THROW("MIOpen call failed");
+        MIGRAPHX_THROW("MIOpen call failed");
     return r;
 }
 
@@ -46,7 +46,7 @@ inline tensor_descriptor make_tensor(const migraphx::shape& s)
     else if(s.type() == shape::half_type)
         d = miopenHalf;
     else
-        MIGRAPH_THROW("Unsupported type");
+        MIGRAPHX_THROW("Unsupported type");
     miopenSetTensorDescriptor(t.get(), d, s.lens().size(), lens.data(), strides.data());
     return t;
 }
@@ -147,7 +147,7 @@ inline fused_operator_args make_fused_args()
 }
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_RTGLIB_MUL_HPP
-#define MIGRAPH_GUARD_RTGLIB_MUL_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_MUL_HPP
+#define MIGRAPHX_GUARD_RTGLIB_MUL_HPP
 
 #include <migraphx/gpu/lowering.hpp>
 #include <migraphx/manage_ptr.hpp>
@@ -19,7 +19,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct hip_mul
@@ -31,7 +31,7 @@ struct hip_mul
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_RTGLIB_POOLING_HPP
-#define MIGRAPH_GUARD_RTGLIB_POOLING_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_POOLING_HPP
+#define MIGRAPHX_GUARD_RTGLIB_POOLING_HPP
 
 #include <migraphx/gpu/lowering.hpp>
 #include <migraphx/manage_ptr.hpp>
@@ -19,7 +19,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct miopen_pooling
@@ -35,7 +35,7 @@ struct miopen_pooling
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_RTGLIB_RELU_HPP
-#define MIGRAPH_GUARD_RTGLIB_RELU_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_RELU_HPP
+#define MIGRAPHX_GUARD_RTGLIB_RELU_HPP
 
 #include <migraphx/gpu/lowering.hpp>
 #include <migraphx/manage_ptr.hpp>
@@ -19,7 +19,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct miopen_relu
@@ -33,7 +33,7 @@ struct miopen_relu
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_MIGRAPHLIB_ROCBLAS_HPP
-#define MIGRAPH_GUARD_MIGRAPHLIB_ROCBLAS_HPP
+#ifndef MIGRAPHX_GUARD_MIGRAPHLIB_ROCBLAS_HPP
+#define MIGRAPHX_GUARD_MIGRAPHLIB_ROCBLAS_HPP
 
 #include <migraphx/manage_ptr.hpp>
 #include <migraphx/operators.hpp>
@@ -7,16 +7,16 @@
 #include <rocblas.h>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
-using rocblas_handle_ptr = MIGRAPH_MANAGE_PTR(rocblas_handle, rocblas_destroy_handle);
+using rocblas_handle_ptr = MIGRAPHX_MANAGE_PTR(rocblas_handle, rocblas_destroy_handle);
 
 rocblas_handle_ptr create_rocblas_handle_ptr();
 rocblas_handle_ptr create_rocblas_handle_ptr(hipStream_t s);
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_RTGLIB_SIGMOID_HPP
-#define MIGRAPH_GUARD_RTGLIB_SIGMOID_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_SIGMOID_HPP
+#define MIGRAPHX_GUARD_RTGLIB_SIGMOID_HPP
 
 #include <migraphx/gpu/lowering.hpp>
 #include <migraphx/manage_ptr.hpp>
@@ -19,7 +19,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct miopen_sigmoid
@@ -33,7 +33,7 @@ struct miopen_sigmoid
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_RTGLIB_SIN_HPP
-#define MIGRAPH_GUARD_RTGLIB_SIN_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_SIN_HPP
+#define MIGRAPHX_GUARD_RTGLIB_SIN_HPP
 
 #include <migraphx/gpu/lowering.hpp>
 #include <migraphx/manage_ptr.hpp>
@@ -19,7 +19,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct hip_sin
@@ -31,7 +31,7 @@ struct hip_sin
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_RTGLIB_SINH_HPP
-#define MIGRAPH_GUARD_RTGLIB_SINH_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_SINH_HPP
+#define MIGRAPHX_GUARD_RTGLIB_SINH_HPP
 
 #include <migraphx/gpu/lowering.hpp>
 #include <migraphx/manage_ptr.hpp>
@@ -19,7 +19,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct hip_sinh
@@ -31,7 +31,7 @@ struct hip_sinh
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_RTGLIB_SOFTMAX_HPP
-#define MIGRAPH_GUARD_RTGLIB_SOFTMAX_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_SOFTMAX_HPP
+#define MIGRAPHX_GUARD_RTGLIB_SOFTMAX_HPP
 
 #include <migraphx/gpu/lowering.hpp>
 #include <migraphx/manage_ptr.hpp>
@@ -19,7 +19,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct miopen_softmax
@@ -33,7 +33,7 @@ struct miopen_softmax
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_RTGLIB_TAN_HPP
-#define MIGRAPH_GUARD_RTGLIB_TAN_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_TAN_HPP
+#define MIGRAPHX_GUARD_RTGLIB_TAN_HPP
 
 #include <migraphx/gpu/lowering.hpp>
 #include <migraphx/manage_ptr.hpp>
@@ -21,7 +21,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct hip_tan
@@ -33,7 +33,7 @@ struct hip_tan
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_RTGLIB_TANH_HPP
-#define MIGRAPH_GUARD_RTGLIB_TANH_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_TANH_HPP
+#define MIGRAPHX_GUARD_RTGLIB_TANH_HPP
 
 #include <migraphx/gpu/lowering.hpp>
 #include <migraphx/manage_ptr.hpp>
@@ -19,7 +19,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct miopen_tanh
@@ -33,7 +33,7 @@ struct miopen_tanh
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_TARGET_HPP
-#define MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_TARGET_HPP
+#ifndef MIGRAPHX_GUARD_MIGRAPHLIB_MIOPEN_TARGET_HPP
+#define MIGRAPHX_GUARD_MIGRAPHLIB_MIOPEN_TARGET_HPP
 
 #include <migraphx/program.hpp>
 #include <migraphx/config.hpp>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct target
@@ -16,7 +16,7 @@ struct target
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

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

-#ifndef MIGRAPH_GUARD_RTGLIB_MIOPEN_WRITE_LITERALS_HPP
-#define MIGRAPH_GUARD_RTGLIB_MIOPEN_WRITE_LITERALS_HPP
+#ifndef MIGRAPHX_GUARD_RTGLIB_MIOPEN_WRITE_LITERALS_HPP
+#define MIGRAPHX_GUARD_RTGLIB_MIOPEN_WRITE_LITERALS_HPP
 
 #include <migraphx/program.hpp>
 #include <migraphx/gpu/context.hpp>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 
 namespace gpu {
 
@@ -18,7 +18,7 @@ struct write_literals
 };
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx
 
 #endif

src/targets/gpu/leaky_relu.cpp

@@ -5,7 +5,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 shape miopen_leaky_relu::compute_shape(const std::vector<shape>& inputs) const
@@ -34,5 +34,5 @@ argument miopen_leaky_relu::compute(context& ctx,
 }
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx

src/targets/gpu/lowering.cpp

@@ -42,7 +42,7 @@
 #include <functional>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 struct miopen_apply
@@ -228,5 +228,5 @@ struct miopen_apply
 
 void lowering::apply(program& p) const { miopen_apply{&p, ctx}.apply(); }
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx

src/targets/gpu/mul.cpp

@@ -5,7 +5,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 shape hip_mul::compute_shape(const std::vector<shape>& inputs) const
@@ -22,5 +22,5 @@ argument hip_mul::compute(context& ctx, const shape&, const std::vector<argument
 }
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx

src/targets/gpu/pooling.cpp

@@ -5,7 +5,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 shape miopen_pooling::compute_shape(const std::vector<shape>& inputs) const
@@ -38,5 +38,5 @@ argument miopen_pooling::compute(context& ctx,
 }
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx

src/targets/gpu/relu.cpp

@@ -5,7 +5,7 @@
 #include <utility>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 shape miopen_relu::compute_shape(const std::vector<shape>& inputs) const
@@ -34,5 +34,5 @@ argument miopen_relu::compute(context& ctx,
 }
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx

src/targets/gpu/rocblas.cpp

 #include <migraphx/gpu/rocblas.hpp>
 
 namespace migraphx {
-inline namespace MIGRAPH_INLINE_NS {
+inline namespace MIGRAPHX_INLINE_NS {
 namespace gpu {
 
 rocblas_handle_ptr create_rocblas_handle_ptr()
@@ -19,5 +19,5 @@ rocblas_handle_ptr create_rocblas_handle_ptr(hipStream_t s)
 }
 
 } // namespace gpu
-} // namespace MIGRAPH_INLINE_NS
+} // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx