fix

apache · Jun 19, 2017 · fda3717 · fda3717
1 parent 95ba377
commit fda3717
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/initialize.cc b/src/initialize.cc
@@ -30,9 +30,8 @@ void segfault_logger(int sig) {
   }
 #endif  // DMLC_LOG_STACK_TRACE
 
-  if (prev_handler == nullptr ||
-      prev_handler == SIG_DFL) {
-    exit(1);
+  if (prev_handler == SIG_DFL) {
+    exit(-1);
   } else if (prev_handler == SIG_IGN) {
   } else {
     prev_handler(sig);
@@ -44,6 +43,9 @@ class LibraryInitializer {
   LibraryInitializer() {
     dmlc::InitLogging("mxnet");
     prev_handler = signal(SIGSEGV, segfault_logger);
+    if (prev_handler != SIG_DFL) {
+      signal(SIGSEGV, prev_handler);
+    }
 #if MXNET_USE_PROFILER
     // ensure profiler's constructor are called before atexit.
     engine::Profiler::Get();

diff --git a/tests/python/unittest/test_operator.py b/tests/python/unittest/test_operator.py
@@ -3179,7 +3179,7 @@ def test_psroipooling():
                     op = mx.contrib.sym.PSROIPooling(data=im_data_var, rois=rois_data_var, spatial_scale=spatial_scale,
                                                      group_size=num_group, pooled_size=num_group,
                                                      output_dim=num_classes, name='test_op')
-                    rtol, atol = 1e-2, 1e-4
+                    rtol, atol = 1e-2, 1e-3
                     # By now we only have gpu implementation
                     if mx.Context.default_ctx.device_type == 'gpu':
                         check_numeric_gradient(op, [im_data, rois_data], rtol=rtol, atol=atol,
@@ -3215,7 +3215,7 @@ def test_deformable_convolution():
                             # wider tolerance needed for coordinate differential
                             rtol, atol = 1.0, 1e-2
                         else:
-                            rtol, atol = 0.05, 1e-4
+                            rtol, atol = 0.05, 1e-3
                         # By now we only have gpu implementation
                         if mx.Context.default_ctx.device_type == 'gpu':
                             check_numeric_gradient(op, [im_data, offset_data, weight, bias], rtol=rtol, atol=atol,
@@ -3248,7 +3248,7 @@ def test_deformable_psroipooling():
                         # wider tolerance needed for coordinate differential
                         rtol, atol = 1.0, 1e-2
                     else:
-                        rtol, atol = 1e-2, 1e-4
+                        rtol, atol = 1e-2, 1e-3
                     # By now we only have gpu implementation
                     if mx.Context.default_ctx.device_type == 'gpu':
                         check_numeric_gradient(op, [im_data, rois_data, offset_data], rtol=rtol, atol=atol,