Fixed conflicts

.clang-tidy

@@ -18,7 +18,7 @@ CheckOptions:
   - key:             readability-identifier-naming.NamespaceCase
     value:           lower_case
   - key:             readability-identifier-naming.InlineNamespaceCase
-    value:           lower_case
+    value:           UPPER_CASE
   - key:             readability-identifier-naming.EnumConstantCase
     value:           lower_case
   - key:             readability-identifier-naming.ConstexprVariableCase

src/auto_contiguous.cpp

@@ -5,6 +5,7 @@
 #include <migraph/iterator_for.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 void auto_contiguous::apply(program& p) const
 {
@@ -19,4 +20,5 @@ void auto_contiguous::apply(program& p) const
     }
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/common_subexpression_elimination.cpp

@@ -8,6 +8,7 @@
 #include <unordered_set>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 template <class Range>
 void cse_range(program& p, Range&& r)
@@ -34,4 +35,5 @@ void cse_range(program& p, Range&& r)
 
 void common_subexpression_elimination::apply(program& p) const { cse_range(p, iterator_for(p)); }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/constant_propagate.cpp

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

src/dead_code_elimination.cpp

@@ -6,6 +6,7 @@
 #include <migraph/ranges.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 template <class Range, class Iterator>
 std::ptrdiff_t bidistance(const Range& r, Iterator start, Iterator last)
@@ -61,4 +62,5 @@ void dead_code_elimination::apply(program& p) const
     p.remove_instructions(std::next(last), p.end());
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/eliminate_allocation.cpp

@@ -8,6 +8,7 @@
 #include <migraph/pass_config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 void eliminate_allocation::apply(program& p) const
 {
@@ -35,4 +36,6 @@ void eliminate_allocation::apply(program& p) const
         p.replace_instruction(ins, op::load{s, offset}, mem);
     }
 }
+
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/eliminate_concat.cpp

@@ -7,6 +7,7 @@
 #include <migraph/dfor.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 void eliminate_concat::apply(program& p) const
 {
     for(auto ins : iterator_for(p))
@@ -66,4 +67,5 @@ void eliminate_concat::apply(program& p) const
         }
     }
 }
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/eliminate_contiguous.cpp

@@ -8,6 +8,7 @@
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 bool try_compute_shape(const operation& op, const std::vector<instruction_ref>& args)
 {
@@ -46,4 +47,5 @@ void eliminate_contiguous::apply(program& p) const
     }
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/env.cpp

@@ -3,6 +3,7 @@
 #include <cstdlib>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 bool enabled(const char* name)
 {
@@ -29,4 +30,5 @@ std::vector<std::string> env(const char* name)
         return {{p}};
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/fwd_conv_batchnorm_rewrite.cpp

@@ -6,6 +6,8 @@
 #include <migraph/dfor.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
+
 void fwd_conv_batchnorm_rewrite::apply(program& p) const
 {
     for(auto ins : iterator_for(p))
@@ -64,4 +66,6 @@ void fwd_conv_batchnorm_rewrite::apply(program& p) const
         p.replace_instruction(ins, op::add{}, {c, b});
     }
 }
+
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/generate.cpp

 #include <migraph/generate.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 argument generate_argument(shape s, unsigned long seed)
 {
@@ -30,4 +31,5 @@ literal abs(literal l)
     return transform(std::move(l), [](auto x) { return std::fabs(x); });
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph

src/include/migraph/argument.hpp

@@ -3,10 +3,12 @@
 
 #include <migraph/shape.hpp>
 #include <migraph/raw_data.hpp>
+#include <migraph/config.hpp>
 #include <functional>
 #include <utility>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 /**
  * @brief Arguments passed to instructions
@@ -45,6 +47,7 @@ struct argument : raw_data<argument>
     shape m_shape;
 };
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/auto_any_cast.hpp

 #ifndef MIGRAPH_GUARD_RTGLIB_AUTO_ANY_CAST_HPP
 #define MIGRAPH_GUARD_RTGLIB_AUTO_ANY_CAST_HPP
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 namespace detail {
 
@@ -32,6 +34,7 @@ detail::auto_any_caster<T> auto_any_cast(T& x)
     return {x};
 }
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/auto_contiguous.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;
 
@@ -14,6 +16,7 @@ struct auto_contiguous
     void apply(program& p) const;
 };
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/builtin.hpp

@@ -5,8 +5,10 @@
 #include <migraph/errors.hpp>
 #include <migraph/argument.hpp>
 #include <migraph/reflect.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 namespace builtin {
 
@@ -62,7 +64,7 @@ struct param
 };
 
 } // namespace builtin
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/check_context.hpp

@@ -2,8 +2,10 @@
 #define MIGRAPH_GUARD_RTGLIB_CHECK_CONTEXT_HPP
 
 #include <migraph/program.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 template <class T>
 struct check_context
@@ -25,6 +27,7 @@ struct check_context
     void apply(program& p) const { p.insert_instruction(p.begin(), op{}); }
 };
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/check_shapes.hpp

@@ -2,9 +2,11 @@
 #define MIGRAPH_GUARD_RTGLIB_CHECK_SHAPES_HPP
 
 #include <migraph/shape.hpp>
+#include <migraph/config.hpp>
 #include <algorithm>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 struct check_shapes
 {
@@ -154,6 +156,7 @@ struct check_shapes
     check_shapes slice(long start, long last) { return {get(start), get(last), name}; }
 };
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/common_subexpression_elimination.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;
 
@@ -14,6 +16,7 @@ struct common_subexpression_elimination
     void apply(program& p) const;
 };
 
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/concat_opt.hpp

@@ -10,8 +10,10 @@
 
 #include <migraph/operation.hpp>
 #include <migraph/operators.hpp>
+#include <migraph/config.hpp>
 
 namespace migraph {
+inline namespace MIGRAPH_INLINE_NS {
 
 struct program;
 
@@ -233,7 +235,7 @@ inline const ValueType& any_cast(const concat_optimization& x)
 }
 
 #endif
-
+} // namespace MIGRAPH_INLINE_NS
 } // namespace migraph
 
 #endif

src/include/migraph/config.hpp

+#ifndef MIGRAPH_GUARD_CONFIG_HPP
+#define MIGRAPH_GUARD_CONFIG_HPP
+
+namespace migraph {
+
+#ifndef MIGRAPH_USE_CLANG_TIDY
+#define MIGRAPH_INLINE_NS version_1
+#endif
+
+} // namespace migraph
+
+#endif