From: Mark Abraham Date: Mon, 23 Mar 2015 15:49:53 +0000 (+0000) Subject: Fix SIMD unit tests on BG/Q X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=a8293ff1b2e6be465f8928e36d18e43ec03772ee;p=alexxy%2Fgromacs.git Fix SIMD unit tests on BG/Q These got broken in https://gerrit.gromacs.org/#/c/3956/2 when I inadvertently removed -O3 -NDEBUG from the compiler flags after version 1. With XL compilers, the CMake default for release mode is -O -DNDEBUG, and that gives an internal compiler error for the SIMD unit tests. Also removed commentary about debug versions of XL compilers, since they are not appropriate when we're no longer hard-coding compilers. Change-Id: I5cb06695c061336bea7678353efa153d1f6be955 --- diff --git a/cmake/Platform/BlueGeneQ-static-XL-C.cmake b/cmake/Platform/BlueGeneQ-static-XL-C.cmake index 3999635f62..e09f98fb55 100644 --- a/cmake/Platform/BlueGeneQ-static-XL-C.cmake +++ b/cmake/Platform/BlueGeneQ-static-XL-C.cmake @@ -1,7 +1,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2013,2014, by the GROMACS development team, led by +# Copyright (c) 2013,2014,2015 by the GROMACS development team, led by # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, # and including many others, as listed in the AUTHORS file in the # top-level source directory and at http://www.gromacs.org. @@ -74,10 +74,7 @@ __BlueGeneQ_set_static_flags(XL C) __BlueGeneQ_set_static_flags(XL CXX) set(CMAKE_SYSTEM_NAME BlueGeneQ-static CACHE STRING "Cross-compiling for BlueGene/Q" FORCE) -# xl.ndebug is appropriate for production calculations. For debugging, -# use xl to add back error checks and assertions. Using the -# thread-safe compiler version is required, so use (e.g.) -# CMAKE_C_COMPILER=/bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpixlc_r -# CMAKE_CXX_COMPILER=/bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpixlcxx_r +set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Compiler optimization flags") +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Compiler optimization flags") mark_as_advanced(CMAKE_XL_CreateExportList) # No idea what spams this diff --git a/cmake/Platform/BlueGeneQ-static-XL-CXX.cmake b/cmake/Platform/BlueGeneQ-static-XL-CXX.cmake index 3999635f62..e09f98fb55 100644 --- a/cmake/Platform/BlueGeneQ-static-XL-CXX.cmake +++ b/cmake/Platform/BlueGeneQ-static-XL-CXX.cmake @@ -1,7 +1,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2013,2014, by the GROMACS development team, led by +# Copyright (c) 2013,2014,2015 by the GROMACS development team, led by # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, # and including many others, as listed in the AUTHORS file in the # top-level source directory and at http://www.gromacs.org. @@ -74,10 +74,7 @@ __BlueGeneQ_set_static_flags(XL C) __BlueGeneQ_set_static_flags(XL CXX) set(CMAKE_SYSTEM_NAME BlueGeneQ-static CACHE STRING "Cross-compiling for BlueGene/Q" FORCE) -# xl.ndebug is appropriate for production calculations. For debugging, -# use xl to add back error checks and assertions. Using the -# thread-safe compiler version is required, so use (e.g.) -# CMAKE_C_COMPILER=/bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpixlc_r -# CMAKE_CXX_COMPILER=/bgsys/drivers/ppcfloor/comm/xl.ndebug/bin/mpixlcxx_r +set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Compiler optimization flags") +set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Compiler optimization flags") mark_as_advanced(CMAKE_XL_CreateExportList) # No idea what spams this