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

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

parent 1cdb49a6
...@@ -15,9 +15,10 @@ ...@@ -15,9 +15,10 @@
#include <migraph/iterator_for.hpp> #include <migraph/iterator_for.hpp>
#include <migraph/gpu/rocblas.hpp> #include <migraph/gpu/rocblas.hpp>
#include <migraph/gpu/context.hpp> #include <migraph/gpu/context.hpp>
#include <migraph/config.hpp>
#include <utility> #include <utility>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
struct hip_add struct hip_add
...@@ -38,7 +39,7 @@ struct miopen_add ...@@ -38,7 +39,7 @@ struct miopen_add
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -15,9 +15,10 @@ ...@@ -15,9 +15,10 @@
#include <migraph/iterator_for.hpp> #include <migraph/iterator_for.hpp>
#include <migraph/gpu/rocblas.hpp> #include <migraph/gpu/rocblas.hpp>
#include <migraph/gpu/context.hpp> #include <migraph/gpu/context.hpp>
#include <migraph/config.hpp>
#include <utility> #include <utility>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
struct miopen_batch_norm_inference struct miopen_batch_norm_inference
...@@ -31,7 +32,7 @@ struct miopen_batch_norm_inference ...@@ -31,7 +32,7 @@ struct miopen_batch_norm_inference
}; };
} // 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 hip_concat struct hip_concat
...@@ -32,7 +33,7 @@ struct hip_concat ...@@ -32,7 +33,7 @@ struct hip_concat
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
#include <migraph/gpu/rocblas.hpp> #include <migraph/gpu/rocblas.hpp>
#include <migraph/gpu/hip.hpp> #include <migraph/gpu/hip.hpp>
#include <migraph/env.hpp> #include <migraph/env.hpp>
#include <migraph/config.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
MIGRAPH_DECLARE_ENV_VAR(MIGRAPH_DISABLE_NULL_STREAM) MIGRAPH_DECLARE_ENV_VAR(MIGRAPH_DISABLE_NULL_STREAM)
...@@ -114,6 +115,7 @@ struct context ...@@ -114,6 +115,7 @@ struct context
std::shared_ptr<hip_device> current_device; std::shared_ptr<hip_device> current_device;
}; };
} // 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_contiguous struct miopen_contiguous
...@@ -30,7 +31,7 @@ struct miopen_contiguous ...@@ -30,7 +31,7 @@ struct miopen_contiguous
}; };
} // 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_convolution struct miopen_convolution
...@@ -42,7 +43,7 @@ struct miopen_convolution ...@@ -42,7 +43,7 @@ struct miopen_convolution
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
#define MIGRAPH_GUARD_RTGLIB_DEVICE_ADD_HPP #define MIGRAPH_GUARD_RTGLIB_DEVICE_ADD_HPP
#include <migraph/argument.hpp> #include <migraph/argument.hpp>
#include <migraph/config.hpp>
#include <hip/hip_runtime_api.h> #include <hip/hip_runtime_api.h>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
namespace device { namespace device {
...@@ -19,6 +20,7 @@ void add(hipStream_t stream, ...@@ -19,6 +20,7 @@ void add(hipStream_t stream,
} // namespace device } // namespace device
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
#define MIGRAPH_GUARD_RTGLIB_DEVICE_ADD_RELU_HPP #define MIGRAPH_GUARD_RTGLIB_DEVICE_ADD_RELU_HPP
#include <migraph/argument.hpp> #include <migraph/argument.hpp>
#include <migraph/config.hpp>
#include <hip/hip_runtime_api.h> #include <hip/hip_runtime_api.h>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
namespace device { namespace device {
...@@ -22,6 +23,7 @@ void add_relu(hipStream_t stream, ...@@ -22,6 +23,7 @@ void add_relu(hipStream_t stream,
} // namespace device } // namespace device
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
#define MIGRAPH_GUARD_RTGLIB_DEVICE_CONCAT_HPP #define MIGRAPH_GUARD_RTGLIB_DEVICE_CONCAT_HPP
#include <migraph/argument.hpp> #include <migraph/argument.hpp>
#include <migraph/config.hpp>
#include <hip/hip_runtime_api.h> #include <hip/hip_runtime_api.h>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
namespace device { namespace device {
...@@ -15,6 +16,7 @@ argument concat(hipStream_t stream, ...@@ -15,6 +16,7 @@ argument concat(hipStream_t stream,
} // namespace device } // namespace device
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
#define MIGRAPH_GUARD_MIGRAPHLIB_KERNELS_HPP #define MIGRAPH_GUARD_MIGRAPHLIB_KERNELS_HPP
#include <migraph/argument.hpp> #include <migraph/argument.hpp>
#include <migraph/config.hpp>
#include <hip/hip_runtime_api.h> #include <hip/hip_runtime_api.h>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
namespace device { namespace device {
...@@ -12,6 +13,7 @@ void contiguous(hipStream_t stream, argument result, argument arg); ...@@ -12,6 +13,7 @@ void contiguous(hipStream_t stream, argument result, argument arg);
} // namespace device } // namespace device
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
#define MIGRAPH_GUARD_RTGLIB_DEVICE_MUL_HPP #define MIGRAPH_GUARD_RTGLIB_DEVICE_MUL_HPP
#include <migraph/argument.hpp> #include <migraph/argument.hpp>
#include <migraph/config.hpp>
#include <hip/hip_runtime_api.h> #include <hip/hip_runtime_api.h>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
namespace device { namespace device {
...@@ -19,6 +20,7 @@ void mul(hipStream_t stream, ...@@ -19,6 +20,7 @@ void mul(hipStream_t stream,
} // namespace device } // namespace device
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
#include <string> #include <string>
#include <migraph/instruction_ref.hpp> #include <migraph/instruction_ref.hpp>
#include <migraph/config.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
struct program; struct program;
namespace gpu { namespace gpu {
...@@ -15,6 +16,7 @@ struct eliminate_workspace ...@@ -15,6 +16,7 @@ struct eliminate_workspace
void apply(program& p) const; void apply(program& p) const;
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
#define MIGRAPH_GUARD_RTGLIB_FUSE_OPS_HPP #define MIGRAPH_GUARD_RTGLIB_FUSE_OPS_HPP
#include <migraph/program.hpp> #include <migraph/program.hpp>
#include <migraph/config.hpp>
#include <migraph/gpu/context.hpp> #include <migraph/gpu/context.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
...@@ -16,7 +17,7 @@ struct fuse_ops ...@@ -16,7 +17,7 @@ struct fuse_ops
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#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>
#include <migraph/config.hpp>
#include <migraph/gpu/device/contiguous.hpp> #include <migraph/gpu/device/contiguous.hpp>
#include <migraph/gpu/device/add.hpp> #include <migraph/gpu/device/add.hpp>
#include <migraph/iterator_for.hpp> #include <migraph/iterator_for.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_gemm struct miopen_gemm
...@@ -31,7 +32,7 @@ struct miopen_gemm ...@@ -31,7 +32,7 @@ struct miopen_gemm
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
#define MIGRAPH_GUARD_MIGRAPHLIB_HIP_HPP #define MIGRAPH_GUARD_MIGRAPHLIB_HIP_HPP
#include <migraph/operators.hpp> #include <migraph/operators.hpp>
#include <migraph/config.hpp>
#include <utility> #include <utility>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
migraph::argument allocate_gpu(const migraph::shape& s, bool host = false); migraph::argument allocate_gpu(const migraph::shape& s, bool host = false);
...@@ -85,7 +86,9 @@ struct hip_copy ...@@ -85,7 +86,9 @@ struct hip_copy
} }
int output_alias(const std::vector<shape>&) const { return 1; } int output_alias(const std::vector<shape>&) const { return 1; }
}; };
} // 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_leaky_relu struct miopen_leaky_relu
...@@ -31,7 +32,7 @@ struct miopen_leaky_relu ...@@ -31,7 +32,7 @@ struct miopen_leaky_relu
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
#define MIGRAPH_GUARD_RTGLIB_MIOPEN_LOWERING_HPP #define MIGRAPH_GUARD_RTGLIB_MIOPEN_LOWERING_HPP
#include <migraph/program.hpp> #include <migraph/program.hpp>
#include <migraph/config.hpp>
#include <migraph/gpu/context.hpp> #include <migraph/gpu/context.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
struct lowering struct lowering
...@@ -15,7 +16,7 @@ struct lowering ...@@ -15,7 +16,7 @@ struct lowering
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
#include <migraph/manage_ptr.hpp> #include <migraph/manage_ptr.hpp>
#include <migraph/operators.hpp> #include <migraph/operators.hpp>
#include <miopen/miopen.h> #include <miopen/miopen.h>
#include <migraph/config.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace gpu { namespace gpu {
using miopen_handle = MIGRAPH_MANAGE_PTR(miopenHandle_t, miopenDestroy); using miopen_handle = MIGRAPH_MANAGE_PTR(miopenHandle_t, miopenDestroy);
...@@ -115,7 +116,7 @@ inline fused_operator_args make_fused_args() ...@@ -115,7 +116,7 @@ inline fused_operator_args make_fused_args()
} }
} // 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 hip_mul struct hip_mul
...@@ -29,7 +30,7 @@ struct hip_mul ...@@ -29,7 +30,7 @@ struct hip_mul
}; };
} // 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_pooling struct miopen_pooling
...@@ -33,7 +34,7 @@ struct miopen_pooling ...@@ -33,7 +34,7 @@ struct miopen_pooling
}; };
} // namespace gpu } // namespace gpu
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
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