Fixed conflicts

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

@@ -2,9 +2,11 @@
 #define MIGRAPH_GUARD_RTGLIB_MIOPEN_LOWERING_HPP
 
 #include <migraph/program.hpp>
+#include <migraph/config.hpp>
 #include <migraph/gpu/context.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct lowering
@@ -15,7 +17,7 @@ struct lowering
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -4,8 +4,10 @@
 #include <migraph/manage_ptr.hpp>
 #include <migraph/operators.hpp>
 #include <miopen/miopen.h>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 using miopen_handle          = MIGRAPH_MANAGE_PTR(miopenHandle_t, miopenDestroy);
@@ -115,7 +117,7 @@ inline fused_operator_args make_fused_args()
 }
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -7,6 +7,7 @@
 #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>
@@ -18,6 +19,7 @@
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct hip_mul
@@ -29,7 +31,7 @@ struct hip_mul
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -7,6 +7,7 @@
 #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>
@@ -18,6 +19,7 @@
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct miopen_pooling
@@ -33,7 +35,7 @@ struct miopen_pooling
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -7,6 +7,7 @@
 #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>
@@ -18,6 +19,7 @@
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct miopen_relu
@@ -31,7 +33,7 @@ struct miopen_relu
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -3,9 +3,11 @@
 
 #include <migraph/manage_ptr.hpp>
 #include <migraph/operators.hpp>
+#include <migraph/config.hpp>
 #include <rocblas.h>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 using rocblas_handle_ptr = MIGRAPH_MANAGE_PTR(rocblas_handle, rocblas_destroy_handle);
@@ -14,7 +16,7 @@ rocblas_handle_ptr create_rocblas_handle_ptr();
 rocblas_handle_ptr create_rocblas_handle_ptr(hipStream_t s);
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -7,6 +7,7 @@
 #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>
@@ -18,6 +19,7 @@
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct miopen_softmax
@@ -31,7 +33,7 @@ struct miopen_softmax
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -2,8 +2,10 @@
 #define MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_TARGET_HPP
 
 #include <migraph/program.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct target
@@ -12,7 +14,9 @@ struct target
     std::vector<pass> get_passes(migraph::context& gctx) const;
     migraph::context get_context() const;
 };
+
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -5,6 +5,7 @@
 #include <migraph/gpu/context.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 namespace gpu {
 
@@ -17,7 +18,7 @@ struct write_literals
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/targets/gpu/leaky_relu.cpp

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

src/targets/gpu/lowering.cpp

@@ -27,6 +27,7 @@
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct miopen_apply
@@ -220,4 +221,5 @@ struct miopen_apply
 
 void lowering::apply(program& p) const { miopen_apply{&p, ctx}.apply(); }
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/targets/gpu/mul.cpp

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

src/targets/gpu/pooling.cpp

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

src/targets/gpu/relu.cpp

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

src/targets/gpu/rocblas.cpp

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

src/targets/gpu/softmax.cpp

@@ -5,6 +5,7 @@
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 shape miopen_softmax::compute_shape(const std::vector<shape>& inputs) const
@@ -32,5 +33,5 @@ argument miopen_softmax::compute(context& ctx,
 }
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/targets/gpu/target.cpp

@@ -19,6 +19,7 @@
 #include <migraph/gpu/concat_gpu_opt.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 std::vector<pass> target::get_passes(migraph::context& gctx) const
@@ -60,4 +61,5 @@ std::string target::name() const { return "miopen"; }
 
 migraph::context target::get_context() const { return context{}; }
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/targets/gpu/write_literals.cpp

@@ -5,7 +5,7 @@
 #include <migraph/env.hpp>
 
 namespace migraph {
-
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 MIGRAPH_DECLARE_ENV_VAR(MIGRAPH_COPY_LITERALS)
@@ -51,5 +51,7 @@ void write_literals::apply(program& p) const
         }
     }
 }
+
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

test/auto_contiguous_test.cpp

@@ -14,6 +14,7 @@ struct contiguous_target
     migraph::context get_context() const { return {}; }
 };
 
+// TODO: Add this test case
 void literal_broadcast()
 {
     migraph::program p;
@@ -25,7 +26,7 @@ void literal_broadcast()
     EXPECT(not p.get_shape().broadcasted());
 }
 
-void literal_transpose()
+TEST_CASE(literal_transpose)
 {
     migraph::program p;
     p.add_literal(get_2x2_transposed());
@@ -36,7 +37,7 @@ void literal_transpose()
     EXPECT(not p.get_shape().transposed());
 }
 
-void after_literal_transpose()
+TEST_CASE(after_literal_transpose)
 {
     migraph::program p;
     auto l = p.add_literal(get_2x2());
@@ -51,7 +52,7 @@ void after_literal_transpose()
     EXPECT(not p.get_shape().transposed());
 }
 
-void after_literal_broadcast()
+TEST_CASE(after_literal_broadcast)
 {
     migraph::program p;
     auto l1 = p.add_literal(get_2x2());
@@ -67,7 +68,7 @@ void after_literal_broadcast()
     EXPECT(not p.get_shape().broadcasted());
 }
 
-void after_param_transpose()
+TEST_CASE(after_param_transpose)
 {
     migraph::program p;
     auto l = p.add_parameter("2x2", {migraph::shape::float_type, {2, 2}});
@@ -82,7 +83,7 @@ void after_param_transpose()
     EXPECT(not p.get_shape().transposed());
 }
 
-void after_param_broadcast()
+TEST_CASE(after_param_broadcast)
 {
     migraph::program p;
     auto l1 = p.add_parameter("2x2", {migraph::shape::float_type, {2, 2}});
@@ -98,12 +99,4 @@ void after_param_broadcast()
     EXPECT(not p.get_shape().broadcasted());
 }
 
-int main()
-{
-    // literal_broadcast();
-    literal_transpose();
-    after_literal_transpose();
-    after_literal_broadcast();
-    after_param_transpose();
-    after_param_broadcast();
-}
+int main(int argc, const char* argv[]) { test::run(argc, argv); }

test/common_subexpression_elimination_test.cpp

@@ -14,7 +14,7 @@ struct cse_target
     migraph::context get_context() const { return {}; }
 };
 
-void cse_test1()
+TEST_CASE(cse_test1)
 {
     migraph::program p1;
     {
@@ -38,7 +38,7 @@ void cse_test1()
     EXPECT(p1 == p2);
 }
 
-void cse_test2()
+TEST_CASE(cse_test2)
 {
     migraph::program p1;
     {
@@ -63,7 +63,7 @@ void cse_test2()
     EXPECT(p1 == p2);
 }
 
-void cse_test3()
+TEST_CASE(cse_test3)
 {
     migraph::program p1;
     {
@@ -86,7 +86,7 @@ void cse_test3()
     EXPECT(p1 == p2);
 }
 
-void cse_test4()
+TEST_CASE(cse_test4)
 {
     migraph::program p1;
     {
@@ -112,10 +112,4 @@ void cse_test4()
     EXPECT(p1 == p2);
 }
 
-int main()
-{
-    cse_test1();
-    cse_test2();
-    cse_test3();
-    cse_test4();
-}
+int main(int argc, const char* argv[]) { test::run(argc, argv); }