Merge pull request PaddlePaddle#49 from ChunweiYan/feature/mv_backend…

…_out
jacquesqiao · Dec 12, 2017 · f1be2fa · f1be2fa
2 parents 7ff1db0 + 70c808c
commit f1be2fa
Show file tree

Hide file tree

Showing 27 changed files with 66 additions and 41 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ cache:
   directories:
     - $HOME/.ccache
     - $HOME/.cache/pip
-    - $TRAVIS_BUILD_DIR/build/third_party
 sudo: required
 dist: trusty
 os:
@@ -20,6 +19,9 @@ addons:
       - python-wheel
       - clang-format-3.8
       - ccache
+script:
+  /bin/bash ./tests.sh
+
 notifications:
   email:
     on_success: change

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,12 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.2)
 project(VisualDL)
 
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif(CCACHE_FOUND)
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "-fPIC")
@@ -25,16 +31,16 @@ include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty/local/include)
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/backend/storage)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/backend/logic)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/storage)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/logic)
 
 add_executable(vl_test
-        ${PROJECT_SOURCE_DIR}/visualdl/backend/test.cc
-        ${PROJECT_SOURCE_DIR}/visualdl/backend/storage/storage_test.cc
-        ${PROJECT_SOURCE_DIR}/visualdl/backend/utils/test_concurrency.cc
-        ${PROJECT_SOURCE_DIR}/visualdl/backend/logic/im_test.cc
-        ${PROJECT_SOURCE_DIR}/visualdl/backend/utils/concurrency.h
-        ${PROJECT_SOURCE_DIR}/visualdl/backend/utils/filesystem.h
+        ${PROJECT_SOURCE_DIR}/visualdl/test.cc
+        ${PROJECT_SOURCE_DIR}/visualdl/storage/storage_test.cc
+        ${PROJECT_SOURCE_DIR}/visualdl/utils/test_concurrency.cc
+        ${PROJECT_SOURCE_DIR}/visualdl/logic/im_test.cc
+        ${PROJECT_SOURCE_DIR}/visualdl/utils/concurrency.h
+        ${PROJECT_SOURCE_DIR}/visualdl/utils/filesystem.h
         )
 target_link_libraries(vl_test storage im gtest glog protobuf gflags pthread)
 

diff --git a/tests.sh b/tests.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -ex
+
+sudo pip install numpy
+#sudo apt-get install --only-upgrade cmake -y
+mkdir -p build
+cd build
+cmake ..
+make
+make test
+
+#if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./travis/run_on_pull_requests; fi
+#if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./travis/run_on_non_pull_requests; fi
diff --git a/visualdl/backend/logic/CMakeLists.txt b/visualdl/backend/logic/CMakeLists.txt
diff --git a/visualdl/logic/CMakeLists.txt b/visualdl/logic/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_library(sdk ${PROJECT_SOURCE_DIR}/visualdl/logic/sdk.cc)
+add_library(im ${PROJECT_SOURCE_DIR}/visualdl/logic/im.cc)
+add_dependencies(im storage_proto)
+add_dependencies(sdk storage_proto)
+
+## pybind
+add_library(core SHARED ${PROJECT_SOURCE_DIR}/visualdl/logic/pybind.cc)
+add_dependencies(core pybind python im storage sdk protobuf glog)
+target_link_libraries(core PRIVATE pybind python im storage sdk protobuf glog)
diff --git a/visualdl/backend/logic/im.cc → visualdl/logic/im.cc b/visualdl/backend/logic/im.cc → visualdl/logic/im.cc
@@ -1,7 +1,7 @@
 #include <glog/logging.h>
 #include <ctime>
 
-#include "visualdl/backend/logic/im.h"
+#include "visualdl/logic/im.h"
 
 namespace visualdl {
 

diff --git a/visualdl/backend/logic/im.h → visualdl/logic/im.h b/visualdl/backend/logic/im.h → visualdl/logic/im.h
@@ -1,12 +1,12 @@
-#ifndef VISUALDL_BACKEND_LOGIC_IM_H
-#define VISUALDL_BACKEND_LOGIC_IM_H
+#ifndef VISUALDL_LOGIC_IM_H
+#define VISUALDL_LOGIC_IM_H
 
 #include <glog/logging.h>
-#include <visualdl/backend/utils/concurrency.h>
 #include <memory>
 #include <string>
 
-#include "visualdl/backend/storage/storage.h"
+#include "visualdl/storage/storage.h"
+#include "visualdl/utils/concurrency.h"
 
 namespace visualdl {
 

diff --git a/visualdl/backend/logic/im_test.cc → visualdl/logic/im_test.cc b/visualdl/backend/logic/im_test.cc → visualdl/logic/im_test.cc
@@ -1,4 +1,4 @@
-#include "visualdl/backend/logic/im.h"
+#include "visualdl/logic/im.h"
 
 #include "gtest/gtest.h"
 

diff --git a/visualdl/backend/logic/pybind.cc → visualdl/logic/pybind.cc b/visualdl/backend/logic/pybind.cc → visualdl/logic/pybind.cc
@@ -2,7 +2,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "visualdl/backend/logic/sdk.h"
+#include "visualdl/logic/sdk.h"
 
 namespace py = pybind11;
 namespace vs = visualdl;

diff --git a/visualdl/backend/logic/sdk.cc → visualdl/logic/sdk.cc b/visualdl/backend/logic/sdk.cc → visualdl/logic/sdk.cc
@@ -1,4 +1,5 @@
-#include "visualdl/backend/logic/sdk.h"
+#include "visualdl/logic/sdk.h"
+
 #include <google/protobuf/text_format.h>
 
 namespace visualdl {

diff --git a/visualdl/backend/logic/sdk.h → visualdl/logic/sdk.h b/visualdl/backend/logic/sdk.h → visualdl/logic/sdk.h
@@ -1,11 +1,11 @@
-#ifndef VISUALDL_BACKEND_LOGIC_SDK_H
-#define VISUALDL_BACKEND_LOGIC_SDK_H
+#ifndef VISUALDL_LOGIC_SDK_H
+#define VISUALDL_LOGIC_SDK_H
 
 #include <glog/logging.h>
 #include <time.h>
 #include <map>
 
-#include "visualdl/backend/logic/im.h"
+#include "visualdl/logic/im.h"
 
 namespace visualdl {
 

diff --git a/visualdl/backend/python/__init__.py → visualdl/python/__init__.py b/visualdl/backend/python/__init__.py → visualdl/python/__init__.py
diff --git a/visualdl/backend/python/summary.py → visualdl/python/summary.py b/visualdl/backend/python/summary.py → visualdl/python/summary.py
diff --git a/visualdl/backend/python/test_read_service.py → visualdl/python/test_read_service.py b/visualdl/backend/python/test_read_service.py → visualdl/python/test_read_service.py
diff --git a/visualdl/backend/python/test_summary.py → visualdl/python/test_summary.py b/visualdl/backend/python/test_summary.py → visualdl/python/test_summary.py
diff --git a/...aldl/backend/python/test_write_service.py → visualdl/python/test_write_service.py b/...aldl/backend/python/test_write_service.py → visualdl/python/test_write_service.py
diff --git a/visualdl/backend/storage/CMakeLists.txt → visualdl/storage/CMakeLists.txt b/visualdl/backend/storage/CMakeLists.txt → visualdl/storage/CMakeLists.txt
diff --git a/visualdl/backend/storage/storage.cc → visualdl/storage/storage.cc b/visualdl/backend/storage/storage.cc → visualdl/storage/storage.cc
@@ -1,9 +1,9 @@
 #include <glog/logging.h>
-#include <visualdl/backend/utils/concurrency.h>
 #include <fstream>
 
-#include "visualdl/backend/storage/storage.h"
-#include "visualdl/backend/utils/filesystem.h"
+#include "visualdl/storage/storage.h"
+#include "visualdl/utils/concurrency.h"
+#include "visualdl/utils/filesystem.h"
 
 namespace visualdl {
 

diff --git a/visualdl/backend/storage/storage.h → visualdl/storage/storage.h b/visualdl/backend/storage/storage.h → visualdl/storage/storage.h
@@ -5,7 +5,7 @@
 #include <map>
 #include <string>
 
-#include "visualdl/backend/storage/storage.pb.h"
+#include "visualdl/storage/storage.pb.h"
 
 namespace visualdl {
 

diff --git a/visualdl/backend/storage/storage.proto → visualdl/storage/storage.proto b/visualdl/backend/storage/storage.proto → visualdl/storage/storage.proto
diff --git a/visualdl/backend/storage/storage_test.cc → visualdl/storage/storage_test.cc b/visualdl/backend/storage/storage_test.cc → visualdl/storage/storage_test.cc
@@ -1,4 +1,4 @@
-#include "visualdl/backend/storage/storage.h"
+#include "visualdl/storage/storage.h"
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>

diff --git a/visualdl/backend/test.cc → visualdl/test.cc b/visualdl/backend/test.cc → visualdl/test.cc
diff --git a/visualdl/backend/test.py → visualdl/test.py b/visualdl/backend/test.py → visualdl/test.py
diff --git a/visualdl/backend/utils/concurrency.h → visualdl/utils/concurrency.h b/visualdl/backend/utils/concurrency.h → visualdl/utils/concurrency.h
@@ -1,5 +1,5 @@
-#ifndef VISUALDL_BACKEND_UTILS_CONCURRENCY_H
-#define VISUALDL_BACKEND_UTILS_CONCURRENCY_H
+#ifndef VISUALDL_UTILS_CONCURRENCY_H
+#define VISUALDL_UTILS_CONCURRENCY_H
 
 #include <glog/logging.h>
 #include <chrono>

diff --git a/visualdl/backend/utils/filesystem.h → visualdl/utils/filesystem.h b/visualdl/backend/utils/filesystem.h → visualdl/utils/filesystem.h
@@ -1,5 +1,5 @@
-#ifndef VISUALDL_BACKEND_UTILS_FILESYSTEM_H
-#define VISUALDL_BACKEND_UTILS_FILESYSTEM_H
+#ifndef VISUALDL_UTILS_FILESYSTEM_H
+#define VISUALDL_UTILS_FILESYSTEM_H
 
 #include <google/protobuf/text_format.h>
 #include <sys/stat.h>

diff --git a/visualdl/backend/utils/log.h → visualdl/utils/log.h b/visualdl/backend/utils/log.h → visualdl/utils/log.h
@@ -1,7 +1,8 @@
-#ifndef VISUALDL_BACKEND_UTILS_LOG_H
-#define VISUALDL_BACKEND_UTILS_LOG_H
+#ifndef VISUALDL_UTILS_LOG_H
+#define VISUALDL_UTILS_LOG_H
 
 #include <stdexcept>
+
 namespace visualdl {
 
 namespace log {

diff --git a/visualdl/backend/utils/test_concurrency.cc → visualdl/utils/test_concurrency.cc b/visualdl/backend/utils/test_concurrency.cc → visualdl/utils/test_concurrency.cc
@@ -1,4 +1,4 @@
-#include "visualdl/backend/utils/concurrency.h"
+#include "visualdl/utils/concurrency.h"
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
@@ -16,4 +16,4 @@ TEST(concurrency, test) {
   cc::PeriodExector::Global()(std::move(task), 200);
 }
 
-}  // namespace visualdl
+}  // namespace visualdl