From bb88202879bd10660cf44f51fa0952560a8c9b19 Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Mon, 19 Jun 2017 14:26:29 -0700 Subject: [PATCH] Move paddle/majel/* to paddle/platform/ and paddle/framework/ --- paddle/framework/CMakeLists.txt | 4 ++++ paddle/{majel => framework}/ddim.cc | 0 paddle/{majel => framework}/ddim.h | 0 paddle/{majel => framework}/ddim_test.cc | 0 paddle/{majel => framework}/dim.h | 0 paddle/{majel => framework}/dim_test.cu | 0 paddle/{majel/README.md => framework/tensor.md} | 0 paddle/{majel => platform}/CMakeLists.txt | 8 ++------ paddle/{majel/detail/cuda_assert.h => platform/assert.h} | 0 paddle/{majel => platform}/cuda_test.cu | 0 paddle/{majel/detail => platform}/hostdevice.h | 0 paddle/{majel => platform}/place.cc | 0 paddle/{majel => platform}/place.h | 0 paddle/{majel => platform}/place_test.cc | 0 14 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 paddle/framework/CMakeLists.txt rename paddle/{majel => framework}/ddim.cc (100%) rename paddle/{majel => framework}/ddim.h (100%) rename paddle/{majel => framework}/ddim_test.cc (100%) rename paddle/{majel => framework}/dim.h (100%) rename paddle/{majel => framework}/dim_test.cu (100%) rename paddle/{majel/README.md => framework/tensor.md} (100%) rename paddle/{majel => platform}/CMakeLists.txt (51%) rename paddle/{majel/detail/cuda_assert.h => platform/assert.h} (100%) rename paddle/{majel => platform}/cuda_test.cu (100%) rename paddle/{majel/detail => platform}/hostdevice.h (100%) rename paddle/{majel => platform}/place.cc (100%) rename paddle/{majel => platform}/place.h (100%) rename paddle/{majel => platform}/place_test.cc (100%) diff --git a/paddle/framework/CMakeLists.txt b/paddle/framework/CMakeLists.txt new file mode 100644 index 00000000000..673cfa19ac3 --- /dev/null +++ b/paddle/framework/CMakeLists.txt @@ -0,0 +1,4 @@ +cc_library(ddim SRCS ddim.cc) +cc_test(ddim_test SRCS ddim_test.cc DEPS ddim) + +nv_test(dim_test SRCS dim_test.cu DEPS ddim) diff --git a/paddle/majel/ddim.cc b/paddle/framework/ddim.cc similarity index 100% rename from paddle/majel/ddim.cc rename to paddle/framework/ddim.cc diff --git a/paddle/majel/ddim.h b/paddle/framework/ddim.h similarity index 100% rename from paddle/majel/ddim.h rename to paddle/framework/ddim.h diff --git a/paddle/majel/ddim_test.cc b/paddle/framework/ddim_test.cc similarity index 100% rename from paddle/majel/ddim_test.cc rename to paddle/framework/ddim_test.cc diff --git a/paddle/majel/dim.h b/paddle/framework/dim.h similarity index 100% rename from paddle/majel/dim.h rename to paddle/framework/dim.h diff --git a/paddle/majel/dim_test.cu b/paddle/framework/dim_test.cu similarity index 100% rename from paddle/majel/dim_test.cu rename to paddle/framework/dim_test.cu diff --git a/paddle/majel/README.md b/paddle/framework/tensor.md similarity index 100% rename from paddle/majel/README.md rename to paddle/framework/tensor.md diff --git a/paddle/majel/CMakeLists.txt b/paddle/platform/CMakeLists.txt similarity index 51% rename from paddle/majel/CMakeLists.txt rename to paddle/platform/CMakeLists.txt index 93e5e2c22f0..c7d7b14518e 100644 --- a/paddle/majel/CMakeLists.txt +++ b/paddle/platform/CMakeLists.txt @@ -1,8 +1,4 @@ +nv_test(cuda_test SRCS cuda_test.cu) + cc_library(place SRCS place.cc) cc_test(place_test SRCS place_test.cc DEPS place glog gflags) - -cc_library(ddim SRCS ddim.cc) -cc_test(ddim_test SRCS ddim_test.cc DEPS ddim) - -nv_test(cuda_test SRCS cuda_test.cu) -nv_test(dim_test SRCS dim_test.cu DEPS ddim) diff --git a/paddle/majel/detail/cuda_assert.h b/paddle/platform/assert.h similarity index 100% rename from paddle/majel/detail/cuda_assert.h rename to paddle/platform/assert.h diff --git a/paddle/majel/cuda_test.cu b/paddle/platform/cuda_test.cu similarity index 100% rename from paddle/majel/cuda_test.cu rename to paddle/platform/cuda_test.cu diff --git a/paddle/majel/detail/hostdevice.h b/paddle/platform/hostdevice.h similarity index 100% rename from paddle/majel/detail/hostdevice.h rename to paddle/platform/hostdevice.h diff --git a/paddle/majel/place.cc b/paddle/platform/place.cc similarity index 100% rename from paddle/majel/place.cc rename to paddle/platform/place.cc diff --git a/paddle/majel/place.h b/paddle/platform/place.h similarity index 100% rename from paddle/majel/place.h rename to paddle/platform/place.h diff --git a/paddle/majel/place_test.cc b/paddle/platform/place_test.cc similarity index 100% rename from paddle/majel/place_test.cc rename to paddle/platform/place_test.cc -- GitLab