From cd7bbc776b2bc54aecbc890e9cf02f5bee3e0484 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Mon, 7 Mar 2022 10:28:10 +0200 Subject: [PATCH] remove source code and build system code associated with "SGI" macro this is the third of three changesets designed to remove obsolete SGI platforms. first, SGITFP, then the 32-bit version, SGI_N32, and now the SGI target, all of which are associated with MIPS/IA64 machines from days gone by. Signed-off-by: Jeff Hammond --- contrib/mov2asc/README | 1 - doc/user/execution.tex | 1 - src/fft/pfft1.0/pfft/datasize.h | 2 +- src/nwdft/dftgrad/dftg_gridsswold.F | 4 +++- src/nwdft/grid/grid_rtrunc.F | 6 ++++-- src/nwdft/grid/grid_utils.F | 6 ++++-- src/nwdft/include/xc_erftab.fh | 4 ++-- src/peigs/DEFS | 13 ------------- src/peigs/DEFS.nwchem | 13 ------------- src/peigs/DEFS.release | 26 -------------------------- src/peigs/example/prun | 2 -- src/peigs/h/blas_lapack.h | 15 --------------- src/rtdb/db/compat.h | 1 - src/rtdb/db/realloc.c | 2 +- src/symmetry/sym_sym.F | 3 --- src/symmetry/sym_vec_sym.F | 3 --- src/util/bitops_decls.fh | 2 +- src/util/bitops_funcs.fh | 2 +- src/util/error.F | 2 +- src/util/util_cpusec.F | 5 ----- src/util/util_debug.c | 7 ------- src/util/util_flush.F | 7 ------- src/util/util_md.F | 22 ---------------------- src/util/util_random.F | 5 ----- 24 files changed, 18 insertions(+), 136 deletions(-) diff --git a/contrib/mov2asc/README b/contrib/mov2asc/README index 5d332c5a81..500bf0c484 100644 --- a/contrib/mov2asc/README +++ b/contrib/mov2asc/README @@ -6,7 +6,6 @@ another platform and converted back into a binary file for that machine. They are quite simple, and don't do much error checking, but they seem to work. -Known to work on Sun and SGI Requires NWChem's include files and libnwcutil.a containing the MA library. diff --git a/doc/user/execution.tex b/doc/user/execution.tex index cd7ebe577e..d2d76b79f6 100644 --- a/doc/user/execution.tex +++ b/doc/user/execution.tex @@ -268,7 +268,6 @@ following single line \item IBM SP with Power 3 and Power 4 nodes, AIX 5.1 and PSSP 3.4; IBM RS6000 workstation, AIX 5.1. Xlf 8.1.0.0 and 8.1.0.1 are known to produce bad code. -\item SGI R12000 IRIX 6.5 \item SUN workstations with Solaris 2.6 and 2.8. Fujitsu SPARC systems (thanks to Herbert Fr\"uchtl) with Parallelnavi compilers. \item HP DEC alpha workstation , Tru64 V5.1, diff --git a/src/fft/pfft1.0/pfft/datasize.h b/src/fft/pfft1.0/pfft/datasize.h index d2e6d24cc6..bed2f89702 100644 --- a/src/fft/pfft1.0/pfft/datasize.h +++ b/src/fft/pfft1.0/pfft/datasize.h @@ -37,7 +37,7 @@ INTEGER NBYTEI, NBYTED -#if defined(SGI) || defined(EXT_INT) +#if defined(EXT_INT) PARAMETER( NBYTED = 8, $ NBYTEI = 8 ) #else diff --git a/src/nwdft/dftgrad/dftg_gridsswold.F b/src/nwdft/dftgrad/dftg_gridsswold.F index ea3f1da939..d0f169146d 100644 --- a/src/nwdft/dftgrad/dftg_gridsswold.F +++ b/src/nwdft/dftgrad/dftg_gridsswold.F @@ -247,9 +247,11 @@ c endif if(mu.lt.0d0) sk=1d0-sk else -#if defined(SGI) || defined (WIN32) || defined(LINUX) || defined(CRAY) +#if defined (WIN32) || defined(LINUX) || defined(CRAY) +! DERFC is a GNU extension sk=0.5d0*derfc(mu1) #else +! ERFC is Fortran 2008 sk=0.5d0*erfc(mu1) #endif endif diff --git a/src/nwdft/grid/grid_rtrunc.F b/src/nwdft/grid/grid_rtrunc.F index 1db88cdbbc..18cc7d72ba 100644 --- a/src/nwdft/grid/grid_rtrunc.F +++ b/src/nwdft/grid/grid_rtrunc.F @@ -232,9 +232,11 @@ c I(k) = [(k-1)*I(k-2) + r^(k-1)*exp(-alpha*r^2)]/(2*alpha) c integer i, ilo double precision value,valexp,dexpo -#if defined(SGI) || defined(WIN32) ||defined(LINUX) +#if defined(WIN32) ||defined(LINUX) +! DERFC is a GNU extension double precision derfc #else +! ERFC is Fortran 2008 double precision erfc #endif c @@ -246,7 +248,7 @@ c if(dexpo.gt.40d0) then value=0d0 else -#if defined(SGI) || defined(WIN32) ||defined(LINUX) +#if defined(WIN32) ||defined(LINUX) value = 0.5d0*sqrt(4.0d0*atan(1.0d0)/alpha)* $ derfc(dexpo) #else diff --git a/src/nwdft/grid/grid_utils.F b/src/nwdft/grid/grid_utils.F index 835032cdfc..1a25ca3982 100644 --- a/src/nwdft/grid/grid_utils.F +++ b/src/nwdft/grid/grid_utils.F @@ -476,16 +476,18 @@ c I(k) = [(k-1)*I(k-2) + r^(k-1)*exp(-alpha*r^2)]/(2*alpha) c integer i, ilo double precision value -#if defined(SGI) || defined(WIN32) ||defined(LINUX) +#if defined(WIN32) ||defined(LINUX) +! DERFC is a GNU extension double precision derfc #else +! ERFC is Fortran 2008 double precision erfc #endif c ilo = mod(k,2) c if (ilo .eq. 0) then -#if defined(SGI) || defined(WIN32) ||defined(LINUX) +#if defined(WIN32) ||defined(LINUX) value = 0.5d0*sqrt(4.0d0*atan(1.0d0)/alpha)* $ derfc(sqrt(alpha)*r) #else diff --git a/src/nwdft/include/xc_erftab.fh b/src/nwdft/include/xc_erftab.fh index eebdbf59d0..f837c7a5cb 100644 --- a/src/nwdft/include/xc_erftab.fh +++ b/src/nwdft/include/xc_erftab.fh @@ -7,7 +7,7 @@ c c SSF original 0.64d0 value for polynomial function c -#if defined(SGI)|| defined(WIN32) || defined(LINUX)|| defined(CRAY) +#if defined(WIN32) || defined(LINUX)|| defined(CRAY) double precision derfc #ifdef PSCALE external derfc @@ -20,7 +20,7 @@ c , alpha_erf2=1d0/0.28d0, , eps=0.002d0) double precision erf1,erf2,taux,erfcc,erfcco,erf1c,erf2c -#if defined(SGI)|| defined (WIN32)|| defined(LINUX)|| defined(CRAY) +#if defined (WIN32)|| defined(LINUX)|| defined(CRAY) erf1(x)=0.5d0*derfc((x/(1d0-x*x))*alpha_erf1) erf2(x)=0.5d0*derfc((x/(1d0-x*x)**2)*alpha_erf2) #else diff --git a/src/peigs/DEFS b/src/peigs/DEFS index 37f1013bf5..8be24aa44d 100644 --- a/src/peigs/DEFS +++ b/src/peigs/DEFS @@ -232,19 +232,6 @@ peigs_CTOFLIB = /msrc/apps/lib/gcc-lib/sparc-sun-sunos4.1.3/2.4.3/libgcc.a -lF77 # endif -ifeq ($(peigs_TARGET),SGI) -#SGI/TCGMSG usually r4000 - -peigs_CPU = MIPS -peigs_COMM = TCGMSG -peigs_CODEOBJ = DBLE -peigs_CC += -DSTD_DBL -DSTD_INT -peigs_FC += -align64 -DSTD_INT -DSTD_DBL -D$(peigs_COMM) -D$(peigs_CPU) -peigs_CPP += -DSTD_INT -DSTD_DBL -P -peigs_COMMLIB = -L$(TOPDIR)/lib/$(NWCHEM_TARGET) -ltcgmsg -peigs_CTOFLIB = -lftn -lm -lc /usr/lib/crtn.o -endif - ifeq ($(peigs_TARGET),CONVEX-SPP) # # Convex SPP-1200 running SPP-UX 3.2 diff --git a/src/peigs/DEFS.nwchem b/src/peigs/DEFS.nwchem index b4462e916a..6f5b6293e7 100644 --- a/src/peigs/DEFS.nwchem +++ b/src/peigs/DEFS.nwchem @@ -199,19 +199,6 @@ peigs_CTOFLIB = /msrc/apps/lib/gcc-lib/sparc-sun-sunos4.1.3/2.4.3/libgcc.a -lF77 # endif -ifeq ($(peigs_TARGET),SGI) -#SGI/TCGMSG usually r4000 - -peigs_CPU = MIPS -peigs_COMM = TCGMSG -peigs_CODEOBJ = DBLE -peigs_CC += -DSTD_DBL -DSTD_INT -peigs_FC += -align64 -DSTD_INT -DSTD_DBL -D$(peigs_COMM) -D$(peigs_CPU) -peigs_CPP += -DSTD_INT -DSTD_DBL -P -peigs_COMMLIB = -L$(TOPDIR)/lib/$(NWCHEM_TARGET) -ltcgmsg -peigs_CTOFLIB = -lftn -lm -lc /usr/lib/crtn.o -endif - ifeq ($(peigs_TARGET),CONVEX-SPP) # diff --git a/src/peigs/DEFS.release b/src/peigs/DEFS.release index 261f9eb283..05e0c0003b 100644 --- a/src/peigs/DEFS.release +++ b/src/peigs/DEFS.release @@ -541,32 +541,6 @@ endif -ifeq ($(TARGET),SGI) -#SGI/TCGMSG -AR = ar r -RANLIB = echo -CC = cc ${DEF_TIMING} -DMIPS -F77 = f77 -static -DTCGMSG -DMIPS -CCF77 = $(F77) -LINK = f77 -O -CODEOBJ = DBLE -CUBIX_OPTS = -NODE_EXT = o -HOST_EXT = out -HOST = SUN -NODE_TYPE = SUN -CPU = -COMM_PKG = TCGMSG -IO_STYLE = FILE_IO -COMMLIB = $(SRC)/tcgmsg/ipcv4.0/libtcgmsg.a -CTOFLIB = -lftn -lm -lc /usr/lib/crtn.o -BLASLIB = -lblas -CPP = /usr/lib/cpp -P -D${NODE_TYPE} -D${COMM_PKG} -D${IO_STYLE} -D${INT_TYPE} ${DEF_TIMING} -I$(HDIR) -DMIPS - - -HOST_EXT = out -endif - ifeq ($(TARGET),KSR8) # diff --git a/src/peigs/example/prun b/src/peigs/example/prun index 24b3178a0d..0ac59c6c0e 100755 --- a/src/peigs/example/prun +++ b/src/peigs/example/prun @@ -27,7 +27,6 @@ set TARGETS = ( "SunUniproc ....... Sun uniprocessor" \ 'Paragon .......... Intel paragon' \ 'iPSC_860 ......... Intel delta' \ 'SUN .............. network of SUNs using tcgmsg' \ - 'SGI64 ............ SGI Power Challenge using tcgmsg' \ 'KSR .............. KSR using tcgmsg' \ 'CRAY-T3D ......... CRAY-T3D' \ 'SP-1.............. IBM SP-1/2 using poe or loadleveler' ) @@ -344,7 +343,6 @@ switch ( $TARGET ) breaksw case SUN: - case SGI64: set MACHINE = "tcgmsg" breaksw diff --git a/src/peigs/h/blas_lapack.h b/src/peigs/h/blas_lapack.h index 98a07b0780..17ad3788dc 100644 --- a/src/peigs/h/blas_lapack.h +++ b/src/peigs/h/blas_lapack.h @@ -150,21 +150,6 @@ #define DLAMCHS 2.2250738585072014e-308 #define DLAMCHU 2.2250738585072014e-308 -#endif -#ifdef MIPS -/* - SGI PowerChallenge R4010 fpu ... R8000 chip - seems to have the same reps .... probably have - to print out hex to get real differences - */ - -#define DLAMCHE 1.1102230246251565e-16 -#define DLAMCHP 1.1102230246251565e-16 -#define DLAMCHB 2.e0 -#define DLAMCHS 2.2250738585072014e-308 -#define DLAMCHU 2.2250738585072014e-308 - - #endif #ifdef RS6000 diff --git a/src/rtdb/db/compat.h b/src/rtdb/db/compat.h index 362c159a6b..5698a919ef 100644 --- a/src/rtdb/db/compat.h +++ b/src/rtdb/db/compat.h @@ -110,7 +110,6 @@ static int __sigtemp; /* For the use of sigprocmask */ * MISC line in your Makefile. */ #if 1 -/* !defined(SGI) */ #define realloc __fix_realloc #endif diff --git a/src/rtdb/db/realloc.c b/src/rtdb/db/realloc.c index acb83062ae..7d07289d54 100644 --- a/src/rtdb/db/realloc.c +++ b/src/rtdb/db/realloc.c @@ -8,7 +8,7 @@ __fix_realloc(p, n) void *p; size_t n; { -#if defined(SGI) || defined(IBM) +#if defined(IBM) void *calloc(size_t,size_t), *realloc(void *, size_t); #endif return ((p == (void *)0) ? calloc(n, (size_t) 1) : realloc(p, n)); diff --git a/src/symmetry/sym_sym.F b/src/symmetry/sym_sym.F index f96792a711..8382044283 100644 --- a/src/symmetry/sym_sym.F +++ b/src/symmetry/sym_sym.F @@ -7,9 +7,6 @@ C$Id$ #include "bas.fh" #include "mafdecls.fh" #include "tcgmsg.fh" -* KAP on SGI breaks this routine -c*$*optimize(0) -c*$*scalar optimize(0) integer geom, basis, g_a logical odensity c diff --git a/src/symmetry/sym_vec_sym.F b/src/symmetry/sym_vec_sym.F index bb03559e4d..73377c58b7 100644 --- a/src/symmetry/sym_vec_sym.F +++ b/src/symmetry/sym_vec_sym.F @@ -7,9 +7,6 @@ C$Id$ #include "bas.fh" #include "mafdecls.fh" #include "tcgmsg.fh" -* KAP on SGI breaks this routine -c*$*optimize(0) -c*$*scalar optimize(0) integer geom, basis double precision vec(*) ! [input/output] c diff --git a/src/util/bitops_decls.fh b/src/util/bitops_decls.fh index 414b881dc9..2a9c27e41d 100644 --- a/src/util/bitops_decls.fh +++ b/src/util/bitops_decls.fh @@ -17,7 +17,7 @@ c intrinsic shiftr, shiftl integer iiibit, jjjbit #endif -#if (defined(SGI) && defined(_LANGUAGE_FORTRAN90)) || ( __GNUC__ >= 4) +#if ( __GNUC__ >= 4) integer rshift, lshift integer iiibit, jjjbit #endif diff --git a/src/util/bitops_funcs.fh b/src/util/bitops_funcs.fh index 9192c9b1cb..d2f9eedf6f 100644 --- a/src/util/bitops_funcs.fh +++ b/src/util/bitops_funcs.fh @@ -17,7 +17,7 @@ c lshift(iiibit,jjjbit)=shiftl(iiibit,jjjbit) rshift(iiibit,jjjbit)=shiftr(iiibit,jjjbit) #endif -#if (defined(SGI) && defined(_LANGUAGE_FORTRAN90)) || ( __GNUC__ >= 4) +#if ( __GNUC__ >= 4) lshift(iiibit,jjjbit) = ishft(iiibit,jjjbit) rshift(iiibit,jjjbit) = ishft(iiibit,-jjjbit) #endif diff --git a/src/util/error.F b/src/util/error.F index 790d0d694c..a8ca07fb53 100644 --- a/src/util/error.F +++ b/src/util/error.F @@ -37,7 +37,7 @@ c #ifdef TCGMSG call parerr(status) #endif -#if defined(SUN) || defined(SGI) || defined(SOLARIS) +#if defined(SUN) || defined(SOLARIS) call abort #else stop status diff --git a/src/util/util_cpusec.F b/src/util/util_cpusec.F index 7a94715bc5..52640e2cf7 100644 --- a/src/util/util_cpusec.F +++ b/src/util/util_cpusec.F @@ -20,11 +20,6 @@ c $Id$ external etime #endif util_cpusec = etime(tarray) -#elif defined(SGI) - real tarray(2) - real etime - external etime - util_cpusec = etime(tarray) #elif (defined(LINUX) || defined(CYGNUS)) && !defined(LINUXIA64) && !defined(CATAMOUNT) double precision linux_cputime external linux_cputime diff --git a/src/util/util_debug.c b/src/util/util_debug.c index 20c2f9bf2b..3971dfbea3 100644 --- a/src/util/util_debug.c +++ b/src/util/util_debug.c @@ -89,13 +89,6 @@ void FATR util_debug_(Integer *rtdb) argv[9] = 0; if (!xterm[0]) strcpy(xterm, "/usr/bin/X11/xterm"); -#elif defined(SGI) - argv[6] = "dbx"; - argv[7] = "-p"; - argv[8] = pid; - argv[9] = 0; - if (!xterm[0]) - strcpy(xterm, "/usr/bin/X11/xterm"); #else GA_Error("Don't know how to debug on this machine", 0); #endif diff --git a/src/util/util_flush.F b/src/util/util_flush.F index a8b2e1e072..1911204964 100644 --- a/src/util/util_flush.F +++ b/src/util/util_flush.F @@ -20,13 +20,6 @@ c #if defined(PSCALE) call util_cflush() #endif -#if defined(SGI) - if (unit.eq.luout) then - call sgi_flush6() - else - call flush(unit) - endif -#endif #if defined(GFORTRAN) call flush(unit) #endif diff --git a/src/util/util_md.F b/src/util/util_md.F index 4148e97f47..749ff22391 100644 --- a/src/util/util_md.F +++ b/src/util/util_md.F @@ -744,9 +744,6 @@ c #if defined(SP1) || defined(SOLARIS) character*26 string #endif -#if defined(SGI) - character*9 string -#endif c today='00/00/00 ' now='00:00:00' @@ -804,25 +801,6 @@ c today(7:8)=string(23:24) today(4:5)=string(9:10) now=string(11:20) -#endif -#if defined(SGI) - call date(string) - if(string(4:6).eq.'Jan') today(1:2)='01' - if(string(4:6).eq.'Feb') today(1:2)='02' - if(string(4:6).eq.'Mar') today(1:2)='03' - if(string(4:6).eq.'Apr') today(1:2)='04' - if(string(4:6).eq.'May') today(1:2)='05' - if(string(4:6).eq.'Jun') today(1:2)='06' - if(string(4:6).eq.'Jul') today(1:2)='07' - if(string(4:6).eq.'Aug') today(1:2)='08' - if(string(4:6).eq.'Sep') today(1:2)='09' - if(string(4:6).eq.'Oct') today(1:2)='10' - if(string(4:6).eq.'Nov') today(1:2)='11' - if(string(4:6).eq.'Dec') today(1:2)='12' - today(7:8)=string(8:9) - today(4:5)=string(1:2) - call time(now(1:8)) - now(9:10)=' ' #endif if(today(4:4).eq.' ') today(4:4)='0' return diff --git a/src/util/util_random.F b/src/util/util_random.F index 85ab061e8e..4018d3fd58 100644 --- a/src/util/util_random.F +++ b/src/util/util_random.F @@ -11,11 +11,6 @@ c #if defined(IBM) || defined(SP1) || ( defined(BGQ) && !defined(GFORTRAN) ) if(iseed.gt.0) call srand(dble(iseed)) util_random=rand() -#elif defined(SGI) - real*8 rand - external rand - if(iseed.gt.0) call srand(dble(iseed)) - util_random=rand() #elif defined(CRAY) if(iseed.gt.0) call ranset(iseed) util_random=ranf()