Commit e1ef1e17 authored by Shucai Xiao's avatar Shucai Xiao
Browse files

Added inline namespace for all .hpp and .cpp file.

parent 1cdb49a6
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <migraph/operators.hpp> #include <migraph/operators.hpp>
#include <migraph/generate.hpp> #include <migraph/generate.hpp>
#include <migraph/shape_for_each.hpp> #include <migraph/shape_for_each.hpp>
#include <migraph/config.hpp>
#include <migraph/gpu/miopen.hpp> #include <migraph/gpu/miopen.hpp>
#include <migraph/gpu/hip.hpp> #include <migraph/gpu/hip.hpp>
#include <migraph/dfor.hpp> #include <migraph/dfor.hpp>
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
#include <migraph/gpu/context.hpp> #include <migraph/gpu/context.hpp>
#include <utility> #include <utility>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
struct miopen_relu struct miopen_relu
...@@ -31,7 +32,7 @@ struct miopen_relu ...@@ -31,7 +32,7 @@ struct miopen_relu
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
#include <migraph/manage_ptr.hpp> #include <migraph/manage_ptr.hpp>
#include <migraph/operators.hpp> #include <migraph/operators.hpp>
#include <migraph/config.hpp>
#include <rocblas.h> #include <rocblas.h>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
using rocblas_handle_ptr = MIGRAPH_MANAGE_PTR(rocblas_handle, rocblas_destroy_handle); using rocblas_handle_ptr = MIGRAPH_MANAGE_PTR(rocblas_handle, rocblas_destroy_handle);
...@@ -14,7 +15,7 @@ rocblas_handle_ptr create_rocblas_handle_ptr(); ...@@ -14,7 +15,7 @@ rocblas_handle_ptr create_rocblas_handle_ptr();
rocblas_handle_ptr create_rocblas_handle_ptr(hipStream_t s); rocblas_handle_ptr create_rocblas_handle_ptr(hipStream_t s);
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <migraph/operators.hpp> #include <migraph/operators.hpp>
#include <migraph/generate.hpp> #include <migraph/generate.hpp>
#include <migraph/shape_for_each.hpp> #include <migraph/shape_for_each.hpp>
#include <migraph/config.hpp>
#include <migraph/gpu/miopen.hpp> #include <migraph/gpu/miopen.hpp>
#include <migraph/gpu/hip.hpp> #include <migraph/gpu/hip.hpp>
#include <migraph/dfor.hpp> #include <migraph/dfor.hpp>
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
#include <migraph/gpu/context.hpp> #include <migraph/gpu/context.hpp>
#include <utility> #include <utility>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
struct miopen_softmax struct miopen_softmax
...@@ -31,7 +32,7 @@ struct miopen_softmax ...@@ -31,7 +32,7 @@ struct miopen_softmax
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
#define MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_TARGET_HPP #define MIGRAPH_GUARD_MIGRAPHLIB_MIOPEN_TARGET_HPP
#include <migraph/program.hpp> #include <migraph/program.hpp>
#include <migraph/config.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
struct target struct target
...@@ -12,7 +13,9 @@ struct target ...@@ -12,7 +13,9 @@ struct target
std::vector<pass> get_passes(migraph::context& gctx) const; std::vector<pass> get_passes(migraph::context& gctx) const;
migraph::context get_context() const; migraph::context get_context() const;
}; };
} // namespace gpu } // namespace gpu
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <migraph/program.hpp> #include <migraph/program.hpp>
#include <migraph/gpu/context.hpp> #include <migraph/gpu/context.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
...@@ -17,7 +17,7 @@ struct write_literals ...@@ -17,7 +17,7 @@ struct write_literals
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <utility> #include <utility>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
shape miopen_leaky_relu::compute_shape(const std::vector<shape>& inputs) const shape miopen_leaky_relu::compute_shape(const std::vector<shape>& inputs) const
...@@ -33,5 +34,5 @@ argument miopen_leaky_relu::compute(context& ctx, ...@@ -33,5 +34,5 @@ argument miopen_leaky_relu::compute(context& ctx,
} }
} // namespace gpu } // namespace gpu
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <utility> #include <utility>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
struct miopen_apply struct miopen_apply
...@@ -220,4 +221,5 @@ struct miopen_apply ...@@ -220,4 +221,5 @@ struct miopen_apply
void lowering::apply(program& p) const { miopen_apply{&p, ctx}.apply(); } void lowering::apply(program& p) const { miopen_apply{&p, ctx}.apply(); }
} // namespace gpu } // namespace gpu
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <utility> #include <utility>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
shape hip_mul::compute_shape(const std::vector<shape>& inputs) const 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 ...@@ -21,5 +22,5 @@ argument hip_mul::compute(context& ctx, const shape&, const std::vector<argument
} }
} // namespace gpu } // namespace gpu
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <utility> #include <utility>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
shape miopen_pooling::compute_shape(const std::vector<shape>& inputs) const shape miopen_pooling::compute_shape(const std::vector<shape>& inputs) const
...@@ -37,5 +38,5 @@ argument miopen_pooling::compute(context& ctx, ...@@ -37,5 +38,5 @@ argument miopen_pooling::compute(context& ctx,
} }
} // namespace gpu } // namespace gpu
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <utility> #include <utility>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
shape miopen_relu::compute_shape(const std::vector<shape>& inputs) const shape miopen_relu::compute_shape(const std::vector<shape>& inputs) const
...@@ -33,5 +34,5 @@ argument miopen_relu::compute(context& ctx, ...@@ -33,5 +34,5 @@ argument miopen_relu::compute(context& ctx,
} }
} // namespace gpu } // namespace gpu
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#include <migraph/gpu/rocblas.hpp> #include <migraph/gpu/rocblas.hpp>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
rocblas_handle_ptr create_rocblas_handle_ptr() rocblas_handle_ptr create_rocblas_handle_ptr()
...@@ -18,5 +19,5 @@ rocblas_handle_ptr create_rocblas_handle_ptr(hipStream_t s) ...@@ -18,5 +19,5 @@ rocblas_handle_ptr create_rocblas_handle_ptr(hipStream_t s)
} }
} // namespace gpu } // namespace gpu
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <utility> #include <utility>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
shape miopen_softmax::compute_shape(const std::vector<shape>& inputs) const shape miopen_softmax::compute_shape(const std::vector<shape>& inputs) const
...@@ -32,5 +33,5 @@ argument miopen_softmax::compute(context& ctx, ...@@ -32,5 +33,5 @@ argument miopen_softmax::compute(context& ctx,
} }
} // namespace gpu } // namespace gpu
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <migraph/fwd_conv_batchnorm_rewrite.hpp> #include <migraph/fwd_conv_batchnorm_rewrite.hpp>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
std::vector<pass> target::get_passes(migraph::context& gctx) const std::vector<pass> target::get_passes(migraph::context& gctx) const
...@@ -56,4 +57,5 @@ std::string target::name() const { return "miopen"; } ...@@ -56,4 +57,5 @@ std::string target::name() const { return "miopen"; }
migraph::context target::get_context() const { return context{}; } migraph::context target::get_context() const { return context{}; }
} // namespace gpu } // namespace gpu
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <migraph/env.hpp> #include <migraph/env.hpp>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
MIGRAPH_DECLARE_ENV_VAR(MIGRAPH_COPY_LITERALS) MIGRAPH_DECLARE_ENV_VAR(MIGRAPH_COPY_LITERALS)
...@@ -51,5 +51,7 @@ void write_literals::apply(program& p) const ...@@ -51,5 +51,7 @@ void write_literals::apply(program& p) const
} }
} }
} }
} // namespace gpu } // namespace gpu
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment