From e6ba27616a6ed174164c952e702147e844f5c8ee Mon Sep 17 00:00:00 2001 From: sbraccia Date: Fri, 25 Jun 2004 17:28:48 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@1013 c92efa57-630b-4861-b058-cf58834340f0 --- clib/cp.h | 241 ------------------------------- include/machine.h | 302 --------------------------------------- include/machine.h.README | 60 -------- 3 files changed, 603 deletions(-) delete mode 100644 clib/cp.h delete mode 100644 include/machine.h delete mode 100644 include/machine.h.README diff --git a/clib/cp.h b/clib/cp.h deleted file mode 100644 index 39638ac26..000000000 --- a/clib/cp.h +++ /dev/null @@ -1,241 +0,0 @@ -/* - Copyright (C) 2002-2004 PWSCF,FPMD,CPV groups - This file is distributed under the terms of the - GNU General Public License. See the file `License' - in the root directory of the present distribution, - or http://www.gnu.org/copyleft/gpl.txt . -*/ - - -#if defined __T3E || defined __ABSOFT - -# define FFTW_INPLACE_DRV_1D FFTW_INPLACE_DRV_1D -# define FFTW_INPLACE_DRV_2D FFTW_INPLACE_DRV_2D -# define FFTW_INPLACE_DRV_3D FFTW_INPLACE_DRV_3D -# define CREATE_PLAN_1D CREATE_PLAN_1D -# define CREATE_PLAN_2D CREATE_PLAN_2D -# define CREATE_PLAN_3D CREATE_PLAN_3D -# define DESTROY_PLAN_1D DESTROY_PLAN_1D -# define DESTROY_PLAN_2D DESTROY_PLAN_2D -# define DESTROY_PLAN_3D DESTROY_PLAN_3D -# define FFT_X_STICK FFT_X_STICK -# define FFT_Y_STICK FFT_Y_STICK -# define FFT_Z_STICK FFT_Z_STICK -# define CPFLUSH CPFLUSH -# define ELAPSED_SECONDS ELAPSED_SECONDS -# define CCLOCK CCLOCK -# define LN_ALLOC LN_ALLOC -# define LN_DEALLOC LN_DEALLOC -# define LN_SET LN_SET -# define LN_ACTIVATE LN_ACTIVATE -# define LN_IND LN_IND -# define MEMSTAT MEMSTAT -# define C_MKDIR C_MKDIR - -#endif - -#if defined __SGI || defined __FUJITSU || defined __SX4 || defined __INTEL || defined __LAHEY || defined __SX6 || defined SUN || defined __ALTIX - -# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d_ -# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d_ -# define FFTW_INPLACE_DRV_3D fftw_inplace_drv_3d_ -# define CREATE_PLAN_1D create_plan_1d_ -# define CREATE_PLAN_2D create_plan_2d_ -# define CREATE_PLAN_3D create_plan_3d_ -# define DESTROY_PLAN_1D destroy_plan_1d_ -# define DESTROY_PLAN_2D destroy_plan_2d_ -# define DESTROY_PLAN_3D destroy_plan_3d_ -# define FFT_X_STICK fft_x_stick_ -# define FFT_Y_STICK fft_y_stick_ -# define FFT_Z_STICK fft_z_stick_ -# define CPFLUSH cpflush_ -# define ELAPSED_SECONDS elapsed_seconds_ -# define CCLOCK cclock_ -# define LN_ALLOC ln_alloc_ -# define LN_DEALLOC ln_dealloc_ -# define LN_SET ln_set_ -# define LN_ACTIVATE ln_activate_ -# define LN_IND ln_ind_ -# define MEMSTAT memstat_ -# define C_MKDIR c_mkdir_ - -#endif - -#if defined __PGI - -# if defined __GNU_LINK - -# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d__ -# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d__ -# define FFTW_INPLACE_DRV_3D fftw_inplace_drv_3d__ -# define CREATE_PLAN_1D create_plan_1d__ -# define CREATE_PLAN_2D create_plan_2d__ -# define CREATE_PLAN_3D create_plan_3d__ -# define DESTROY_PLAN_1D destroy_plan_1d__ -# define DESTROY_PLAN_2D destroy_plan_2d__ -# define DESTROY_PLAN_3D destroy_plan_3d__ -# define FFT_X_STICK fft_x_stick__ -# define FFT_Y_STICK fft_y_stick__ -# define FFT_Z_STICK fft_z_stick__ -# define CPFLUSH cpflush_ -# define ELAPSED_SECONDS elapsed_seconds_ -# define CCLOCK cclock_ -# define LN_ALLOC ln_alloc__ -# define LN_DEALLOC ln_dealloc__ -# define LN_SET ln_set__ -# define LN_ACTIVATE ln_activate__ -# define LN_IND ln_ind__ -# define MEMSTAT memstat_ -# define C_MKDIR c_mkdir_ - -# else - -# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d_ -# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d_ -# define FFTW_INPLACE_DRV_3D fftw_inplace_drv_3d_ -# define CREATE_PLAN_1D create_plan_1d_ -# define CREATE_PLAN_2D create_plan_2d_ -# define CREATE_PLAN_3D create_plan_3d_ -# define DESTROY_PLAN_1D destroy_plan_1d_ -# define DESTROY_PLAN_2D destroy_plan_2d_ -# define DESTROY_PLAN_3D destroy_plan_3d_ -# define FFT_X_STICK fft_x_stick_ -# define FFT_Y_STICK fft_y_stick_ -# define FFT_Z_STICK fft_z_stick_ -# define CPFLUSH cpflush_ -# define ELAPSED_SECONDS elapsed_seconds_ -# define CCLOCK cclock_ -# define LN_ALLOC ln_alloc_ -# define LN_DEALLOC ln_dealloc_ -# define LN_SET ln_set_ -# define LN_ACTIVATE ln_activate_ -# define LN_IND ln_ind_ -# define MEMSTAT memstat_ -# define C_MKDIR c_mkdir_ - -# endif - -#endif - -#if defined __G95 - -# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d__ -# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d__ -# define FFTW_INPLACE_DRV_3D fftw_inplace_drv_3d__ -# define CREATE_PLAN_1D create_plan_1d__ -# define CREATE_PLAN_2D create_plan_2d__ -# define CREATE_PLAN_3D create_plan_3d__ -# define DESTROY_PLAN_1D destroy_plan_1d__ -# define DESTROY_PLAN_2D destroy_plan_2d__ -# define DESTROY_PLAN_3D destroy_plan_3d__ -# define FFT_X_STICK fft_x_stick__ -# define FFT_XY_STICK fft_xy_stick__ -# define FFT_XY fft_xy__ -# define FFT_Y_STICK fft_y_stick__ -# define FFT_Y_STICK2 fft_y_stick2__ -# define FFT_Z_STICK fft_z_stick__ -# define FFT_Z fft_z__ -# define FFT_STICK fft_stick__ -# define CP_GETENV cp_getenv__ -# define CP_DATE cp_date__ -# define CPFLUSH cpflush_ -# define CPTIMER cptimer__ -# define ELAPSED_SECONDS elapsed_seconds__ -# define CCLOCK cclock_ -# define FACTOR235 factor235__ -# define FACTOR2 factor2__ -# define LN_ALLOC ln_alloc__ -# define LN_DEALLOC ln_dealloc__ -# define LN_SET ln_set__ -# define LN_ACTIVATE ln_activate__ -# define LN_IND ln_ind__ -# define MEMSTAT memstat_ -# define READOCC readocc_ -# define ROUND2 round2_ -# define MYUNITNAME myunitname_ -# define CP_ITOA cp_itoa_ -# define C_MKDIR c_mkdir__ - -#endif - -#if defined __AIX || defined __HP - -# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d -# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d -# define FFTW_INPLACE_DRV_3D fftw_inplace_drv_3d -# define CREATE_PLAN_2D create_plan_2d -# define CREATE_PLAN_3D create_plan_3d -# define CREATE_PLAN_1D create_plan_1d -# define DESTROY_PLAN_1D destroy_plan_1d -# define DESTROY_PLAN_2D destroy_plan_2d -# define DESTROY_PLAN_3D destroy_plan_3d -# define FFT_X_STICK fft_x_stick -# define FFT_Y_STICK fft_y_stick -# define FFT_Z_STICK fft_z_stick -# define CPFLUSH cpflush -# define ELAPSED_SECONDS elapsed_seconds -# define CCLOCK cclock -# define LN_ALLOC ln_alloc -# define LN_DEALLOC ln_dealloc -# define LN_SET ln_set -# define LN_ACTIVATE ln_activate -# define LN_IND ln_ind -# define MEMSTAT memstat -# define C_MKDIR c_mkdir - -#endif - - -#if defined __ALPHA - -# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d_ -# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d_ -# define FFTW_INPLACE_DRV_3D fftw_inplace_drv_3d_ -# define CREATE_PLAN_2D create_plan_2d_ -# define CREATE_PLAN_3D create_plan_3d_ -# define CREATE_PLAN_1D create_plan_1d_ -# define DESTROY_PLAN_1D destroy_plan_1d_ -# define DESTROY_PLAN_2D destroy_plan_2d_ -# define DESTROY_PLAN_3D destroy_plan_3d_ -# define FFT_X_STICK fft_x_stick_ -# define FFT_Y_STICK fft_y_stick_ -# define FFT_Z_STICK fft_z_stick_ -# define CPFLUSH cpflush_ -# define ELAPSED_SECONDS elapsed_seconds_ -# define CCLOCK cclock_ -# define LN_ALLOC ln_alloc_ -# define LN_DEALLOC ln_dealloc_ -# define LN_SET ln_set_ -# define LN_ACTIVATE ln_activate_ -# define LN_IND ln_ind_ -# define MEMSTAT memstat_ -# define C_MKDIR c_mkdir_ - -#endif - -#if defined __ALPHA && defined __LINUX - -# define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d_ -# define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d_ -# define FFTW_INPLACE_DRV_3D fftw_inplace_drv_3d_ -# define CREATE_PLAN_1D create_plan_1d_ -# define DESTROY_PLAN_1D destroy_plan_1d_ -# define CREATE_PLAN_2D create_plan_2d_ -# define CREATE_PLAN_3D create_plan_3d_ -# define DESTROY_PLAN_2D destroy_plan_2d_ -# define DESTROY_PLAN_3D destroy_plan_3d_ -# define FFT_X_STICK fft_x_stick__ -# define FFT_Y_STICK fft_y_stick__ -# define FFT_Z_STICK fft_z_stick__ -# define CPFLUSH cpflush_ -# define ELAPSED_SECONDS elapsed_seconds_ -# define CCLOCK cclock_ -# define LN_ALLOC ln_alloc__ -# define LN_DEALLOC ln_dealloc__ -# define LN_SET ln_set__ -# define LN_ACTIVATE ln_activate__ -# define LN_IND ln_ind__ -# define MEMSTAT memstat_ -# define C_MKDIR c_mkdir_ - -#endif diff --git a/include/machine.h b/include/machine.h deleted file mode 100644 index a3aca652a..000000000 --- a/include/machine.h +++ /dev/null @@ -1,302 +0,0 @@ -! -! Copyright (C) 2002-2004 PWSCF,FPMD,CPV groups -! This file is distributed under the terms of the -! GNU General Public License. See the file `License' -! in the root directory of the present distribution, -! or http://www.gnu.org/copyleft/gpl.txt . -! - - -#if defined (__SX4) || defined (__ORIGIN) || defined (__T3E) || defined (FUJ64) || defined (HITACHI) -# define FLUSH -#endif - -#if defined(CRAYY) || defined(__LINUX) || defined(__AIX) || defined(HITACHI) || defined(SUN) -# define C_POINTER integer(kind=4) -#endif - -#if defined (FUJ64)|| defined (__ALPHA) || defined (__SX6) || defined(__LINUX64) || defined(__T3E) -# define C_POINTER integer(kind=8) -#endif - -#if defined __HP -# if defined __HP64 -# define C_POINTER integer(kind=8) -# else -# define C_POINTER integer(kind=4) -# endif -#endif - -#if defined __SGI || defined __ORIGIN -# if defined __SGI64 -# define C_POINTER integer(kind=8) -# else -# define C_POINTER integer(kind=4) -# endif -#endif - -#if defined(__SX4) -# define C_POINTER real(kind=8) -#endif - -#if defined(__SX4) -# define DIRECT_IO_FACTOR 1 -#elif defined(__ALPHA) -# define DIRECT_IO_FACTOR 2 -#else -# define DIRECT_IO_FACTOR 8 -#endif - -#if defined(CRAYY) || defined (__SX4) || defined (__T3E) - -# define DREAL real -# define DIMAG aimag -# define DCMPLX cmplx - -# define DAXPY saxpy -# define DCOPY scopy -# define DDOT sdot -# define DGETRF sgetrf -# define DGETRI sgetri -# define DGEMV sgemv -# define DGEMM sgemm -# define DNRM2 snrm2 -# define DSCAL sscal -# define DSPEV sspev -# define DSYTRF ssytrf -# define DSYTRI ssytri -# define DSYEV ssyev -# define DSYGV ssygv -# define DSYGVX ssygvx -# define DSWAP sswap -# define ILAENV ilaenv -# define ZAXPY caxpy -# define ZCOPY ccopy -# define ZDOTC cdotc -# define ZDOTU cdotu -# define ZGEMM cgemm -# define ZGEMV cgemv -# define ZGESV cgesv -# define ZGESVD cgesvd -# define ZGGEV cggev -# define ZHEEV cheev -# define ZHEEVX cheevx -# define ZHEGV chegv -# define ZHEGVX chegvx -# define ZHETRD CHETRD -# define ZHPEV chpev -# define ZSCAL cscal - -# define IZAMAX icamax -# define DYAX syax -# define ZSWAP cswap -# define ZDSCAL csscal -# define IDAMAX isamax -# define DGEMUL sgemul -# define DGESUB sgesub -# define DGER sger -# define DGEMTX sgemtx -# define DGEMX sgemx - -# define DLAMCH slamch -# define DLAPY3 slapy3 -# define DZNRM2 scnrm2 -# define ZLADIV cladiv -# define DLAE2 slae2 -# define DLAEV2 slaev2 -# define DLANST slanst -# define DLAPY2 slapy2 -# define DLARTG slartg -# define DLASCL slascl -# define DLASRT slasrt -# define ZLASET claset -# define ZLASR clasr - -# define DPOTRF spotrf -# define DPOTRS spotrs - -#else - -# define DREAL dreal -# define DCMPLX dcmplx -# define DIMAG dimag - -# if defined(ADD_BLAS_TWO_UNDERSCORES) - -# define DAXPY daxpy__ -# define DCOPY dcopy__ -# define DDOT ddot__ -# define DGETRF dgetrf__ -# define DGETRI dgetri__ -# define DGEMV dgemv__ -# define DGEMM dgemm__ -# define DNRM2 dnrm2__ -# define DSCAL dscal__ -# define DSPEV dspev__ -# define DSYTRF dsytrf__ -# define DSYTRI dsytri__ -# define DSYEV dsyev__ -# define DSYGV dsygv__ -# define DSYGVX dsygvx__ -# define DSWAP dswap__ -# define ILAENV ilaenv__ -# define ZAXPY zaxpy__ -# define ZCOPY zcopy__ -# define ZDOTC zdotc__ -# define ZDOTU zdotu__ -# define ZGEMM zgemm__ -# define ZGEMV zgemv__ -# define ZGESV zgesv__ -# define ZGESVD zgesvd__ -# define ZGGEV zggev__ -# define ZHEEV zheev__ -# define ZHEEVX zheevx__ -# define ZHEGV zhegv__ -# define ZHEGVX zhegvx__ -# define ZHPEV zhpev__ -# define ZSCAL zscal__ - -# define IZAMAX izamax__ -# define DYAX dyax__ -# define ZSWAP zswap__ -# define ZDSCAL zdscal__ -# define IDAMAX idamax__ -# define DGEMUL dgemul__ -# define DGESUB dgesub__ -# define DGER dger__ -# define DGEMTX dgemtx__ -# define DGEMX dgemx__ - -# define DPOTRF dpotrf__ -# define DPOTRS dpotrs__ - -# elif defined(ADD_BLAS_ONE_UNDERSCORE) - -# define DAXPY daxpy_ -# define DCOPY dcopy_ -# define DDOT ddot_ -# define DGETRF dgetrf_ -# define DGETRI dgetri_ -# define DGEMV dgemv_ -# define DGEMM dgemm_ -# define DNRM2 dnrm2_ -# define DSCAL dscal_ -# define DSPEV dspev_ -# define DSYTRF dsytrf_ -# define DSYTRI dsytri_ -# define DSYEV dsyev_ -# define DSYGV dsygv_ -# define DSYGVX dsygvx_ -# define DSWAP dswap_ -# define ILAENV ilaenv_ -# define ZAXPY zaxpy_ -# define ZCOPY zcopy_ -# define ZDOTC zdotc_ -# define ZDOTU zdotu_ -# define ZGEMM zgemm_ -# define ZGEMV zgemv_ -# define ZGESV zgesv_ -# define ZGESVD zgesvd_ -# define ZGGEV zggev_ -# define ZHEEV zheev_ -# define ZHEEVX zheevx_ -# define ZHEGV zhegv_ -# define ZHEGVX zhegvx_ -# define ZHPEV zhpev_ -# define ZSCAL zscal_ - -# define IZAMAX izamax_ -# define DYAX dyax_ -# define ZSWAP zswap_ -# define ZDSCAL zdscal_ -# define IDAMAX idamax_ -# define DGEMUL dgemul_ -# define DGESUB dgesub_ -# define DGER dger_ -# define DGEMTX dgemtx_ -# define DGEMX dgemx_ - -# define DPOTRF dpotrf_ -# define DPOTRS dpotrs_ - -# else - -# define DAXPY daxpy -# define DCOPY dcopy -# define DDOT ddot -# define DGETRF dgetrf -# define DGETRI dgetri -# define DGEMV dgemv -# define DGEMM dgemm -# define DNRM2 dnrm2 -# define DSCAL dscal -# define DSPEV dspev -# define DSYTRF dsytrf -# define DSYTRI dsytri -# define DSYEV dsyev -# define DSYGV dsygv -# define DSYGVX dsygvx -# define DSWAP dswap -# define ILAENV ilaenv -# define ZAXPY zaxpy -# define ZCOPY zcopy -# define ZDOTC zdotc -# define ZDOTU zdotu -# define ZGEMM zgemm -# define ZGEMV zgemv -# define ZGESV zgesv -# define ZGESVD zgesvd -# define ZGGEV zggev -# define ZHEEV zheev -# define ZHEEVX zheevx -# define ZHEGV zhegv -# define ZHEGV zhegv -# define ZHEGVX zhegvx -# define ZHPEV zhpev -# define ZSCAL zscal - -# define IZAMAX izamax -# define DYAX dyax -# define ZSWAP zswap -# define ZDSCAL zdscal -# define IDAMAX idamax -# define DGEMUL dgemul -# define DGESUB dgesub -# define DGER dger -# define DGEMTX dgemtx -# define DGEMX dgemx - -# define DPOTRF dpotrf -# define DPOTRS dpotrs - -# endif - -#endif - -#if defined (__AIX) -# define flush flush_ -#endif - -#if defined(__ABSOFT) -# define flush flush_ -# define getenv getenv_ -# define getarg getarg_ -# define iargc iargc_ -#endif - -#ifdef __T3E -# define iargc ipxfargc -# define getarg(x,y) pxfgetarg(x,y, ilen,ierr) -# define getenv(x,y) pxfgetenv(x,0,y,ilen,ierr) -#endif - -#if defined(__BENCHLIB) -# define DCOPY scopy_t3e -# define DGEMM s_gemm -# define ZGEMM c_gemm -#endif - -#if defined(__LAM) || defined (__LINUX) -#define MPI_REAL8 MPI_DOUBLE_PRECISION -#endif - diff --git a/include/machine.h.README b/include/machine.h.README deleted file mode 100644 index d6458ccdd..000000000 --- a/include/machine.h.README +++ /dev/null @@ -1,60 +0,0 @@ - -/* Machine-dependent definitions - - Input Machine definitions: - - __AIX ibm rs/6000 machines - __T3E t3d/t3e machines - __LINUX intel/amd 32-bit pc's (pentium, athlon) running Linux - __LINUX64 intel/amd 64-bit cpu's (Opteron, Itanium?) pc's running Linux - __HP hp-compaq PA-RISC workstations and parallel machines - __HP64 64-bit mode for hp-compaq machines - __SGI all sgi machines - __SGI64 64-bit mode for sgi machines - __ALTIX sgi altix 350/3000 machines running Linux - __ORIGIN sgi origin 2k or 3k machines - __ALPHA hp-compaq (formerly dec) alphas - __SX4 nec sx-4/5 vector machines (obsolete) - __SX6 nec sx-6 vector machines - CRAYY cray vector machines (obsolete) - FUJ64 Fujitsu VPP5000 vector machines - Other Input definitions: - ABSOFT for intel pc's with absoft compiler - ADD_BLAS_TWO_UNDERSCORES - ADD_BLAS_ONE_UNDERSCORE - may be needed depending on how blas/lapack are - compiled and how they are called by the compiler - __BENCHLIB t3e machines with benchlib library - __LAM LAM-MPI version - Other definitions not used in the machine.h file: - __FFTW use the FFTW library - __USE_INTERNAL_FFTW use the local copy of FFTW, not an external lib - - Output Definitions: - - FLUSH : define FLUSH if you want output to be written - immediately to disk and not keep in buffers - (useful in case of crash) - DIRECT_IO_FACTOR : record length in direct-access I/O is given by - the number of real*8 words times DIRECT_IO_FACTOR - C_POINTER : the type for C pointer - integer*8 for 64-bit machines, - integer on most other machines - DIMAG : intrinsic functions for imaginary part of a - complex number in double precision - dimag for 32-bit machines, aimag otherwise - DREAL : intrinsic functions for real part of a - complex number in double precision - dreal for 32-bit machines, real otherwise - DCMPLX : intrinsic functions for (real,real) to complex - conversion in double precision - dcmplx for 32-bit machines, cmplx otherwise - Blas/Lapack names: single-precision names for 64-bit machines, - double-precision names for 32-bit machines, - with underscores appended if requested - -*/ - -/* Note that ZHETRD is not a call but a string passed as argument - to "ilaenv". For this reason it should be defined as uppercase */ -