From 53da94b84a846d1f788c560a661c925c77062d6e Mon Sep 17 00:00:00 2001 From: Bo Zhou <2466956298@qq.com> Date: Wed, 8 Apr 2020 19:08:25 +0800 Subject: [PATCH] update directory structure to support the icode platform (#242) * update directory structure to support the icode platform * remove source code generated by protobuf * move code into the core directory --- deepes/CMakeLists.txt | 12 ++++++------ deepes/{ => core}/include/adam_optimizer.h | 0 deepes/{ => core}/include/cached_gaussian_sampling.h | 0 deepes/{ => core}/include/gaussian_sampling.h | 0 deepes/{ => core}/include/optimizer.h | 0 deepes/{ => core}/include/optimizer_factory.h | 0 deepes/{ => core}/include/sampling_factory.h | 0 deepes/{ => core}/include/sampling_method.h | 0 deepes/{ => core}/include/sgd_optimizer.h | 0 deepes/{ => core}/include/utils.h | 0 deepes/{ => core}/src/adam_optimizer.cc | 0 deepes/{ => core}/src/cached_gaussian_sampling.cc | 0 deepes/{ => core}/src/gaussian_sampling.cc | 0 deepes/{ => core}/src/optimizer_factory.cc | 0 deepes/{ => core}/src/proto/deepes.proto | 0 deepes/{ => core}/src/sampling_factory.cc | 0 deepes/{ => core}/src/sgd_optimizer.cc | 0 deepes/{ => core}/src/utils.cc | 0 .../paddle => paddle/include}/async_es_agent.h | 0 deepes/{include/paddle => paddle/include}/es_agent.h | 0 deepes/{src/paddle => paddle/src}/async_es_agent.cc | 0 deepes/{src/paddle => paddle/src}/es_agent.cc | 0 deepes/scripts/build.sh | 6 +++--- deepes/test/CMakeLists.txt | 8 ++++---- deepes/test/run_test.sh | 6 +++--- deepes/{include/torch => torch/include}/es_agent.h | 0 26 files changed, 16 insertions(+), 16 deletions(-) rename deepes/{ => core}/include/adam_optimizer.h (100%) rename deepes/{ => core}/include/cached_gaussian_sampling.h (100%) rename deepes/{ => core}/include/gaussian_sampling.h (100%) rename deepes/{ => core}/include/optimizer.h (100%) rename deepes/{ => core}/include/optimizer_factory.h (100%) rename deepes/{ => core}/include/sampling_factory.h (100%) rename deepes/{ => core}/include/sampling_method.h (100%) rename deepes/{ => core}/include/sgd_optimizer.h (100%) rename deepes/{ => core}/include/utils.h (100%) rename deepes/{ => core}/src/adam_optimizer.cc (100%) rename deepes/{ => core}/src/cached_gaussian_sampling.cc (100%) rename deepes/{ => core}/src/gaussian_sampling.cc (100%) rename deepes/{ => core}/src/optimizer_factory.cc (100%) rename deepes/{ => core}/src/proto/deepes.proto (100%) rename deepes/{ => core}/src/sampling_factory.cc (100%) rename deepes/{ => core}/src/sgd_optimizer.cc (100%) rename deepes/{ => core}/src/utils.cc (100%) rename deepes/{include/paddle => paddle/include}/async_es_agent.h (100%) rename deepes/{include/paddle => paddle/include}/es_agent.h (100%) rename deepes/{src/paddle => paddle/src}/async_es_agent.cc (100%) rename deepes/{src/paddle => paddle/src}/es_agent.cc (100%) rename deepes/{include/torch => torch/include}/es_agent.h (100%) diff --git a/deepes/CMakeLists.txt b/deepes/CMakeLists.txt index d1f482a..9d9a279 100644 --- a/deepes/CMakeLists.txt +++ b/deepes/CMakeLists.txt @@ -29,21 +29,21 @@ if (OPENMP_FOUND) endif() -file(GLOB src "src/*.cc") -include_directories("include") +file(GLOB src "core/src/*.cc") +include_directories("core/include") include_directories("benchmark") ########## PaddleLite config ########## if (WITH_PADDLE) add_definitions(-g -O3 -pthread) - include_directories("include/paddle") + include_directories("paddle/include") include_directories("${PROJECT_SOURCE_DIR}/inference_lite_lib/cxx/include" "${PROJECT_SOURCE_DIR}/inference_lite_lib/third_party/mklml/include") link_directories("${PROJECT_SOURCE_DIR}/inference_lite_lib/cxx/lib" "${PROJECT_SOURCE_DIR}/inference_lite_lib/third_party/mklml/lib") - file(GLOB framework_src "src/paddle/*.cc") + file(GLOB framework_src "paddle/src/*.cc") set(demo "${PROJECT_SOURCE_DIR}/demo/paddle/cartpole_solver_parallel.cc") #set(demo "${PROJECT_SOURCE_DIR}/demo/paddle/cartpole_async_solver.cc") ########## Torch config ########## @@ -51,10 +51,10 @@ elseif (WITH_TORCH) list(APPEND CMAKE_PREFIX_PATH "./libtorch") find_package(Torch REQUIRED ON) - include_directories("include/torch") + include_directories("torch/include") include_directories("demo/torch") - file(GLOB framework_src "src/torch/*.cc") + file(GLOB framework_src "torch/src/*.cc") set(demo "${PROJECT_SOURCE_DIR}/demo/torch/cartpole_solver_parallel.cc") else () message("ERROR: You should choose at least one framework to compile DeepES.") diff --git a/deepes/include/adam_optimizer.h b/deepes/core/include/adam_optimizer.h similarity index 100% rename from deepes/include/adam_optimizer.h rename to deepes/core/include/adam_optimizer.h diff --git a/deepes/include/cached_gaussian_sampling.h b/deepes/core/include/cached_gaussian_sampling.h similarity index 100% rename from deepes/include/cached_gaussian_sampling.h rename to deepes/core/include/cached_gaussian_sampling.h diff --git a/deepes/include/gaussian_sampling.h b/deepes/core/include/gaussian_sampling.h similarity index 100% rename from deepes/include/gaussian_sampling.h rename to deepes/core/include/gaussian_sampling.h diff --git a/deepes/include/optimizer.h b/deepes/core/include/optimizer.h similarity index 100% rename from deepes/include/optimizer.h rename to deepes/core/include/optimizer.h diff --git a/deepes/include/optimizer_factory.h b/deepes/core/include/optimizer_factory.h similarity index 100% rename from deepes/include/optimizer_factory.h rename to deepes/core/include/optimizer_factory.h diff --git a/deepes/include/sampling_factory.h b/deepes/core/include/sampling_factory.h similarity index 100% rename from deepes/include/sampling_factory.h rename to deepes/core/include/sampling_factory.h diff --git a/deepes/include/sampling_method.h b/deepes/core/include/sampling_method.h similarity index 100% rename from deepes/include/sampling_method.h rename to deepes/core/include/sampling_method.h diff --git a/deepes/include/sgd_optimizer.h b/deepes/core/include/sgd_optimizer.h similarity index 100% rename from deepes/include/sgd_optimizer.h rename to deepes/core/include/sgd_optimizer.h diff --git a/deepes/include/utils.h b/deepes/core/include/utils.h similarity index 100% rename from deepes/include/utils.h rename to deepes/core/include/utils.h diff --git a/deepes/src/adam_optimizer.cc b/deepes/core/src/adam_optimizer.cc similarity index 100% rename from deepes/src/adam_optimizer.cc rename to deepes/core/src/adam_optimizer.cc diff --git a/deepes/src/cached_gaussian_sampling.cc b/deepes/core/src/cached_gaussian_sampling.cc similarity index 100% rename from deepes/src/cached_gaussian_sampling.cc rename to deepes/core/src/cached_gaussian_sampling.cc diff --git a/deepes/src/gaussian_sampling.cc b/deepes/core/src/gaussian_sampling.cc similarity index 100% rename from deepes/src/gaussian_sampling.cc rename to deepes/core/src/gaussian_sampling.cc diff --git a/deepes/src/optimizer_factory.cc b/deepes/core/src/optimizer_factory.cc similarity index 100% rename from deepes/src/optimizer_factory.cc rename to deepes/core/src/optimizer_factory.cc diff --git a/deepes/src/proto/deepes.proto b/deepes/core/src/proto/deepes.proto similarity index 100% rename from deepes/src/proto/deepes.proto rename to deepes/core/src/proto/deepes.proto diff --git a/deepes/src/sampling_factory.cc b/deepes/core/src/sampling_factory.cc similarity index 100% rename from deepes/src/sampling_factory.cc rename to deepes/core/src/sampling_factory.cc diff --git a/deepes/src/sgd_optimizer.cc b/deepes/core/src/sgd_optimizer.cc similarity index 100% rename from deepes/src/sgd_optimizer.cc rename to deepes/core/src/sgd_optimizer.cc diff --git a/deepes/src/utils.cc b/deepes/core/src/utils.cc similarity index 100% rename from deepes/src/utils.cc rename to deepes/core/src/utils.cc diff --git a/deepes/include/paddle/async_es_agent.h b/deepes/paddle/include/async_es_agent.h similarity index 100% rename from deepes/include/paddle/async_es_agent.h rename to deepes/paddle/include/async_es_agent.h diff --git a/deepes/include/paddle/es_agent.h b/deepes/paddle/include/es_agent.h similarity index 100% rename from deepes/include/paddle/es_agent.h rename to deepes/paddle/include/es_agent.h diff --git a/deepes/src/paddle/async_es_agent.cc b/deepes/paddle/src/async_es_agent.cc similarity index 100% rename from deepes/src/paddle/async_es_agent.cc rename to deepes/paddle/src/async_es_agent.cc diff --git a/deepes/src/paddle/es_agent.cc b/deepes/paddle/src/es_agent.cc similarity index 100% rename from deepes/src/paddle/es_agent.cc rename to deepes/paddle/src/es_agent.cc diff --git a/deepes/scripts/build.sh b/deepes/scripts/build.sh index 2b5f6da..95b6367 100644 --- a/deepes/scripts/build.sh +++ b/deepes/scripts/build.sh @@ -36,10 +36,10 @@ else fi #----------------protobuf-------------# -cp ./src/proto/deepes.proto ./ +cp ./core/src/proto/deepes.proto ./ protoc deepes.proto --cpp_out ./ -mv deepes.pb.h ./include -mv deepes.pb.cc ./src +mv deepes.pb.h core/include +mv deepes.pb.cc core/src rm deepes.proto #----------------build---------------# diff --git a/deepes/test/CMakeLists.txt b/deepes/test/CMakeLists.txt index ebd2907..be7a983 100644 --- a/deepes/test/CMakeLists.txt +++ b/deepes/test/CMakeLists.txt @@ -21,11 +21,11 @@ find_package(Torch REQUIRED ON) # include and source file(GLOB test_src "../test/src/*.cc") -file(GLOB core_src "../src/*.cc") -file(GLOB agent_src "../src/torch/*.cc") +file(GLOB core_src "../core/src/*.cc") +file(GLOB agent_src "../torch/src/*.cc") -include_directories("../include/torch") -include_directories("../include") +include_directories("../torch/include") +include_directories("../core/include") include_directories("../benchmark") include_directories("../test/include") diff --git a/deepes/test/run_test.sh b/deepes/test/run_test.sh index 34e6acb..1d6bfdf 100644 --- a/deepes/test/run_test.sh +++ b/deepes/test/run_test.sh @@ -12,10 +12,10 @@ echo "Cannot find the torch library: ../libtorch" fi #----------------protobuf-------------# -cp ./src/proto/deepes.proto ./ +cp ./core/src/proto/deepes.proto ./ protoc deepes.proto --cpp_out ./ -mv deepes.pb.h ./include -mv deepes.pb.cc ./src +mv deepes.pb.h core/include +mv deepes.pb.cc core/src #----------------build---------------# diff --git a/deepes/include/torch/es_agent.h b/deepes/torch/include/es_agent.h similarity index 100% rename from deepes/include/torch/es_agent.h rename to deepes/torch/include/es_agent.h -- GitLab