Merge pull request #106 from ROCmSoftwarePlatform/inlinenamespace

Inlinenamespace

src/include/migraph/stringutils.hpp

@@ -5,8 +5,10 @@
 #include <numeric>
 #include <string>
 #include <sstream>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 inline std::string
 replace_string(std::string subject, const std::string& search, const std::string& replace)
@@ -85,6 +87,7 @@ inline std::string to_string(const T& x)
     return ss.str();
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/target.hpp

@@ -10,8 +10,10 @@
 #include <vector>
 #include <migraph/context.hpp>
 #include <migraph/pass.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 #ifdef DOXYGEN
 
@@ -242,6 +244,7 @@ inline const ValueType& any_cast(const target& x)
 
 #endif
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/tensor_view.hpp

@@ -4,11 +4,13 @@
 #include <migraph/shape.hpp>
 #include <migraph/float_equal.hpp>
 #include <migraph/requires.hpp>
+#include <migraph/config.hpp>
 
 #include <iostream>
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 template <class T>
 struct tensor_view
@@ -167,6 +169,7 @@ tensor_view<T> make_view(shape s, T* data)
     return {s, data};
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/time.hpp

@@ -2,8 +2,10 @@
 #define MIGRAPH_GUARD_RTGLIB_TIME_HPP
 
 #include <chrono>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 template <class Duration, class F>
 auto time(F f)
@@ -14,6 +16,7 @@ auto time(F f)
     return std::chrono::duration_cast<Duration>(finish - start).count();
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/tracer.hpp

@@ -3,8 +3,10 @@
 
 #include <ostream>
 #include <migraph/functional.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 struct tracer
 {
@@ -28,6 +30,7 @@ struct tracer
     std::ostream* os = nullptr;
 };
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/type_name.hpp

@@ -2,8 +2,10 @@
 #define MIGRAPH_GUARD_RTGLIB_TYPE_NAME_HPP
 
 #include <string>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 template <class PrivateMigraphTypeNameProbe>
 const std::string& get_type_name()
@@ -39,6 +41,7 @@ const std::string& get_type_name(const T&)
     return migraph::get_type_name<T>();
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/type_traits.hpp

@@ -10,8 +10,10 @@
 
 #include <type_traits>
 #include <migraph/half.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 #define MIGRAPH_DETAIL_EXTEND_TRAIT_FOR(trait, T) \
     template <class X>                            \
@@ -28,6 +30,7 @@ MIGRAPH_DETAIL_EXTEND_TRAIT_FOR(is_floating_point, half)
 MIGRAPH_DETAIL_EXTEND_TRAIT_FOR(is_signed, half)
 MIGRAPH_DETAIL_EXTEND_TRAIT_FOR(is_arithmetic, half)
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/verify.hpp

@@ -8,8 +8,10 @@
 #include <numeric>
 
 #include <migraph/float_equal.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 // Compute the value of a range
 template <class R>
@@ -170,5 +172,7 @@ bool verify_range(R1&& r1, R2&& r2, double tolerance = 80, double* out_error = n
         *out_error = error;
     return error <= threshold;
 }
+
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 #endif

src/include/migraph/verify_args.hpp

@@ -3,8 +3,10 @@
 
 #include <migraph/verify.hpp>
 #include <migraph/argument.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 inline bool verify_args(const std::string& name,
                         const argument& cpu_arg,
@@ -82,6 +84,7 @@ inline bool verify_args(const std::string& name,
     return passed;
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/instruction.cpp

@@ -3,6 +3,7 @@
 #include <migraph/erase.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 instruction::instruction(operation o, shape r, std::vector<instruction_ref> args)
     : op(std::move(o)), result(std::move(r)), arguments(std::move(args))
@@ -182,4 +183,5 @@ shape compute_shape(const operation& op, const std::vector<instruction_ref>& arg
     return op.compute_shape(compute_shapes(args));
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/onnx/onnx.cpp

@@ -14,9 +14,10 @@
 #include <migraph/operators.hpp>
 #include <migraph/ranges.hpp>
 #include <migraph/instruction.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
-
+inline namespace MIGRAPH_INLINE_NS {
 struct unknown
 {
     std::string op;
@@ -625,4 +626,5 @@ program parse_onnx(const std::string& name)
     return std::move(parser.prog);
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/opt/common_header.hpp

@@ -6,6 +6,7 @@
 #include <migraph/operators.hpp>
 #include <migraph/iterator_for.hpp>
 #include <migraph/pass_config.hpp>
+#include <migraph/config.hpp>
 
 #include <set>
 #include <list>
@@ -13,6 +14,7 @@
 #include <queue>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 //#define MIGRAPH_DEBUG_OPT
 
@@ -21,6 +23,8 @@ namespace migraph {
 #else
 #define MIGRAPH_DEBUG(s)
 #endif // MIGRAPH_DEBUG_OPT
+
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif // MIGRAPH_GUARD_RTGLIB_COMMON_HEADER_HPP

src/opt/memory_coloring.cpp

@@ -2,6 +2,7 @@
 #include "memory_coloring_impl.hpp"
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 void memory_coloring::apply(program& p) const
 {
@@ -11,4 +12,6 @@ void memory_coloring::apply(program& p) const
         opt.run();
     }
 }
+
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/opt/memory_coloring_impl.cpp

 #include "memory_coloring_impl.hpp"
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 void memory_coloring_impl::run()
 {
@@ -357,4 +358,6 @@ void live_interval::dump()
 }
 
 #endif
+
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/opt/memory_coloring_impl.hpp

 #ifndef MIGRAPH_GUARD_RTGLIB_MEMORY_COLORING_IMPL_HPP
 #define MIGRAPH_GUARD_RTGLIB_MEMORY_COLORING_IMPL_HPP
 #include "common_header.hpp"
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 static const int invalid_offset = -1;
 
@@ -177,5 +179,7 @@ struct memory_coloring_impl
     bool unify_literals;
     std::string allocation_op{};
 };
+
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 #endif

src/program.cpp

@@ -11,6 +11,7 @@
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 MIGRAPH_DECLARE_ENV_VAR(MIGRAPH_TRACE_COMPILE)
 MIGRAPH_DECLARE_ENV_VAR(MIGRAPH_TRACE_EVAL)
@@ -498,4 +499,6 @@ std::ostream& operator<<(std::ostream& os, const program& p)
     print_program(os, p, [](auto&&...) {});
     return os;
 }
+
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/shape.cpp

@@ -7,6 +7,7 @@
 #include <iostream>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 struct shape_impl
 {
@@ -190,4 +191,5 @@ std::ostream& operator<<(std::ostream& os, const shape& x)
     return os;
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/simplify_algebra.cpp

@@ -5,6 +5,7 @@
 #include <migraph/literal.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 struct find_add_lit_broadcast
 {
@@ -60,4 +61,5 @@ struct find_add_lit_broadcast
 
 void simplify_algebra::apply(program& p) const { match::find_matches(p, find_add_lit_broadcast{}); }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/simplify_reshapes.cpp

@@ -7,6 +7,7 @@
 #include <unordered_set>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 bool is_reshaper(const std::string& name)
 {
@@ -59,4 +60,5 @@ void simplify_reshapes::apply(program& p) const
     }
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/targets/cpu/gemm.cpp

@@ -4,6 +4,7 @@
 #include <blaze/math/CustomMatrix.h>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 namespace cpu {
 
 template <class T>
@@ -93,5 +94,5 @@ void migemm(
 }
 
 } // namespace cpu
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph