From: Roland Schulz Date: Sun, 19 Oct 2014 16:23:53 +0000 (-0400) Subject: Remove Catamount cmake X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=bc33320dfac54a4f76aee6dfc9048a25b76a3f13;p=alexxy%2Fgromacs.git Remove Catamount cmake Was superseeded in 2006. No Cray XT3 should be around anymore. Also gets rid of GMX_NO_SYSTEM which was only set by Catamount Change-Id: Ib3c0450995e395ccdd2935b629da7930d9da5a4a --- diff --git a/cmake/gmxManageMPI.cmake b/cmake/gmxManageMPI.cmake index 5b35e0d644..50bbe80034 100644 --- a/cmake/gmxManageMPI.cmake +++ b/cmake/gmxManageMPI.cmake @@ -153,13 +153,5 @@ if(GMX_MPI) "or set the variables reported missing for MPI_C above.") endif() - include(gmxTestCatamount) - gmx_test_catamount(GMX_CRAY_CATAMOUNT) - if(GMX_CRAY_CATAMOUNT) - set(GMX_NO_SYSTEM 1) - set(GMX_NO_NICE 1) - set(HAVE_PWD_H 0) - endif() - set(GMX_LIB_MPI 1) endif() diff --git a/cmake/gmxTestCatamount.cmake b/cmake/gmxTestCatamount.cmake deleted file mode 100644 index 6b1dbd5667..0000000000 --- a/cmake/gmxTestCatamount.cmake +++ /dev/null @@ -1,55 +0,0 @@ -# -# This file is part of the GROMACS molecular simulation package. -# -# Copyright (c) 2009,2013, 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. - -# - Define function to check we are compiling for CRAY XT catamount -# -# GMX_TEST_CATAMOUNT(VARIABLE) -# -# VARIABLE will be set to true if we are compiling for catamount -# - -function(GMX_TEST_CATAMOUNT VARIABLE) - include(CheckCSourceCompiles) - check_c_source_compiles( - "int -main() -{ -#if defined __QK_USER__ - return 0; -#else -# error not catamount -#endif -}" CATAMOUNT_COMPILE_OK) - set(${VARIABLE} ${CATAMOUNT_COMPILE_OK} PARENT_SCOPE) -endfunction() diff --git a/src/config.h.cmakein b/src/config.h.cmakein index 69e3400264..f79823c61c 100644 --- a/src/config.h.cmakein +++ b/src/config.h.cmakein @@ -175,9 +175,6 @@ /* Use if can't rename checkpoints */ #cmakedefine GMX_NO_RENAME -/* Ignore calls to system(3) */ -#cmakedefine GMX_NO_SYSTEM - /* Use (modified) Gamess-UK for QM-MM calculations */ #cmakedefine GMX_QMMM_GAMESS diff --git a/src/gromacs/gmxana/gmx_do_dssp.c b/src/gromacs/gmxana/gmx_do_dssp.c index 610f52a10e..729348d208 100644 --- a/src/gromacs/gmxana/gmx_do_dssp.c +++ b/src/gromacs/gmxana/gmx_do_dssp.c @@ -36,8 +36,6 @@ */ #include "gmxpre.h" -#include "config.h" - #include #include "gromacs/commandline/pargs.h" @@ -659,17 +657,11 @@ int gmx_do_dssp(int argc, char *argv[]) write_pdbfile_indexed(tapein, NULL, atoms, x, ePBC, box, ' ', -1, gnx, index, NULL, TRUE); gmx_ffclose(tapein); -#ifdef GMX_NO_SYSTEM - printf("Warning-- No calls to system(3) supported on this platform."); - printf("Warning-- Skipping execution of 'system(\"%s\")'.", dssp); - exit(1); -#else if (0 != system(dssp)) { gmx_fatal(FARGS, "Failed to execute command: %s\n", "Try specifying your dssp version with the -ver option.", dssp); } -#endif /* strip_dssp returns the number of lines found in the dssp file, i.e. * the number of residues plus the separator lines */ diff --git a/src/gromacs/gmxana/gmx_trjconv.c b/src/gromacs/gmxana/gmx_trjconv.c index b687c07220..9e4833c783 100644 --- a/src/gromacs/gmxana/gmx_trjconv.c +++ b/src/gromacs/gmxana/gmx_trjconv.c @@ -1870,15 +1870,10 @@ int gmx_trjconv(int argc, char *argv[]) char c[255]; sprintf(c, "%s %d", exec_command, file_nr-1); /*fprintf(stderr,"Executing '%s'\n",c);*/ -#ifdef GMX_NO_SYSTEM - printf("Warning-- No calls to system(3) supported on this platform."); - printf("Warning-- Skipping execution of 'system(\"%s\")'.", c); -#else if (0 != system(c)) { gmx_fatal(FARGS, "Error executing command: %s", c); } -#endif } outframe++; } diff --git a/src/gromacs/gmxana/gmx_tune_pme.c b/src/gromacs/gmxana/gmx_tune_pme.c index c4a7e6e021..7ca664ac4d 100644 --- a/src/gromacs/gmxana/gmx_tune_pme.c +++ b/src/gromacs/gmxana/gmx_tune_pme.c @@ -119,11 +119,7 @@ static void sep_line(FILE *fp) /* Wrapper for system calls */ static int gmx_system_call(char *command) { -#ifdef GMX_NO_SYSTEM - gmx_fatal(FARGS, "No calls to system(3) supported on this platform. Attempted to call:\n'%s'\n", command); -#else return ( system(command) ); -#endif } diff --git a/src/gromacs/gmxlib/viewit.c b/src/gromacs/gmxlib/viewit.c index c6a3a690bb..61f00ae861 100644 --- a/src/gromacs/gmxlib/viewit.c +++ b/src/gromacs/gmxlib/viewit.c @@ -39,8 +39,6 @@ #include "gromacs/legacyheaders/viewit.h" -#include "config.h" - #include #include @@ -125,15 +123,10 @@ void do_view(const output_env_t oenv, const char *fn, const char *opts) { sprintf(buf, "%s %s %s &", cmd, opts ? opts : "", fn); fprintf(stderr, "Executing '%s'\n", buf); -#ifdef GMX_NO_SYSTEM - printf("Warning-- No calls to system(3) supported on this platform."); - printf("Warning-- Skipping execution of 'system(\"%s\")'.", buf); -#else if (0 != system(buf) ) { gmx_fatal(FARGS, "Failed executing command: %s", buf); } -#endif } } } diff --git a/src/gromacs/mdlib/qm_gaussian.c b/src/gromacs/mdlib/qm_gaussian.c index 6339b94f8a..d90232c7e8 100644 --- a/src/gromacs/mdlib/qm_gaussian.c +++ b/src/gromacs/mdlib/qm_gaussian.c @@ -1017,15 +1017,10 @@ void do_gaussian(int step, char *exe) "input.log"); } fprintf(stderr, "Calling '%s'\n", buf); -#ifdef GMX_NO_SYSTEM - printf("Warning-- No calls to system(3) supported on this platform."); - gmx_fatal(FARGS, "Call to '%s' failed\n", buf); -#else if (system(buf) != 0) { gmx_fatal(FARGS, "Call to '%s' failed\n", buf); } -#endif } real call_gaussian(t_commrec *cr, t_forcerec *fr, diff --git a/src/programs/view/dialogs.cpp b/src/programs/view/dialogs.cpp index c556597853..6b68d0f64a 100644 --- a/src/programs/view/dialogs.cpp +++ b/src/programs/view/dialogs.cpp @@ -106,15 +106,10 @@ static void shell_comm(const char *title, const char *script, int nsleep) fprintf(stderr, "command: %s\n", command); #endif -#ifdef GMX_NO_SYSTEM - printf("Warning-- No calls to system(3) supported on this platform."); - printf("Warning-- Skipping execution of 'system(\"%s\")'.", buf); -#else if (0 != system(command)) { gmx_fatal(FARGS, "Failed to execute command: %s", command); } -#endif #ifdef DEBUG unlink(tmp)