Merge from master (#231)

* Use ndebug (#229) Used NDEBUG flag to indicate of not debug mode (CMake adds this flag be default in release mode) Default compilation is release mode * Cmake: Minor (#230) * fix a couple of warnings * minor Co-authored-by: yuvaljacoby <yuvaljacoby@users.noreply.github.com> Co-authored-by: Ahmed Irfan <43099566+ahmed-irfan@users.noreply.github.com>
NeuralNetworkVerification · Mar 26, 2020 · d51c883 · d51c883
1 parent e001a13
commit d51c883
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -92,7 +92,7 @@ endif()
 
 if (NOT MSVC)
     set(COMPILE_FLAGS  -Wall -Wextra  -Werror -MMD) #-Wno-deprecated
-    set(RELEASE_FLAGS -O3) #-Wno-deprecated
+    set(RELEASE_FLAGS ${COMPILE_FLAGS} -O3) #-Wno-deprecated
 endif()
 
 if (RUN_MEMORY_TEST)
@@ -104,20 +104,17 @@ endif()
 add_definitions(-DRESOURCES_DIR="${RESOURCES_DIR}")
 
 if (NOT MSVC)
-    set(DEBUG_FLAGS ${COMPILE_FLAGS} ${MEMORY_FLAGS} -g -DDEBUG_ON)
+    set(DEBUG_FLAGS ${COMPILE_FLAGS} ${MEMORY_FLAGS} -g)
     set(CXXTEST_FLAGS ${DEBUG_FLAGS}  -Wno-ignored-qualifiers)
 else()
-    set(DEBUG_FLAGS ${COMPILE_FLAGS} ${MEMORY_FLAGS} /DDEBUG_ON)
+    set(DEBUG_FLAGS ${COMPILE_FLAGS} ${MEMORY_FLAGS}) 
     add_definitions(-DNOMINMAX) # remove min max macros
 endif()
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set(CXXTEST_FLAGS ${CXXTEST_FLAGS} -Wno-terminate)
 endif()
 
-if (NOT MSVC)
-    set(RELEASE_FLAGS  ${COMPILE_FLAGS} -O3)
-endif()
 
 
 # Boost

diff --git a/README.md b/README.md
@@ -73,6 +73,12 @@ To enable multiprocess build change the last command to:
 ```
 cmake --build . -j PROC_NUM
 ```
+To compile in debug mode (default is release)
+```
+cmake .. -DCMAKE_BUILD_TYPE=Debug
+cmake --build .
+```
+
 The compiled binary will be in the *build* directory, named _Marabou_
 
 To run tests we use [ctest](https://cmake.org/cmake/help/v3.15/manual/ctest.1.html).

diff --git a/src/common/Debug.h b/src/common/Debug.h
@@ -18,15 +18,14 @@
 
 #include <cstdlib>
 
-// #define DEBUG_ON
 
-#ifdef DEBUG_ON
+#ifndef NDEBUG
 #  define DEBUG(x) x
 #else
 #  define DEBUG(x)
 #endif
 
-#ifdef DEBUG_ON
+#ifndef NDEBUG
 #  define ASSERTM(x, y, ...)                     \
     {                                           \
         if ( !( x ) )                           \
@@ -39,7 +38,7 @@
 #  define ASSERTM(x, y, ...)
 #endif
 
-#ifdef DEBUG_ON
+#ifndef NDEBUG
 #  define ASSERT(x)                             \
     {                                           \
         if ( !( x ) )                           \