Update stuff for old BlueGene

BlueGene/L is likely completely dead. We have no ability to
support SIMD on BlueGene/P (technically we can do 2-wide SIMD,
but there's probably issues and this platform is almost dead).

Change-Id: Ib607fd11f0b575bcddf4085351ceb2989529247d

diff --git a/admin/installguide/installguide.tex b/admin/installguide/installguide.tex
index 4368cb539a40f2bdace36bb5ff7d6ab3bc186c96..d8ab76af6e21c5cae3f98c6a3e532a6df42116ca 100644 (file)
--- a/admin/installguide/installguide.tex
+++ b/admin/installguide/installguide.tex
@@ -804,8 +804,8 @@ parallel job execution.
 
 \subsubsection{BlueGene/P}
 
-There is currently no native acceleration on this platform and no
-plans to make one. The default plain C kernels will work.
+There is currently no SIMD support on this platform and no plans to
+add it. The default plain C kernels will work.
 
 \subsubsection{BlueGene/Q}
 

diff --git a/cmake/Platform/BlueGeneL-static-XL-C.cmake b/cmake/Platform/BlueGeneL-static-XL-C.cmake
deleted file mode 100644 (file)
index ddc8799..0000000
--- a/cmake/Platform/BlueGeneL-static-XL-C.cmake
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# This file is part of the GROMACS molecular simulation package.
-#
-# Copyright (c) 2010,2012,2013,2014, 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.
-#
-# GROMACS is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1
-# of the License, or (at your option) any later version.
-#
-# GROMACS is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with GROMACS; if not, see
-# http://www.gnu.org/licenses, or write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
-#
-# If you want to redistribute modifications to GROMACS, please
-# consider that scientific software is very special. Version
-# control is crucial - bugs must be traceable. We will be happy to
-# consider code for inclusion in the official distribution, but
-# derived work must not be called official GROMACS. Details are found
-# in the README & COPYING files - if they are missing, get the
-# official version at http://www.gromacs.org.
-#
-# To help us fund GROMACS development, we humbly ask that you cite
-# the research papers on the package. Check out http://www.gromacs.org.
-
-# derived from http://cmake.org/Wiki/CmakeBlueGene
-
-# the name of the target operating system
-set(CMAKE_SYSTEM_NAME BlueGeneL CACHE STRING "Cross-compiling for BlueGene/L")
-
-# adjust to suit your machine's versions
-#    /bgl/BlueLight/V1R3M2_140_2007-070424/ppc/bglsys
-set(BLRTS_PATH /bgl/BlueLight/V1R3M4_300_2008-080728/ppc/bglsys CACHE STRING "Path to the BlueGene/L system libraries and includes")
-
-# set the compiler
-set(CMAKE_C_COMPILER  /opt/ibmcmp/vac/bg/8.0/bin/blrts_xlc)
-set(CMAKE_C_FLAGS "-O3 -qbgl -qarch=auto -qtune=auto -qnoautoconfig -qfloat=norngchk -qhot")
-set(CMAKE_EXE_LINKER_FLAGS "-L${BLRTS_PATH}/lib")
-set(CMAKE_CXX_COMPILER  /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlC)
-
-set(MPI_LIBRARY mpich.rts CACHE STRING "MPI library for BlueGene" FORCE)
-set(MPI_EXTRA_LIBRARY msglayer.rts devices.rts rts.rts devices.rts CACHE STRING "Extra MPI libraries for BlueGene" FORCE)
-set(MPI_INCLUDE_PATH ${BLRTS_PATH}/include  CACHE STRING "MPI include path for BlueGene" FORCE)
-
-# This adds directories that find commands should specifically ignore for cross compiles.
-# Most of these directories are the includeand lib directories for the frontend on BG/P systems.
-# Not ignoring these can cause things like FindX11 to find a frontend PPC version mistakenly.
-# We use this on BG instead of re-rooting because backend libraries are typically strewn about
-# the filesystem, and we can't re-root ALL backend libraries to a single place.
-
-set(CMAKE_SYSTEM_IGNORE_PATH
-  /lib             /lib64             /include
-  /usr/lib         /usr/lib64         /usr/include
-  /usr/local/lib   /usr/local/lib64   /usr/local/include
-  /usr/X11/lib     /usr/X11/lib64     /usr/X11/include
-  /usr/lib/X11     /usr/lib64/X11     /usr/include/X11
-  /usr/X11R6/lib   /usr/X11R6/lib64   /usr/X11R6/include
-  /usr/X11R7/lib   /usr/X11R7/lib64   /usr/X11R7/include
-)
-
-# set the search path for the environment coming with the compiler
-# and a directory where you can install your own compiled software
-set(CMAKE_FIND_ROOT_PATH
-    /bgl/BlueLight/ppcfloor/
-    ${BLRTS_PATH}
-    /opt/ibmcmp/xlmass/bg
-)
-
-# adjust the default behaviour of the FIND_XXX() commands:
-# search headers and libraries in the target environment, search 
-# programs in the host environment
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(GMX_SIMD "BlueGene" CACHE STRING "Forcing BlueGene SIMD when using BlueGene toolchain")

diff --git a/cmake/Platform/BlueGeneP-static-XL-C.cmake b/cmake/Platform/BlueGeneP-static-XL-C.cmake
index b2ad826a062f7e22de8aec18d8fdb3b68b9ebd92..61030292925dee156082041f923d66f49108d8eb 100644 (file)
--- a/cmake/Platform/BlueGeneP-static-XL-C.cmake
+++ b/cmake/Platform/BlueGeneP-static-XL-C.cmake
@@ -38,5 +38,3 @@ set(CMAKE_SYSTEM_NAME BlueGeneP-static CACHE STRING "Cross-compiling for BlueGen
 # set the compiler
 set(CMAKE_C_COMPILER mpixlc_r)
 set(CMAKE_CXX_COMPILER mpixlcxx_r)
-
-set(GMX_SIMD "BlueGene" CACHE STRING "Forcing BlueGene SIMD when using BlueGene toolchain")