diff --git a/cmake/compilers.cmake b/cmake/compilers.cmake index b9ff99a1..02e4d9c8 100644 --- a/cmake/compilers.cmake +++ b/cmake/compilers.cmake @@ -79,9 +79,14 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES Intel) string(APPEND CMAKE_Fortran_FLAGS " -fPIC") #Production set(PROD "-align array64byte -align rec32byte -no-prec-div -fast-transcendentals") + #Production with Debug Info + set(PRODWITHDEBUGINFO "-traceback -debug all -align array64byte -align rec32byte -no-prec-div -fast-transcendentals") #Debug - set(DEBUG "-traceback -check bounds -check uninit -debug all -gen-interfaces -warn interfaces -fp-stack-check") - set(PRODWITHDEBUGINFO "-traceback -debug all -align array64byte -align rec32byte -no-prec-div -fast-transcendentals") + if(NOT DISABLE_DEBUG_BOUNDS_CHECKS) + set(DEBUG "-traceback -check bounds -check uninit -debug all -gen-interfaces -warn interfaces -fp-stack-check") + else() + set(DEBUG "-traceback -debug all -gen-interfaces -warn interfaces") + endif() #Now do OS-dep options if (CMAKE_SYSTEM_NAME MATCHES Darwin) @@ -113,7 +118,11 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES GNU) #Production set(PROD "-ffast-math") #Debug - set(DEBUG "-fbacktrace -g -Warray-temporaries -Wall -Wfatal-errors -finit-local-zero") + if(NOT DISABLE_DEBUG_BOUNDS_CHECKS) + set(DEBUG "-fbacktrace -g -Warray-temporaries -Wall -Wfatal-errors -finit-local-zero") + else() + set(DEBUG "-fbacktrace -g -Warray-temporaries -Wall -Wfatal-errors") + endif() #Now do machine-dep options if (CMAKE_SYSTEM_NAME MATCHES Darwin) string(APPEND CMAKE_Fortran_FLAGS " -Wl,-stack_size,0x40000000,-stack_addr,0xf0000000") diff --git a/testingScripts/intelChecks.py b/testingScripts/intelChecks.py index fcf650f0..4350d827 100644 --- a/testingScripts/intelChecks.py +++ b/testingScripts/intelChecks.py @@ -89,7 +89,7 @@ os.chdir('intelChecks') #arguments = arguments + "cd" + home + ";" #arguments = arguments + "cd kaiju/unitTest1;" # Invoke cmake -arguments = arguments + "cmake ../ -DALLOW_INVALID_COMPILERS=ON -DENABLE_MPI=ON -DENABLE_MKL=ON -DCMAKE_BUILD_TYPE=DEBUG;" +arguments = arguments + "cmake ../ -DALLOW_INVALID_COMPILERS=ON -DDISABLE_DEBUG_BOUNDS_CHECKS=ON -DENABLE_MPI=ON -DENABLE_MKL=ON -DCMAKE_BUILD_TYPE=DEBUG;" # Make gamera, voltron and allTests arguments = arguments + "make gamera_mpi; make voltron_mpi;" print(arguments) diff --git a/testingScripts/memSuppress.sup b/testingScripts/memSuppress.sup index ca12743d..76b7ba0c 100644 --- a/testingScripts/memSuppress.sup +++ b/testingScripts/memSuppress.sup @@ -82,3 +82,11 @@ Suppression = { } } +Suppression = { + Stacks = { + { + mod=voltron_mpi.x, func=for__io_return; + } + } +} + diff --git a/testingScripts/threadSuppress.sup b/testingScripts/threadSuppress.sup index dcea6220..7e004b59 100644 --- a/testingScripts/threadSuppress.sup +++ b/testingScripts/threadSuppress.sup @@ -30,3 +30,11 @@ Suppression = { } } +Suppression = { + Stacks = { + { + mod=voltron_mpi.x, func=__svml_*; + } + } +} + diff --git a/testingScripts/tinyCase.xml b/testingScripts/tinyCase.xml index f679a2c5..6034bd27 100644 --- a/testingScripts/tinyCase.xml +++ b/testingScripts/tinyCase.xml @@ -2,8 +2,8 @@ -