diff --git a/CMakeLists.txt b/CMakeLists.txt index 6365d0bb51200135e969c26dbf11941fd75de41b..42de25a5eae72c7f2d062592e2498fb36aa6d0fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,8 @@ include(external/python) # find python and set path include_directories(${PROJECT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${PROJECT_SOURCE_DIR}/thirdparty/local/include) +# TODO(ChunweiYan) debug, remote latter +include_directories(/home/superjom/project/VisualDL/build/third_party/eigen3/src/extern_eigen3) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/storage) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/logic) @@ -38,9 +39,9 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/python) add_executable(vl_test ${PROJECT_SOURCE_DIR}/visualdl/test.cc - ${PROJECT_SOURCE_DIR}/visualdl/storage/storage_test.cc ${PROJECT_SOURCE_DIR}/visualdl/logic/sdk_test.cc ${PROJECT_SOURCE_DIR}/visualdl/utils/test_concurrency.cc + ${PROJECT_SOURCE_DIR}/visualdl/utils/test_image.cc ${PROJECT_SOURCE_DIR}/visualdl/utils/concurrency.h ${PROJECT_SOURCE_DIR}/visualdl/utils/filesystem.h ) diff --git a/visualdl/logic/CMakeLists.txt b/visualdl/logic/CMakeLists.txt index f38c9e73b25904febbdd111988091a5aa218c3b3..44c6579eca111ba3e1a9dab65b61722c41833e63 100644 --- a/visualdl/logic/CMakeLists.txt +++ b/visualdl/logic/CMakeLists.txt @@ -1,10 +1,10 @@ add_library(im ${PROJECT_SOURCE_DIR}/visualdl/logic/im.cc) -add_library(sdk ${PROJECT_SOURCE_DIR}/visualdl/logic/sdk.cc) +add_library(sdk ${PROJECT_SOURCE_DIR}/visualdl/logic/sdk.cc ${PROJECT_SOURCE_DIR}/visualdl/utils/image.h) add_dependencies(im storage_proto) add_dependencies(sdk entry storage storage_proto) ## pybind add_library(core SHARED ${PROJECT_SOURCE_DIR}/visualdl/logic/pybind.cc) -add_dependencies(core pybind python im entry tablet storage sdk protobuf glog) +add_dependencies(core pybind python im entry tablet storage sdk protobuf glog eigen3) target_link_libraries(core PRIVATE pybind entry python im tablet storage sdk protobuf glog) set_target_properties(core PROPERTIES PREFIX "" SUFFIX ".so") diff --git a/visualdl/logic/sdk.cc b/visualdl/logic/sdk.cc index 4303e7340cfd822f16fa3bcd0bb75e2e6360748b..069ef9551484296a5c1cb96d047fdd7d5a28f357 100644 --- a/visualdl/logic/sdk.cc +++ b/visualdl/logic/sdk.cc @@ -1,5 +1,7 @@ #include "visualdl/logic/sdk.h" +#include "visualdl/utils/image.h" + namespace visualdl { namespace components { @@ -101,7 +103,7 @@ void Image::SetSample(int index, const std::vector& data) { // production int size = std::accumulate( - shape.begin(), shape.end(), 1., [](float a, float b) { return a * b; }); + shape.begin(), shape.end(), 1., [](int a, int b) { return a * b; }); CHECK_GT(size, 0); CHECK_EQ(shape.size(), 3) << "shape should be something like (width, height, num_channel)"; @@ -111,7 +113,6 @@ void Image::SetSample(int index, CHECK_LT(index, num_samples_); CHECK_LE(index, num_records_); - // set data auto entry = step_.MutableData>(index); // trick to store int8 to protobuf std::vector data_str(data.size()); diff --git a/visualdl/logic/sdk_test.cc b/visualdl/logic/sdk_test.cc index 2b4c8e98dc2012524d4bc36c12a1ce4436b06d0d..b82e2543746bfe7d1dc6f2060560d2bd4c961df2 100644 --- a/visualdl/logic/sdk_test.cc +++ b/visualdl/logic/sdk_test.cc @@ -56,7 +56,7 @@ TEST(Image, test) { for (int step = 0; step < num_steps; step++) { image.StartSampling(); for (int i = 0; i < 7; i++) { - vector shape({3, 5, 5}); + vector shape({5, 5, 3}); vector data; for (int j = 0; j < 3 * 5 * 5; j++) { data.push_back(float(rand()) / RAND_MAX); diff --git a/visualdl/python/test_storage.py b/visualdl/python/test_storage.py index 05ae2f24c9631a654272a79a3b7ec3b83cfb2e0d..b754102784a0d2864675136fdec01aad7fafa035 100644 --- a/visualdl/python/test_storage.py +++ b/visualdl/python/test_storage.py @@ -36,7 +36,7 @@ class StorageTest(unittest.TestCase): image_writer = self.writer.image(tag, 10, 1) num_passes = 10 num_samples = 100 - shape = [3, 10, 10] + shape = [10, 10, 3] for pass_ in xrange(num_passes): image_writer.start_sampling()