diff --git a/CMakeLists.txt b/CMakeLists.txt index 064e6b2076302eb72c6d02669a4de1a8b6be729a..452135915dad746d9fea9ac63d65ffdac193fc82 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 b28e299a98afe9970d6f9e654ecae39f95f8a6b7..8b8045246a23cd8c077c7976c393e254aa8e84de 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 305fb42c73cf4c6992a7d7fbd71ccbb00f7f7a5d..76d55d225bafe1754d14c351436bfde97041665e 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 de884b0a890a97025e90a90342909e9b33a6ba18..5df59e2994807cdfe4a0a5e746f8bbc264759433 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 c387565477ee9df0ae8d2872ae6416f79e08ca7e..deaab5e4704063cabb652b1a7940d6321ae93adb 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 4b114a53344c91102876b008f95c77ee797bfe05..7a79429a7dde5f11a9690ab326eb2cf2129610d6 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 b5bebe56d17dcc454560158bade5360f725df07a..513541511d48adc00e1a95f5bf51974fb0b1988f 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 9948ab709896784cea1c9294a2e4fac0586cee99..3937ffafbb91ac2792cb88a242a3833fa2bfc3e4 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 a827a6dbd8d936ff6f9c8de9c95289cd8cbff0ee..2787d9af87a9547921531b7dc509798a70001b71 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 {