diff --git a/paddle/majel/ddim.cc b/paddle/majel/ddim.cc index e92d9afa0b6c71d42bd27b61fbc32b191aa73e01..f32408ed53074234873ec0ea8ee7f4e449e5e908 100644 --- a/paddle/majel/ddim.cc +++ b/paddle/majel/ddim.cc @@ -1,4 +1,4 @@ -#include +#include "paddle/majel/ddim.h" namespace majel { diff --git a/paddle/majel/ddim.h b/paddle/majel/ddim.h index 64cebf895817e17ca665675712bfeda65d051a9e..7be756f8c098ba5aa3a5ff4380c90f4b90a55bb7 100644 --- a/paddle/majel/ddim.h +++ b/paddle/majel/ddim.h @@ -5,7 +5,7 @@ #include #include -#include "majel/dim.h" +#include "paddle/majel/dim.h" namespace majel { diff --git a/paddle/majel/util.h b/paddle/majel/detail/cuda_assert.h similarity index 93% rename from paddle/majel/util.h rename to paddle/majel/detail/cuda_assert.h index ab21e1869f793d07d4382596a3e6f50b5de7ead1..9490d0ae3eff01bdb4403de710b7bfd878e87f03 100644 --- a/paddle/majel/util.h +++ b/paddle/majel/detail/cuda_assert.h @@ -30,10 +30,3 @@ #define MAJEL_ASSERT(e) assert(e) #define MAJEL_ASSERT_MSG(e, m) assert((e) && (m)) #endif - -namespace majel { -namespace detail { - -inline int div_up(int x, int y) { return (x + y - 1) / y; } -} -} diff --git a/paddle/majel/hostdevice.h b/paddle/majel/detail/hostdevice.h similarity index 100% rename from paddle/majel/hostdevice.h rename to paddle/majel/detail/hostdevice.h diff --git a/paddle/majel/dim.h b/paddle/majel/dim.h index ba718ce5b7686b1b0040c3a54d0895d773f208f5..5eff4c05cc240de1f98fe09e8f3fa07efdd4b976 100644 --- a/paddle/majel/dim.h +++ b/paddle/majel/dim.h @@ -5,8 +5,8 @@ #include #include -#include "majel/hostdevice.h" -#include "majel/util.h" +#include "paddle/majel/detail/hostdevice.h" +#include "paddle/majel/detail/util.h" namespace majel { diff --git a/paddle/majel/place.cc b/paddle/majel/place.cc index eecd8e5b730704258d2bd7d98a75a0a80e13a797..ca50b37843e0ba047f8f8b8d24a3d3c131587382 100644 --- a/paddle/majel/place.cc +++ b/paddle/majel/place.cc @@ -1,4 +1,4 @@ -#include +#include "paddle/majel/place.h" namespace majel { @@ -16,7 +16,7 @@ public: void operator()(const GpuPlace& p) { os_ << "GpuPlace(" << p.device << ")"; } }; -} // namespace majel +} // namespace detail static Place the_default_place; diff --git a/paddle/majel/test/ddim_test.cc b/paddle/majel/test/ddim_test.cc index 5c604517961e8f02e2bc1f1c9fae1bf00fd18c7a..a5b8a7c4d26740c1c4169547e76a0cf5558facc0 100644 --- a/paddle/majel/test/ddim_test.cc +++ b/paddle/majel/test/ddim_test.cc @@ -4,7 +4,7 @@ #include #include "gtest/gtest.h" -#include "majel/ddim.h" +#include "paddle/majel/ddim.h" TEST(DDim, Equality) { // construct a DDim from an initialization list diff --git a/paddle/majel/test/dim_test.cu b/paddle/majel/test/dim_test.cu index ed7c34ffd1da7dd27adb98da7823125a954bd972..a7d81e595bea7fa6326ea350e2702e1ef8f5caa4 100644 --- a/paddle/majel/test/dim_test.cu +++ b/paddle/majel/test/dim_test.cu @@ -1,7 +1,7 @@ #include #include -#include "majel/dim.h" +#include "paddle/majel/dim.h" #include "gtest/gtest.h" __global__ void test(majel::Dim<2>* o) { diff --git a/paddle/majel/test/place_test.cc b/paddle/majel/test/place_test.cc index c9a53802b23ef8b225b9e8ef0acfe1b0c5562289..6a099ae6b6e4f63a6ce845ab17eaab6e12c2c0b0 100644 --- a/paddle/majel/test/place_test.cc +++ b/paddle/majel/test/place_test.cc @@ -1,4 +1,4 @@ -#include "majel/place.h" +#include "paddle/majel/place.h" #include #include "gtest/gtest.h"