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

@@ -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.")

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---------------#

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")
 

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---------------#