Merge pull request #106 from ROCmSoftwarePlatform/inlinenamespace

Inlinenamespace

src/targets/gpu/eliminate_workspace.cpp

@@ -9,6 +9,7 @@
 #include <migraph/pass_config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 void eliminate_workspace::apply(program& p) const
@@ -38,5 +39,7 @@ void eliminate_workspace::apply(program& p) const
         p.remove_instruction(a);
     }
 }
+
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/targets/gpu/fuse_ops.cpp

@@ -6,7 +6,7 @@
 #include <migraph/instruction.hpp>
 
 namespace migraph {
-
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct fusion
@@ -382,5 +382,5 @@ void fuse_ops::apply(program& p) const
 }
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/targets/gpu/gemm.cpp

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

src/targets/gpu/hip.cpp

@@ -7,6 +7,7 @@
 #include <vector>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 using hip_ptr = MIGRAPH_MANAGE_PTR(void, hipFree);
@@ -107,5 +108,7 @@ void copy_to_gpu(argument src, argument dst)
     if(status != hipSuccess)
         MIGRAPH_THROW("Copy to gpu failed: " + hip_error(status));
 }
+
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

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

@@ -15,9 +15,11 @@
 #include <migraph/iterator_for.hpp>
 #include <migraph/gpu/rocblas.hpp>
 #include <migraph/gpu/context.hpp>
+#include <migraph/config.hpp>
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct hip_add
@@ -38,7 +40,7 @@ struct miopen_add
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -15,9 +15,11 @@
 #include <migraph/iterator_for.hpp>
 #include <migraph/gpu/rocblas.hpp>
 #include <migraph/gpu/context.hpp>
+#include <migraph/config.hpp>
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct miopen_batch_norm_inference
@@ -31,7 +33,7 @@ struct miopen_batch_norm_inference
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/targets/gpu/include/migraph/gpu/concat.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_concat
@@ -32,7 +34,7 @@ struct hip_concat
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -5,8 +5,10 @@
 #include <migraph/gpu/rocblas.hpp>
 #include <migraph/gpu/hip.hpp>
 #include <migraph/env.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 MIGRAPH_DECLARE_ENV_VAR(MIGRAPH_DISABLE_NULL_STREAM)
@@ -114,6 +116,7 @@ struct context
     std::shared_ptr<hip_device> current_device;
 };
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/targets/gpu/include/migraph/gpu/contiguous.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_contiguous
@@ -30,7 +32,7 @@ struct miopen_contiguous
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/targets/gpu/include/migraph/gpu/convolution.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_convolution
@@ -42,7 +44,7 @@ struct miopen_convolution
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/targets/gpu/include/migraph/gpu/device/add.hpp

@@ -3,9 +3,11 @@
 #define MIGRAPH_GUARD_RTGLIB_DEVICE_ADD_HPP
 
 #include <migraph/argument.hpp>
+#include <migraph/config.hpp>
 #include <hip/hip_runtime_api.h>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 namespace device {
 
@@ -19,6 +21,7 @@ void add(hipStream_t stream,
 
 } // namespace device
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/targets/gpu/include/migraph/gpu/device/add_relu.hpp

@@ -3,9 +3,11 @@
 #define MIGRAPH_GUARD_RTGLIB_DEVICE_ADD_RELU_HPP
 
 #include <migraph/argument.hpp>
+#include <migraph/config.hpp>
 #include <hip/hip_runtime_api.h>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 namespace device {
 
@@ -22,6 +24,7 @@ void add_relu(hipStream_t stream,
 
 } // namespace device
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/targets/gpu/include/migraph/gpu/device/concat.hpp

@@ -2,9 +2,11 @@
 #define MIGRAPH_GUARD_RTGLIB_DEVICE_CONCAT_HPP
 
 #include <migraph/argument.hpp>
+#include <migraph/config.hpp>
 #include <hip/hip_runtime_api.h>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 namespace device {
 
@@ -15,6 +17,7 @@ argument concat(hipStream_t stream,
 
 } // namespace device
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/targets/gpu/include/migraph/gpu/device/contiguous.hpp

@@ -2,9 +2,11 @@
 #define MIGRAPH_GUARD_MIGRAPHLIB_KERNELS_HPP
 
 #include <migraph/argument.hpp>
+#include <migraph/config.hpp>
 #include <hip/hip_runtime_api.h>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 namespace device {
 
@@ -12,6 +14,7 @@ void contiguous(hipStream_t stream, argument result, argument arg);
 
 } // namespace device
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -3,9 +3,11 @@
 #define MIGRAPH_GUARD_RTGLIB_DEVICE_MUL_HPP
 
 #include <migraph/argument.hpp>
+#include <migraph/config.hpp>
 #include <hip/hip_runtime_api.h>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 namespace device {
 
@@ -19,6 +21,7 @@ void mul(hipStream_t stream,
 
 } // namespace device
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -3,8 +3,10 @@
 
 #include <string>
 #include <migraph/instruction_ref.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 struct program;
 
 namespace gpu {
@@ -15,6 +17,7 @@ struct eliminate_workspace
     void apply(program& p) const;
 };
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -2,9 +2,11 @@
 #define MIGRAPH_GUARD_RTGLIB_FUSE_OPS_HPP
 
 #include <migraph/program.hpp>
+#include <migraph/config.hpp>
 #include <migraph/gpu/context.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 namespace gpu {
 
@@ -16,7 +18,7 @@ struct fuse_ops
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -10,6 +10,7 @@
 #include <migraph/gpu/miopen.hpp>
 #include <migraph/gpu/hip.hpp>
 #include <migraph/dfor.hpp>
+#include <migraph/config.hpp>
 #include <migraph/gpu/device/contiguous.hpp>
 #include <migraph/gpu/device/add.hpp>
 #include <migraph/iterator_for.hpp>
@@ -18,6 +19,7 @@
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 struct miopen_gemm
@@ -31,7 +33,7 @@ struct miopen_gemm
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

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

@@ -2,9 +2,11 @@
 #define MIGRAPH_GUARD_MIGRAPHLIB_HIP_HPP
 
 #include <migraph/operators.hpp>
+#include <migraph/config.hpp>
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace gpu {
 
 migraph::argument allocate_gpu(const migraph::shape& s, bool host = false);
@@ -85,7 +87,9 @@ struct hip_copy
     }
     int output_alias(const std::vector<shape>&) const { return 1; }
 };
+
 } // namespace gpu
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/targets/gpu/include/migraph/gpu/leaky_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_leaky_relu
@@ -31,7 +33,7 @@ struct miopen_leaky_relu
 };
 
 } // namespace gpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif