From a3896dc2fcc9fbebe465435326bdabe328d5871e Mon Sep 17 00:00:00 2001 From: superjom Date: Tue, 12 Dec 2017 10:44:57 +0800 Subject: [PATCH] mv backend out --- CMakeLists.txt | 16 ++++++++-------- visualdl/logic/CMakeLists.txt | 6 +++--- visualdl/logic/im.cc | 2 +- visualdl/logic/im.h | 8 ++++---- visualdl/logic/im_test.cc | 2 +- visualdl/logic/pybind.cc | 2 +- visualdl/logic/sdk.cc | 3 ++- visualdl/logic/sdk.h | 6 +++--- visualdl/storage/storage.h | 2 +- 9 files changed, 24 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 064e6b20..45213591 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/visualdl/logic/CMakeLists.txt b/visualdl/logic/CMakeLists.txt index b28e299a..8b804524 100644 --- a/visualdl/logic/CMakeLists.txt +++ b/visualdl/logic/CMakeLists.txt @@ -1,7 +1,7 @@ -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) diff --git a/visualdl/logic/im.cc b/visualdl/logic/im.cc index 305fb42c..76d55d22 100644 --- a/visualdl/logic/im.cc +++ b/visualdl/logic/im.cc @@ -1,7 +1,7 @@ #include #include -#include "visualdl/backend/logic/im.h" +#include "visualdl/logic/im.h" namespace visualdl { diff --git a/visualdl/logic/im.h b/visualdl/logic/im.h index de884b0a..5df59e29 100644 --- a/visualdl/logic/im.h +++ b/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 -#include #include #include -#include "visualdl/backend/storage/storage.h" +#include "visualdl/storage/storage.h" +#include "visualdl/utils/concurrency.h" namespace visualdl { diff --git a/visualdl/logic/im_test.cc b/visualdl/logic/im_test.cc index c3875654..deaab5e4 100644 --- a/visualdl/logic/im_test.cc +++ b/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/logic/pybind.cc b/visualdl/logic/pybind.cc index 4b114a53..7a79429a 100644 --- a/visualdl/logic/pybind.cc +++ b/visualdl/logic/pybind.cc @@ -2,7 +2,7 @@ #include #include -#include "visualdl/backend/logic/sdk.h" +#include "visualdl/logic/sdk.h" namespace py = pybind11; namespace vs = visualdl; diff --git a/visualdl/logic/sdk.cc b/visualdl/logic/sdk.cc index b5bebe56..51354151 100644 --- a/visualdl/logic/sdk.cc +++ b/visualdl/logic/sdk.cc @@ -1,4 +1,5 @@ -#include "visualdl/backend/logic/sdk.h" +#include "visualdl/logic/sdk.h" + #include namespace visualdl { diff --git a/visualdl/logic/sdk.h b/visualdl/logic/sdk.h index 9948ab70..3937ffaf 100644 --- a/visualdl/logic/sdk.h +++ b/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 #include #include -#include "visualdl/backend/logic/im.h" +#include "visualdl/logic/im.h" namespace visualdl { diff --git a/visualdl/storage/storage.h b/visualdl/storage/storage.h index a827a6db..2787d9af 100644 --- a/visualdl/storage/storage.h +++ b/visualdl/storage/storage.h @@ -5,7 +5,7 @@ #include #include -#include "visualdl/backend/storage/storage.pb.h" +#include "visualdl/storage/storage.pb.h" namespace visualdl { -- GitLab