Merge branch 'master' into identity

src/targets/gpu/include/migraph/gpu/leaky_relu.hpp → src/targets/gpu/include/migraphx/gpu/leaky_relu.hpp

 #ifndef MIGRAPH_GUARD_RTGLIB_LEAKY_RELU_HPP
 #define MIGRAPH_GUARD_RTGLIB_LEAKY_RELU_HPP
 
-#include <migraph/gpu/lowering.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/instruction.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/generate.hpp>
-#include <migraph/shape_for_each.hpp>
-#include <migraph/config.hpp>
-#include <migraph/gpu/miopen.hpp>
-#include <migraph/gpu/hip.hpp>
-#include <migraph/dfor.hpp>
-#include <migraph/gpu/device/contiguous.hpp>
-#include <migraph/gpu/device/add.hpp>
-#include <migraph/iterator_for.hpp>
-#include <migraph/gpu/rocblas.hpp>
-#include <migraph/gpu/context.hpp>
+#include <migraphx/gpu/lowering.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/instruction.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/generate.hpp>
+#include <migraphx/shape_for_each.hpp>
+#include <migraphx/config.hpp>
+#include <migraphx/gpu/miopen.hpp>
+#include <migraphx/gpu/hip.hpp>
+#include <migraphx/dfor.hpp>
+#include <migraphx/gpu/device/contiguous.hpp>
+#include <migraphx/gpu/device/add.hpp>
+#include <migraphx/iterator_for.hpp>
+#include <migraphx/gpu/rocblas.hpp>
+#include <migraphx/gpu/context.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -34,6 +34,6 @@ struct miopen_leaky_relu
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx
 
 #endif

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

 #ifndef MIGRAPH_GUARD_RTGLIB_MIOPEN_LOWERING_HPP
 #define MIGRAPH_GUARD_RTGLIB_MIOPEN_LOWERING_HPP
 
-#include <migraph/program.hpp>
-#include <migraph/config.hpp>
-#include <migraph/gpu/context.hpp>
+#include <migraphx/program.hpp>
+#include <migraphx/config.hpp>
+#include <migraphx/gpu/context.hpp>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -18,6 +18,6 @@ struct lowering
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx
 
 #endif

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

 #ifndef MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_HPP
 #define MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_HPP
 
-#include <migraph/manage_ptr.hpp>
-#include <migraph/operators.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/operators.hpp>
 #include <miopen/miopen.h>
-#include <migraph/config.hpp>
+#include <migraphx/config.hpp>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -34,7 +34,7 @@ Result make_obj(F f, Ts... xs)
     return r;
 }
 
-inline tensor_descriptor make_tensor(const migraph::shape& s)
+inline tensor_descriptor make_tensor(const migraphx::shape& s)
 {
     auto t = make_obj<tensor_descriptor>(&miopenCreateTensorDescriptor);
     // Convert to ints
@@ -51,7 +51,7 @@ inline tensor_descriptor make_tensor(const migraph::shape& s)
     return t;
 }
 
-inline convolution_descriptor make_conv(const migraph::op::convolution& op)
+inline convolution_descriptor make_conv(const migraphx::op::convolution& op)
 {
     auto c = make_obj<convolution_descriptor>(&miopenCreateConvolutionDescriptor);
     miopenInitConvolutionDescriptor(c.get(),
@@ -65,7 +65,7 @@ inline convolution_descriptor make_conv(const migraph::op::convolution& op)
     return c;
 }
 
-inline pooling_descriptor make_pooling(const migraph::op::pooling& op)
+inline pooling_descriptor make_pooling(const migraphx::op::pooling& op)
 {
     miopenPoolingMode_t mode;
     if(op.mode == "max")
@@ -118,6 +118,6 @@ inline fused_operator_args make_fused_args()
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx
 
 #endif

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

 #ifndef MIGRAPH_GUARD_RTGLIB_MUL_HPP
 #define MIGRAPH_GUARD_RTGLIB_MUL_HPP
 
-#include <migraph/gpu/lowering.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/instruction.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/generate.hpp>
-#include <migraph/shape_for_each.hpp>
-#include <migraph/config.hpp>
-#include <migraph/gpu/miopen.hpp>
-#include <migraph/gpu/hip.hpp>
-#include <migraph/dfor.hpp>
-#include <migraph/gpu/device/contiguous.hpp>
-#include <migraph/gpu/device/mul.hpp>
-#include <migraph/iterator_for.hpp>
-#include <migraph/gpu/rocblas.hpp>
-#include <migraph/gpu/context.hpp>
+#include <migraphx/gpu/lowering.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/instruction.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/generate.hpp>
+#include <migraphx/shape_for_each.hpp>
+#include <migraphx/config.hpp>
+#include <migraphx/gpu/miopen.hpp>
+#include <migraphx/gpu/hip.hpp>
+#include <migraphx/dfor.hpp>
+#include <migraphx/gpu/device/contiguous.hpp>
+#include <migraphx/gpu/device/mul.hpp>
+#include <migraphx/iterator_for.hpp>
+#include <migraphx/gpu/rocblas.hpp>
+#include <migraphx/gpu/context.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -32,6 +32,6 @@ struct hip_mul
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx
 
 #endif

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

 #ifndef MIGRAPH_GUARD_RTGLIB_POOLING_HPP
 #define MIGRAPH_GUARD_RTGLIB_POOLING_HPP
 
-#include <migraph/gpu/lowering.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/instruction.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/generate.hpp>
-#include <migraph/shape_for_each.hpp>
-#include <migraph/config.hpp>
-#include <migraph/gpu/miopen.hpp>
-#include <migraph/gpu/hip.hpp>
-#include <migraph/dfor.hpp>
-#include <migraph/gpu/device/contiguous.hpp>
-#include <migraph/gpu/device/add.hpp>
-#include <migraph/iterator_for.hpp>
-#include <migraph/gpu/rocblas.hpp>
-#include <migraph/gpu/context.hpp>
+#include <migraphx/gpu/lowering.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/instruction.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/generate.hpp>
+#include <migraphx/shape_for_each.hpp>
+#include <migraphx/config.hpp>
+#include <migraphx/gpu/miopen.hpp>
+#include <migraphx/gpu/hip.hpp>
+#include <migraphx/dfor.hpp>
+#include <migraphx/gpu/device/contiguous.hpp>
+#include <migraphx/gpu/device/add.hpp>
+#include <migraphx/iterator_for.hpp>
+#include <migraphx/gpu/rocblas.hpp>
+#include <migraphx/gpu/context.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -36,6 +36,6 @@ struct miopen_pooling
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx
 
 #endif

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

 #ifndef MIGRAPH_GUARD_RTGLIB_RELU_HPP
 #define MIGRAPH_GUARD_RTGLIB_RELU_HPP
 
-#include <migraph/gpu/lowering.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/instruction.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/generate.hpp>
-#include <migraph/shape_for_each.hpp>
-#include <migraph/config.hpp>
-#include <migraph/gpu/miopen.hpp>
-#include <migraph/gpu/hip.hpp>
-#include <migraph/dfor.hpp>
-#include <migraph/gpu/device/contiguous.hpp>
-#include <migraph/gpu/device/add.hpp>
-#include <migraph/iterator_for.hpp>
-#include <migraph/gpu/rocblas.hpp>
-#include <migraph/gpu/context.hpp>
+#include <migraphx/gpu/lowering.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/instruction.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/generate.hpp>
+#include <migraphx/shape_for_each.hpp>
+#include <migraphx/config.hpp>
+#include <migraphx/gpu/miopen.hpp>
+#include <migraphx/gpu/hip.hpp>
+#include <migraphx/dfor.hpp>
+#include <migraphx/gpu/device/contiguous.hpp>
+#include <migraphx/gpu/device/add.hpp>
+#include <migraphx/iterator_for.hpp>
+#include <migraphx/gpu/rocblas.hpp>
+#include <migraphx/gpu/context.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -34,6 +34,6 @@ struct miopen_relu
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx
 
 #endif

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

 #ifndef MIGRAPH_GUARD_MIGRAPHLIB_ROCBLAS_HPP
 #define MIGRAPH_GUARD_MIGRAPHLIB_ROCBLAS_HPP
 
-#include <migraph/manage_ptr.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/config.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/config.hpp>
 #include <rocblas.h>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -17,6 +17,6 @@ rocblas_handle_ptr create_rocblas_handle_ptr(hipStream_t s);
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx
 
 #endif

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

 #ifndef MIGRAPH_GUARD_RTGLIB_SOFTMAX_HPP
 #define MIGRAPH_GUARD_RTGLIB_SOFTMAX_HPP
 
-#include <migraph/gpu/lowering.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/instruction.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/generate.hpp>
-#include <migraph/shape_for_each.hpp>
-#include <migraph/config.hpp>
-#include <migraph/gpu/miopen.hpp>
-#include <migraph/gpu/hip.hpp>
-#include <migraph/dfor.hpp>
-#include <migraph/gpu/device/contiguous.hpp>
-#include <migraph/gpu/device/add.hpp>
-#include <migraph/iterator_for.hpp>
-#include <migraph/gpu/rocblas.hpp>
-#include <migraph/gpu/context.hpp>
+#include <migraphx/gpu/lowering.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/instruction.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/generate.hpp>
+#include <migraphx/shape_for_each.hpp>
+#include <migraphx/config.hpp>
+#include <migraphx/gpu/miopen.hpp>
+#include <migraphx/gpu/hip.hpp>
+#include <migraphx/dfor.hpp>
+#include <migraphx/gpu/device/contiguous.hpp>
+#include <migraphx/gpu/device/add.hpp>
+#include <migraphx/iterator_for.hpp>
+#include <migraphx/gpu/rocblas.hpp>
+#include <migraphx/gpu/context.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -34,6 +34,6 @@ struct miopen_softmax
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx
 
 #endif

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

 #ifndef MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_TARGET_HPP
 #define MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_TARGET_HPP
 
-#include <migraph/program.hpp>
-#include <migraph/config.hpp>
+#include <migraphx/program.hpp>
+#include <migraphx/config.hpp>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct target
 {
     std::string name() const;
-    std::vector<pass> get_passes(migraph::context& gctx) const;
-    migraph::context get_context() const;
+    std::vector<pass> get_passes(migraphx::context& gctx) const;
+    migraphx::context get_context() const;
 };
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx
 
 #endif

src/targets/gpu/include/migraph/gpu/write_literals.hpp → 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
 
-#include <migraph/program.hpp>
-#include <migraph/gpu/context.hpp>
+#include <migraphx/program.hpp>
+#include <migraphx/gpu/context.hpp>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 
 namespace gpu {
@@ -19,6 +19,6 @@ struct write_literals
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx
 
 #endif

src/targets/gpu/leaky_relu.cpp

-#include <migraph/gpu/leaky_relu.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/gpu/miopen.hpp>
+#include <migraphx/gpu/leaky_relu.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/gpu/miopen.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -35,4 +35,4 @@ argument miopen_leaky_relu::compute(context& ctx,
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx

src/targets/gpu/lowering.cpp

 #include <rocblas.h>
-#include <migraph/gpu/lowering.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/instruction.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/generate.hpp>
-#include <migraph/shape_for_each.hpp>
-#include <migraph/gpu/miopen.hpp>
-#include <migraph/gpu/hip.hpp>
-#include <migraph/dfor.hpp>
-#include <migraph/gpu/device/contiguous.hpp>
-#include <migraph/gpu/device/add.hpp>
-#include <migraph/iterator_for.hpp>
-#include <migraph/gpu/rocblas.hpp>
-#include <migraph/gpu/context.hpp>
-#include <migraph/gpu/convolution.hpp>
-#include <migraph/gpu/contiguous.hpp>
-#include <migraph/gpu/relu.hpp>
-#include <migraph/gpu/leaky_relu.hpp>
-#include <migraph/gpu/softmax.hpp>
-#include <migraph/gpu/add.hpp>
-#include <migraph/gpu/mul.hpp>
-#include <migraph/gpu/batchnorm.hpp>
-#include <migraph/gpu/pooling.hpp>
-#include <migraph/gpu/gemm.hpp>
-#include <migraph/gpu/concat.hpp>
+#include <migraphx/gpu/lowering.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/instruction.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/generate.hpp>
+#include <migraphx/shape_for_each.hpp>
+#include <migraphx/gpu/miopen.hpp>
+#include <migraphx/gpu/hip.hpp>
+#include <migraphx/dfor.hpp>
+#include <migraphx/gpu/device/contiguous.hpp>
+#include <migraphx/gpu/device/add.hpp>
+#include <migraphx/iterator_for.hpp>
+#include <migraphx/gpu/rocblas.hpp>
+#include <migraphx/gpu/context.hpp>
+#include <migraphx/gpu/convolution.hpp>
+#include <migraphx/gpu/contiguous.hpp>
+#include <migraphx/gpu/relu.hpp>
+#include <migraphx/gpu/leaky_relu.hpp>
+#include <migraphx/gpu/softmax.hpp>
+#include <migraphx/gpu/add.hpp>
+#include <migraphx/gpu/mul.hpp>
+#include <migraphx/gpu/batchnorm.hpp>
+#include <migraphx/gpu/pooling.hpp>
+#include <migraphx/gpu/gemm.hpp>
+#include <migraphx/gpu/concat.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -222,4 +222,4 @@ struct miopen_apply
 void lowering::apply(program& p) const { miopen_apply{&p, ctx}.apply(); }
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx

src/targets/gpu/mul.cpp

-#include <migraph/gpu/mul.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/gpu/miopen.hpp>
+#include <migraphx/gpu/mul.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/gpu/miopen.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -23,4 +23,4 @@ argument hip_mul::compute(context& ctx, const shape&, const std::vector<argument
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx

src/targets/gpu/pooling.cpp

-#include <migraph/gpu/pooling.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/gpu/miopen.hpp>
+#include <migraphx/gpu/pooling.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/gpu/miopen.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -39,4 +39,4 @@ argument miopen_pooling::compute(context& ctx,
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx

src/targets/gpu/relu.cpp

-#include <migraph/gpu/relu.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/gpu/miopen.hpp>
+#include <migraphx/gpu/relu.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/gpu/miopen.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -35,4 +35,4 @@ argument miopen_relu::compute(context& ctx,
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx

src/targets/gpu/rocblas.cpp

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

src/targets/gpu/softmax.cpp

-#include <migraph/gpu/softmax.hpp>
-#include <migraph/operators.hpp>
-#include <migraph/manage_ptr.hpp>
-#include <migraph/gpu/miopen.hpp>
+#include <migraphx/gpu/softmax.hpp>
+#include <migraphx/operators.hpp>
+#include <migraphx/manage_ptr.hpp>
+#include <migraphx/gpu/miopen.hpp>
 #include <utility>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -34,4 +34,4 @@ argument miopen_softmax::compute(context& ctx,
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx

src/targets/gpu/target.cpp

-#include <migraph/gpu/target.hpp>
-#include <migraph/gpu/lowering.hpp>
-#include <migraph/memory_coloring.hpp>
-#include <migraph/gpu/write_literals.hpp>
-#include <migraph/gpu/context.hpp>
-#include <migraph/gpu/eliminate_workspace.hpp>
-#include <migraph/eliminate_allocation.hpp>
-#include <migraph/gpu/fuse_ops.hpp>
-#include <migraph/check_context.hpp>
-#include <migraph/auto_contiguous.hpp>
-#include <migraph/dead_code_elimination.hpp>
-#include <migraph/simplify_reshapes.hpp>
-#include <migraph/simplify_algebra.hpp>
-#include <migraph/constant_propagate.hpp>
-#include <migraph/eliminate_contiguous.hpp>
-#include <migraph/common_subexpression_elimination.hpp>
-#include <migraph/fwd_conv_batchnorm_rewrite.hpp>
-#include <migraph/eliminate_concat.hpp>
-#include <migraph/gpu/concat_gpu_opt.hpp>
+#include <migraphx/gpu/target.hpp>
+#include <migraphx/gpu/lowering.hpp>
+#include <migraphx/memory_coloring.hpp>
+#include <migraphx/gpu/write_literals.hpp>
+#include <migraphx/gpu/context.hpp>
+#include <migraphx/gpu/eliminate_workspace.hpp>
+#include <migraphx/eliminate_allocation.hpp>
+#include <migraphx/gpu/fuse_ops.hpp>
+#include <migraphx/check_context.hpp>
+#include <migraphx/auto_contiguous.hpp>
+#include <migraphx/dead_code_elimination.hpp>
+#include <migraphx/simplify_reshapes.hpp>
+#include <migraphx/simplify_algebra.hpp>
+#include <migraphx/constant_propagate.hpp>
+#include <migraphx/eliminate_contiguous.hpp>
+#include <migraphx/common_subexpression_elimination.hpp>
+#include <migraphx/fwd_conv_batchnorm_rewrite.hpp>
+#include <migraphx/eliminate_concat.hpp>
+#include <migraphx/gpu/concat_gpu_opt.hpp>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
-std::vector<pass> target::get_passes(migraph::context& gctx) const
+std::vector<pass> target::get_passes(migraphx::context& gctx) const
 {
     auto& ctx = any_cast<context>(gctx);
     // clang-format off
@@ -59,7 +59,7 @@ std::vector<pass> target::get_passes(migraph::context& gctx) const
 
 std::string target::name() const { return "miopen"; }
 
-migraph::context target::get_context() const { return context{}; }
+migraphx::context target::get_context() const { return context{}; }
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx

src/targets/gpu/write_literals.cpp

-#include <migraph/gpu/write_literals.hpp>
-#include <migraph/iterator_for.hpp>
-#include <migraph/gpu/hip.hpp>
-#include <migraph/instruction.hpp>
-#include <migraph/env.hpp>
+#include <migraphx/gpu/write_literals.hpp>
+#include <migraphx/iterator_for.hpp>
+#include <migraphx/gpu/hip.hpp>
+#include <migraphx/instruction.hpp>
+#include <migraphx/env.hpp>
 
-namespace migraph {
+namespace migraphx {
 inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
@@ -54,4 +54,4 @@ void write_literals::apply(program& p) const
 
 } // namespace gpu
 } // namespace MIGRAPH_INLINE_NS
-} // namespace migraph
+} // namespace migraphx

test/CMakeLists.txt

@@ -83,7 +83,7 @@ function(add_test_executable TEST_NAME)
     add_dependencies(tests ${TEST_NAME})
     add_dependencies(check ${TEST_NAME})
     set_tests_properties(${TEST_NAME} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED")
-    target_link_libraries(${TEST_NAME} migraph migraph_cpu migraph_onnx)
+    target_link_libraries(${TEST_NAME} migraphx migraphx_cpu migraphx_onnx)
     target_include_directories(${TEST_NAME} PUBLIC include)
 endfunction(add_test_executable)
 
@@ -107,14 +107,14 @@ if(MIGRAPH_ENABLE_GPU)
             COST 10 
             RESOURCE_LOCK gpu
         )
-        target_link_libraries(test_gpu_${BASE_NAME} migraph_gpu)
+        target_link_libraries(test_gpu_${BASE_NAME} migraphx_gpu)
     endforeach()
 endif()
 
 # Onnx test
 add_executable(test_onnx onnx/onnx_test.cpp)
 rocm_clang_tidy_check(test_onnx)
-target_link_libraries(test_onnx migraph_onnx)
+target_link_libraries(test_onnx migraphx_onnx)
 target_include_directories(test_onnx PUBLIC include)
 add_test(NAME test_onnx COMMAND $<TARGET_FILE:test_onnx> WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/onnx) 
 add_dependencies(tests test_onnx)
@@ -143,13 +143,13 @@ function(test_headers PREFIX)
         get_filename_component(BASE_NAME ${HEADER} NAME_WE)
         test_header(header_${TEST_NAME} ${PREFIX}/${BASE_NAME}.hpp)
         if(MIGRAPH_ENABLE_GPU)
-            target_link_libraries(header_${TEST_NAME} migraph_gpu)
+            target_link_libraries(header_${TEST_NAME} migraphx_gpu)
         endif()
     endforeach()
 endfunction()
 
-test_headers(migraph ${CMAKE_SOURCE_DIR}/src/include/migraph/*.hpp)
-test_headers(migraph/cpu ${CMAKE_SOURCE_DIR}/src/targets/cpu/include/migraph/cpu/*.hpp)
+test_headers(migraphx ${CMAKE_SOURCE_DIR}/src/include/migraphx/*.hpp)
+test_headers(migraphx/cpu ${CMAKE_SOURCE_DIR}/src/targets/cpu/include/migraphx/cpu/*.hpp)
 if(MIGRAPH_ENABLE_GPU)
-test_headers(migraph/gpu ${CMAKE_SOURCE_DIR}/src/targets/gpu/include/migraph/gpu/*.hpp)
+test_headers(migraphx/gpu ${CMAKE_SOURCE_DIR}/src/targets/gpu/include/migraphx/gpu/*.hpp)
 endif()