fixed glog bug, enable stack trace, used python faulthandler

apache · Oct 6, 2020 · 470a545 · 470a545
1 parent 554507a
commit 470a545
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 3 deletions.
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -67,7 +67,7 @@ ENDIF()
 
 FIND_PACKAGE(Glog)
 IF(GLOG_FOUND)
-    #MESSAGE(STATUS "GLOG FOUND at ${GLOG_INCLUDE_DIR}")
+    MESSAGE(STATUS "FOUND GLOG at ${GLOG_INCLUDE_DIR}")
     #ADD_DEFINITIONS("-DUSE_GLOG")
     SET(USE_GLOG TRUE)
     LIST(APPEND SINGA_LINKER_LIBS ${GLOG_LIBRARIES})

diff --git a/include/singa/utils/logging.h b/include/singa/utils/logging.h
@@ -24,6 +24,7 @@
 #ifndef SINGA_UTILS_LOGGING_H_
 #define SINGA_UTILS_LOGGING_H_
 
+#include "singa/singa_config.h"
 #include <stdlib.h>
 
 #include <sstream>

diff --git a/python/singa/__init__.py b/python/singa/__init__.py
@@ -17,4 +17,9 @@
 
 from . import singa_wrap
 
+import faulthandler
+faulthandler.enable()
+
+singa_wrap.InitLogging("")
+
 __version__ = singa_wrap.SINGA_VERSION
diff --git a/src/api/core_tensor.i b/src/api/core_tensor.i
@@ -34,6 +34,8 @@
 #include "singa/proto/core.pb.h"
 // #include "singa/proto/model.pb.h"
 #include "half.hpp"
+#include "singa/utils/logging.h"
+
 using singa::DataType;
 %}
 %shared_ptr(singa::Device)
@@ -384,4 +386,6 @@ namespace singa{
 
   Tensor CrossEntropyFwd(const Tensor& p, const Tensor& t);
   Tensor SoftmaxCrossEntropyBwd(const Tensor& p, const Tensor& t);
+
+  void InitLogging(const char* argv);
 }
diff --git a/src/core/tensor/tensor.cc b/src/core/tensor/tensor.cc
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 #include "singa/core/tensor.h"
-// #include "singa/utils/stacktrace.h"
 #include <algorithm>
 #include <utility>
 

diff --git a/test/gtest/gtest_main.cc b/test/gtest/gtest_main.cc
@@ -30,9 +30,11 @@
 #include <stdio.h>
 
 #include "gtest/gtest.h"
+#include "singa/utils/logging.h"
 
 GTEST_API_ int main(int argc, char **argv) {
   printf("Running main() from gtest_main.cc\n");
+  singa::InitLogging("");
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
diff --git a/test/singa/test_logging.cc b/test/singa/test_logging.cc
@@ -23,7 +23,6 @@
 #include "singa/utils/logging.h"
 
 TEST(Logging, InfoLogging) {
-  singa::InitLogging("");
   int a = 3;
   CHECK_EQ(a, 3);
   LOG(INFO) << "test info logging";