Commit 73ca9701 authored by Chao Liu's avatar Chao Liu
Browse files

Merge commit '437cc595c6e206dfebb118985b5171bbc1e29eab' into composable_kernel_init_integration_v3

parents 3d32ae94 5781adf5
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <fstream> #include <fstream>
namespace olCompile { namespace online_compile {
enum class LogLevel enum class LogLevel
{ {
...@@ -18,6 +18,6 @@ std::ostream& fdt_log(LogLevel level, const char* header, const char* content); ...@@ -18,6 +18,6 @@ std::ostream& fdt_log(LogLevel level, const char* header, const char* content);
std::ostream& fdt_log(); std::ostream& fdt_log();
void fdt_log_flush(); void fdt_log_flush();
}; // namespace olCompile }; // namespace online_compile
#endif #endif
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
namespace olCompile { namespace online_compile {
template <class F, F f> template <class F, F f>
struct manage_deleter struct manage_deleter
...@@ -68,9 +68,9 @@ using remove_ptr = typename std:: ...@@ -68,9 +68,9 @@ using remove_ptr = typename std::
template <class T> template <class T>
using shared = std::shared_ptr<remove_ptr<T>>; using shared = std::shared_ptr<remove_ptr<T>>;
} // namespace olCompile } // namespace online_compile
#define OLC_MANAGE_PTR(T, F) \ #define OLC_MANAGE_PTR(T, F) \
olCompile::manage_ptr<typename std::remove_pointer<T>::type, decltype(&F), &F> // NOLINT online_compile::manage_ptr<typename std::remove_pointer<T>::type, decltype(&F), &F> // NOLINT
#endif #endif
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
#include <string> #include <string>
namespace olCompile { namespace online_compile {
std::string md5(std::string s); std::string md5(std::string s);
} // namespace olCompile } // namespace online_compile
#endif #endif
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
#include <half.hpp> #include <half.hpp>
#include <boost/container/small_vector.hpp> #include <boost/container/small_vector.hpp>
namespace online_compile {
struct OpKernelArg struct OpKernelArg
{ {
...@@ -32,4 +35,6 @@ struct OpKernelArg ...@@ -32,4 +35,6 @@ struct OpKernelArg
bool is_ptr = false; bool is_ptr = false;
}; };
} // namespace online_compile
#endif #endif
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <string> #include <string>
namespace olCompile { namespace online_compile {
struct SimpleHash struct SimpleHash
{ {
size_t operator()(const std::pair<std::string, std::string>& p) const size_t operator()(const std::pair<std::string, std::string>& p) const
...@@ -39,6 +39,6 @@ struct SimpleHash ...@@ -39,6 +39,6 @@ struct SimpleHash
} }
}; };
} // namespace olCompile } // namespace online_compile
#endif #endif
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define OLC_STRINGIZE_1(...) #__VA_ARGS__ #define OLC_STRINGIZE_1(...) #__VA_ARGS__
#define OLC_STRINGIZE(...) OLC_STRINGIZE_1(__VA_ARGS__) #define OLC_STRINGIZE(...) OLC_STRINGIZE_1(__VA_ARGS__)
namespace olCompile { namespace online_compile {
inline std::string inline std::string
ReplaceString(std::string subject, const std::string& search, const std::string& replace) ReplaceString(std::string subject, const std::string& search, const std::string& replace)
...@@ -128,6 +128,6 @@ inline std::vector<std::string> SplitSpaceSeparated(const std::string& in, ...@@ -128,6 +128,6 @@ inline std::vector<std::string> SplitSpaceSeparated(const std::string& in,
return rv; return rv;
} }
} // namespace olCompile } // namespace online_compile
#endif // GUARD_OLC_STRINGUTILS_HPP #endif // GUARD_OLC_STRINGUTILS_HPP
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <string> #include <string>
namespace olCompile { namespace online_compile {
struct Handle; struct Handle;
...@@ -51,6 +51,6 @@ struct TargetProperties ...@@ -51,6 +51,6 @@ struct TargetProperties
boost::optional<bool> sramecc_reported = boost::none; boost::optional<bool> sramecc_reported = boost::none;
}; };
} // namespace olCompile } // namespace online_compile
#endif // GUARD_OLC_TARGET_PROPERTIES_HPP #endif // GUARD_OLC_TARGET_PROPERTIES_HPP
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <string> #include <string>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
namespace olCompile { namespace online_compile {
void SystemCmd(std::string cmd); void SystemCmd(std::string cmd);
...@@ -21,6 +21,6 @@ struct TmpDir ...@@ -21,6 +21,6 @@ struct TmpDir
~TmpDir(); ~TmpDir();
}; };
} // namespace olCompile } // namespace online_compile
#endif #endif
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <manage_ptr.hpp> #include <manage_ptr.hpp>
#include <fstream> #include <fstream>
namespace olCompile { namespace online_compile {
using FilePtr = OLC_MANAGE_PTR(FILE*, std::fclose); using FilePtr = OLC_MANAGE_PTR(FILE*, std::fclose);
...@@ -25,6 +25,6 @@ inline void WriteFile(const std::vector<char>& content, const boost::filesystem: ...@@ -25,6 +25,6 @@ inline void WriteFile(const std::vector<char>& content, const boost::filesystem:
throw std::runtime_error("Failed to write to file"); throw std::runtime_error("Failed to write to file");
} }
} // namespace olCompile } // namespace online_compile
#endif #endif
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
${KERNELS_DECLS} ${KERNELS_DECLS}
// clang-format on // clang-format on
namespace olCompile { namespace online_compile {
const std::map<std::string, std::string>& kernels() const std::map<std::string, std::string>& kernels()
{ {
...@@ -67,4 +67,4 @@ std::string GetKernelSrc(std::string name) ...@@ -67,4 +67,4 @@ std::string GetKernelSrc(std::string name)
return it->second; return it->second;
} }
} // namespace olCompile } // namespace online_compile
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
namespace olCompile { namespace online_compile {
static inline bool EndsWith(const std::string& value, const std::string& suffix) static inline bool EndsWith(const std::string& value, const std::string& suffix)
{ {
...@@ -77,4 +77,4 @@ std::vector<std::string> GetHipKernelIncList() ...@@ -77,4 +77,4 @@ std::vector<std::string> GetHipKernelIncList()
return keys; return keys;
} }
} // namespace olCompile } // namespace online_compile
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