Add STL checks via -D_GLIBCXX_ASSERTIONS in debug mode (#14896)

* Add STL checks via -D_GLIBCXX_ASSERTIONS in debug mode * Also add to Makefile * Fix warning (fpermissive) sleep definition not available
apache · May 21, 2019 · 789a6be · 789a6be
1 parent 2cc822a
commit 789a6be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -147,9 +147,11 @@ else(MSVC)
   endif()
   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_ASSERTIONS")
   elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
     add_definitions(-DNDEBUG=1)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -g")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_ASSERTIONS")
   else()
     add_definitions(-DNDEBUG=1)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
@@ -159,7 +161,7 @@ else(MSVC)
   elseif(SUPPORT_MSSE2)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
   endif()
-  set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
   if(SUPPORT_CXX14)
     add_definitions(-DDMLC_USE_CXX11=1)
     add_definitions(-DDMLC_USE_CXX14=1)

diff --git a/Makefile b/Makefile
@@ -94,7 +94,7 @@ endif
 
 # CFLAGS for debug
 ifeq ($(DEBUG), 1)
-	CFLAGS += -g -O0
+	CFLAGS += -g -O0 -D_GLIBCXX_ASSERTIONS
 else
 	CFLAGS += -O3 -DNDEBUG=1
 endif

diff --git a/src/operator/random/shuffle_op.cc b/src/operator/random/shuffle_op.cc
@@ -33,6 +33,7 @@
 #include <vector>
 #include <cstring>
 #ifdef USE_GNU_PARALLEL_SHUFFLE
+  #include <unistd.h>
   #include <parallel/algorithm>
 #endif
 #include "../elemwise_op_common.h"