mv backend out

CMakeLists.txt

@@ -25,16 +25,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)
 

visualdl/logic/CMakeLists.txt

-add_library(sdk ${PROJECT_SOURCE_DIR}/visualdl/backend/logic/sdk.cc)
-add_library(im ${PROJECT_SOURCE_DIR}/visualdl/backend/logic/im.cc)
+add_library(sdk ${PROJECT_SOURCE_DIR}/visualdl/logic/sdk.cc)
+add_library(im ${PROJECT_SOURCE_DIR}/visualdl/logic/im.cc)
 
 ## pybind
-add_library(core SHARED ${PROJECT_SOURCE_DIR}/visualdl/backend/logic/pybind.cc)
+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)

visualdl/logic/im.cc

 #include <glog/logging.h>
 #include <ctime>
 
-#include "visualdl/backend/logic/im.h"
+#include "visualdl/logic/im.h"
 
 namespace visualdl {
 

visualdl/logic/im.h

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

visualdl/logic/im_test.cc

-#include "visualdl/backend/logic/im.h"
+#include "visualdl/logic/im.h"
 
 #include "gtest/gtest.h"
 

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;

visualdl/logic/sdk.cc

-#include "visualdl/backend/logic/sdk.h"
+#include "visualdl/logic/sdk.h"
+
 #include <google/protobuf/text_format.h>
 
 namespace visualdl {

visualdl/logic/sdk.h

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

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 {