提交 82c60bbb 编写于 作者: F fengjiayi

adjust '#include' style and move macro definition files into folder 'detail'

上级 110a4022
#include <majel/ddim.h> #include "paddle/majel/ddim.h"
namespace majel { namespace majel {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
#include "majel/dim.h" #include "paddle/majel/dim.h"
namespace majel { namespace majel {
......
...@@ -30,10 +30,3 @@ ...@@ -30,10 +30,3 @@
#define MAJEL_ASSERT(e) assert(e) #define MAJEL_ASSERT(e) assert(e)
#define MAJEL_ASSERT_MSG(e, m) assert((e) && (m)) #define MAJEL_ASSERT_MSG(e, m) assert((e) && (m))
#endif #endif
namespace majel {
namespace detail {
inline int div_up(int x, int y) { return (x + y - 1) / y; }
}
}
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include <stdexcept> #include <stdexcept>
#include <type_traits> #include <type_traits>
#include "majel/hostdevice.h" #include "paddle/majel/detail/hostdevice.h"
#include "majel/util.h" #include "paddle/majel/detail/util.h"
namespace majel { namespace majel {
......
#include <majel/place.h> #include "paddle/majel/place.h"
namespace majel { namespace majel {
...@@ -16,7 +16,7 @@ public: ...@@ -16,7 +16,7 @@ public:
void operator()(const GpuPlace& p) { os_ << "GpuPlace(" << p.device << ")"; } void operator()(const GpuPlace& p) { os_ << "GpuPlace(" << p.device << ")"; }
}; };
} // namespace majel } // namespace detail
static Place the_default_place; static Place the_default_place;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <vector> #include <vector>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "majel/ddim.h" #include "paddle/majel/ddim.h"
TEST(DDim, Equality) { TEST(DDim, Equality) {
// construct a DDim from an initialization list // construct a DDim from an initialization list
......
#include <thrust/device_vector.h> #include <thrust/device_vector.h>
#include <sstream> #include <sstream>
#include "majel/dim.h" #include "paddle/majel/dim.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
__global__ void test(majel::Dim<2>* o) { __global__ void test(majel::Dim<2>* o) {
......
#include "majel/place.h" #include "paddle/majel/place.h"
#include <sstream> #include <sstream>
#include "gtest/gtest.h" #include "gtest/gtest.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册