fix compile with on_release off (PaddlePaddle#100)

jacquesqiao · Jan 12, 2018 · 7780126 · 7780126
1 parent 96e2374
commit 7780126
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,6 +44,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/storage)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/logic)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/visualdl/python)
 
+# compile test only in release mode
 if (NOT ON_RELEASE)
 add_executable(vl_test
         ${PROJECT_SOURCE_DIR}/visualdl/test.cc

diff --git a/visualdl/logic/im.cc b/visualdl/logic/im.cc
@@ -1,10 +1,10 @@
-#include "visualdl/utils/logging.h"
 #include <ctime>
 
 #include "visualdl/logic/im.h"
 #include "visualdl/storage/entry.h"
 #include "visualdl/storage/storage.h"
 #include "visualdl/storage/tablet.h"
+#include "visualdl/utils/logging.h"
 
 namespace visualdl {
 

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

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

diff --git a/visualdl/utils/logging.h b/visualdl/utils/logging.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #if defined(VISUALDL_WITH_GLOG)
-#include "visualdl/utils/logging.h"
+#include <glog/logging.h>
 #endif
 
 namespace visualdl {
@@ -110,15 +110,6 @@ class NotImplementedException : public std::logic_error {
   NotImplementedException() : std::logic_error{"Function not implemented"} {}
 };
 
-static void SignalHandler(int sig) {
-  LOG(INFO) << "get signal " << sig;
-  exit(sig);
-}
-
-struct __once_caller__ {
-  __once_caller__() { std::signal(SIGINT, SignalHandler); }
-};
-
 }  // namespace log
 
 }  // namespace visualdl