fix glog problem (PaddlePaddle#81)

jacquesqiao · Jan 10, 2018 · ae821e5 · ae821e5
1 parent f7d55bc
commit ae821e5
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,8 +21,10 @@ option(ON_RELEASE       "RELEASE mode" ON)
 
 
 include(external/zlib)      # download, build, install zlib
-include(external/gflags)    # download, build, install gflags
-include(external/glog)      # download, build, install glog
+if (NOT ON_RELEASE)
+  include(external/gflags)    # download, build, install gflags
+  include(external/glog)      # download, build, install glog
+endif(NOT ON_RELEASE)
 include(external/gtest)     # download, build, install gtest
 include(external/eigen)     # download eigen
 include(external/pybind11)  # download pybind11
@@ -32,7 +34,7 @@ include(external/python)    # find python and set path
 
 if (NOT ON_RELEASE)
   message(STATUS "build on debug mode")
-  add_compile_options(-DVISUALDL_WITH_GLOG)
+  add_definitions(-DVISUALDL_WITH_GLOG)
 endif(NOT ON_RELEASE)
 
 include_directories(${PROJECT_SOURCE_DIR})

diff --git a/visualdl/logic/CMakeLists.txt b/visualdl/logic/CMakeLists.txt
@@ -1,10 +1,15 @@
 add_library(im ${PROJECT_SOURCE_DIR}/visualdl/logic/im.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)
+add_dependencies(sdk entry storage storage_proto eigen3)
 
 ## pybind
 add_library(core SHARED ${PROJECT_SOURCE_DIR}/visualdl/logic/pybind.cc)
-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)
+if (NOT ON_RELEASE)
+  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)
+else()
+  add_dependencies(core pybind python im entry tablet storage sdk protobuf eigen3)
+  target_link_libraries(core PRIVATE pybind entry python im tablet storage sdk protobuf)
+endif()
 set_target_properties(core PROPERTIES PREFIX "" SUFFIX ".so")
diff --git a/visualdl/logic/histogram.h b/visualdl/logic/histogram.h
@@ -1,7 +1,7 @@
 #ifndef VISUALDL_LOGIC_HISTOGRAM_H
 #define VISUALDL_LOGIC_HISTOGRAM_H
 
-#include <glog/logging.h>
+#include "visualdl/utils/logging.h"
 #include <cstdlib>
 #include <limits>
 #include <vector>

diff --git a/visualdl/logic/im.cc b/visualdl/logic/im.cc
@@ -1,4 +1,4 @@
-#include <glog/logging.h>
+#include "visualdl/utils/logging.h"
 #include <ctime>
 
 #include "visualdl/logic/im.h"

diff --git a/visualdl/logic/im.h b/visualdl/logic/im.h
@@ -1,7 +1,7 @@
 #ifndef VISUALDL_LOGIC_IM_H
 #define VISUALDL_LOGIC_IM_H
 
-#include <glog/logging.h>
+#include "visualdl/utils/logging.h"
 #include <memory>
 #include <mutex>
 #include <string>

diff --git a/visualdl/storage/storage.h b/visualdl/storage/storage.h
@@ -1,7 +1,7 @@
 #ifndef VISUALDL_STORAGE_STORAGE_H
 #define VISUALDL_STORAGE_STORAGE_H
 
-#include <glog/logging.h>
+#include "visualdl/utils/logging.h"
 #include <algorithm>
 #include <set>
 #include <vector>

diff --git a/visualdl/storage/tablet.h b/visualdl/storage/tablet.h
@@ -1,7 +1,7 @@
 #ifndef VISUALDL_TABLET_H
 #define VISUALDL_TABLET_H
 
-#include <glog/logging.h>
+#include "visualdl/utils/logging.h"
 
 #include "visualdl/logic/im.h"
 #include "visualdl/storage/record.h"

diff --git a/visualdl/utils/concurrency.h b/visualdl/utils/concurrency.h
@@ -1,7 +1,7 @@
 #ifndef VISUALDL_UTILS_CONCURRENCY_H
 #define VISUALDL_UTILS_CONCURRENCY_H
 
-#include <glog/logging.h>
+#include "visualdl/utils/logging.h"
 #include <chrono>
 #include <memory>
 #include <thread>

diff --git a/visualdl/utils/filesystem.h b/visualdl/utils/filesystem.h
@@ -44,7 +44,7 @@ bool DeSerializeFromFile(T* proto, const std::string& path) {
 }
 
 static void TryMkdir(const std::string& dir) {
-  VLOG(1) << "try to mkdir " << dir;
+//  VLOG(1) << "try to mkdir " << dir;
   struct stat st = {0};
   if (stat(dir.c_str(), &st) == -1) {
     ::mkdir(dir.c_str(), 0700);

diff --git a/visualdl/utils/image.h b/visualdl/utils/image.h
@@ -1,7 +1,7 @@
 #ifndef VISUALDL_UTILS_IMAGE_H
 #define VISUALDL_UTILS_IMAGE_H
 
-#include <glog/logging.h>
+#include "visualdl/utils/logging.h"
 #include <Eigen/Core>
 #include <unsupported/Eigen/CXX11/Tensor>
 

diff --git a/visualdl/utils/logging.h b/visualdl/utils/logging.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #if defined(VISUALDL_WITH_GLOG)
-#include <glog/logging.h>
+#include "visualdl/utils/logging.h"
 #endif
 
 namespace visualdl {

diff --git a/visualdl/utils/test_concurrency.cc b/visualdl/utils/test_concurrency.cc
@@ -1,6 +1,6 @@
 #include "visualdl/utils/concurrency.h"
 
-#include <glog/logging.h>
+#include "visualdl/utils/logging.h"
 #include <gtest/gtest.h>
 
 namespace visualdl {