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

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

parent 1cdb49a6
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <migraph/iterator_for.hpp> #include <migraph/iterator_for.hpp>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
void auto_contiguous::apply(program& p) const void auto_contiguous::apply(program& p) const
{ {
...@@ -19,4 +20,5 @@ void auto_contiguous::apply(program& p) const ...@@ -19,4 +20,5 @@ void auto_contiguous::apply(program& p) const
} }
} }
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <unordered_set> #include <unordered_set>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
template <class Range> template <class Range>
void cse_range(program& p, Range&& r) void cse_range(program& p, Range&& r)
...@@ -34,4 +35,5 @@ 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)); } void common_subexpression_elimination::apply(program& p) const { cse_range(p, iterator_for(p)); }
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <migraph/literal.hpp> #include <migraph/literal.hpp>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
struct match_const_add struct match_const_add
{ {
...@@ -25,4 +26,5 @@ 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{}); } void constant_propagate::apply(program& p) const { match::find_matches(p, match_const_add{}); }
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <migraph/ranges.hpp> #include <migraph/ranges.hpp>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
template <class Range, class Iterator> template <class Range, class Iterator>
std::ptrdiff_t bidistance(const Range& r, Iterator start, Iterator last) std::ptrdiff_t bidistance(const Range& r, Iterator start, Iterator last)
...@@ -61,4 +62,5 @@ void dead_code_elimination::apply(program& p) const ...@@ -61,4 +62,5 @@ void dead_code_elimination::apply(program& p) const
p.remove_instructions(std::next(last), p.end()); p.remove_instructions(std::next(last), p.end());
} }
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <migraph/pass_config.hpp> #include <migraph/pass_config.hpp>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
void eliminate_allocation::apply(program& p) const void eliminate_allocation::apply(program& p) const
{ {
...@@ -35,4 +36,6 @@ 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); p.replace_instruction(ins, op::load{s, offset}, mem);
} }
} }
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <utility> #include <utility>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
bool try_compute_shape(const operation& op, const std::vector<instruction_ref>& args) bool try_compute_shape(const operation& op, const std::vector<instruction_ref>& args)
{ {
...@@ -46,4 +47,5 @@ void eliminate_contiguous::apply(program& p) const ...@@ -46,4 +47,5 @@ void eliminate_contiguous::apply(program& p) const
} }
} }
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <cstdlib> #include <cstdlib>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
bool enabled(const char* name) bool enabled(const char* name)
{ {
...@@ -29,4 +30,5 @@ std::vector<std::string> env(const char* name) ...@@ -29,4 +30,5 @@ std::vector<std::string> env(const char* name)
return {{p}}; return {{p}};
} }
} // namespace MIGRAPH_INLINE_N
} // namespace migraph } // namespace migraph
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#include <migraph/dfor.hpp> #include <migraph/dfor.hpp>
namespace migraph { namespace migraph {
namespace MIGRAPH_INLINE_NS {
void fwd_conv_batchnorm_rewrite::apply(program& p) const void fwd_conv_batchnorm_rewrite::apply(program& p) const
{ {
for(auto ins : iterator_for(p)) for(auto ins : iterator_for(p))
...@@ -64,4 +66,6 @@ void fwd_conv_batchnorm_rewrite::apply(program& p) const ...@@ -64,4 +66,6 @@ void fwd_conv_batchnorm_rewrite::apply(program& p) const
p.replace_instruction(ins, op::add{}, {c, b}); p.replace_instruction(ins, op::add{}, {c, b});
} }
} }
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#include <migraph/generate.hpp> #include <migraph/generate.hpp>
namespace migraph { namespace migraph { namespace MIGRAPH_INLINE_NS {
argument generate_argument(shape s, unsigned long seed) argument generate_argument(shape s, unsigned long seed)
{ {
...@@ -30,4 +30,5 @@ literal abs(literal l) ...@@ -30,4 +30,5 @@ literal abs(literal l)
return transform(std::move(l), [](auto x) { return std::fabs(x); }); return transform(std::move(l), [](auto x) { return std::fabs(x); });
} }
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
#include <migraph/shape.hpp> #include <migraph/shape.hpp>
#include <migraph/raw_data.hpp> #include <migraph/raw_data.hpp>
#include <migraph/config.hpp>
#include <functional> #include <functional>
#include <utility> #include <utility>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
/** /**
* @brief Arguments passed to instructions * @brief Arguments passed to instructions
...@@ -45,6 +46,7 @@ struct argument : raw_data<argument> ...@@ -45,6 +46,7 @@ struct argument : raw_data<argument>
shape m_shape; shape m_shape;
}; };
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
#ifndef MIGRAPH_GUARD_RTGLIB_AUTO_ANY_CAST_HPP #ifndef MIGRAPH_GUARD_RTGLIB_AUTO_ANY_CAST_HPP
#define MIGRAPH_GUARD_RTGLIB_AUTO_ANY_CAST_HPP #define MIGRAPH_GUARD_RTGLIB_AUTO_ANY_CAST_HPP
#include <migraph/config.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace detail { namespace detail {
...@@ -32,6 +33,7 @@ detail::auto_any_caster<T> auto_any_cast(T& x) ...@@ -32,6 +33,7 @@ detail::auto_any_caster<T> auto_any_cast(T& x)
return {x}; return {x};
} }
} // 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;
...@@ -14,6 +15,7 @@ struct auto_contiguous ...@@ -14,6 +15,7 @@ struct auto_contiguous
void apply(program& p) const; void apply(program& p) const;
}; };
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
#include <migraph/errors.hpp> #include <migraph/errors.hpp>
#include <migraph/argument.hpp> #include <migraph/argument.hpp>
#include <migraph/reflect.hpp> #include <migraph/reflect.hpp>
#include <migraph/config.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
namespace builtin { namespace builtin {
...@@ -62,7 +63,7 @@ struct param ...@@ -62,7 +63,7 @@ struct param
}; };
} // namespace builtin } // namespace builtin
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
#define MIGRAPH_GUARD_RTGLIB_CHECK_CONTEXT_HPP #define MIGRAPH_GUARD_RTGLIB_CHECK_CONTEXT_HPP
#include <migraph/program.hpp> #include <migraph/program.hpp>
#include <migraph/config.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
template <class T> template <class T>
struct check_context struct check_context
...@@ -25,6 +26,7 @@ struct check_context ...@@ -25,6 +26,7 @@ struct check_context
void apply(program& p) const { p.insert_instruction(p.begin(), op{}); } void apply(program& p) const { p.insert_instruction(p.begin(), op{}); }
}; };
} // namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
#define MIGRAPH_GUARD_RTGLIB_CHECK_SHAPES_HPP #define MIGRAPH_GUARD_RTGLIB_CHECK_SHAPES_HPP
#include <migraph/shape.hpp> #include <migraph/shape.hpp>
#include <migraph/config.hpp>
#include <algorithm> #include <algorithm>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
struct check_shapes struct check_shapes
{ {
...@@ -154,6 +155,7 @@ struct check_shapes ...@@ -154,6 +155,7 @@ struct check_shapes
check_shapes slice(long start, long last) { return {get(start), get(last), name}; } check_shapes slice(long start, long last) { return {get(start), get(last), name}; }
}; };
} // 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;
...@@ -14,6 +15,7 @@ struct common_subexpression_elimination ...@@ -14,6 +15,7 @@ struct common_subexpression_elimination
void apply(program& p) const; void apply(program& p) const;
}; };
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
#ifndef MIGRAPH_GUARD_CONFIG_HPP
#define MIGRAPH_GUARD_CONFIG_HPP
namespace migraph {
#define MIGRAPH_INLINE_NS version_1
} // namespace migraph
#endif
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
#define MIGRAPH_GUARD_RTGLIB_CONSTANT_PROPAGATE_HPP #define MIGRAPH_GUARD_RTGLIB_CONSTANT_PROPAGATE_HPP
#include <string> #include <string>
#include <migraph/config.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
struct program; struct program;
...@@ -13,6 +14,7 @@ struct constant_propagate ...@@ -13,6 +14,7 @@ struct constant_propagate
void apply(program& p) const; void apply(program& p) const;
}; };
} // inline namespace MIGRAPH_INLINE_NS
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <migraph/config.hpp>
namespace migraph { namespace migraph { inline namespace MIGRAPH_INLINE_NS {
#ifdef DOXYGEN #ifdef DOXYGEN
...@@ -203,6 +204,7 @@ inline const ValueType& any_cast(const context& x) ...@@ -203,6 +204,7 @@ inline const ValueType& any_cast(const context& x)
#endif #endif
} // 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;
...@@ -14,6 +15,7 @@ struct dead_code_elimination ...@@ -14,6 +15,7 @@ struct dead_code_elimination
void apply(program& p) const; void apply(program& p) const;
}; };
} // 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