scnc
/
quantum-espresso
mirror of https://gitlab.com/QEF/q-e.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support for Hardware Performance Monitor for SP machines is obsolete 

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@12331 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
giannozz 2016-04-22 06:30:45 +00:00
parent 78f0bacde4
commit 52151050a9
7 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/user_guide.tex
View File

@ -651,7 +651,7 @@ if none is found, it will fall back to the internal copy of FFTW.
\item \texttt{-D\_\_ESSL} for ESSL on IBM AIX machines,
\item \texttt{-D\_\_LINUX\_ESSL} for ESSL on IBM Linux machines,
\item \texttt{-DASL} for NEC ASL library on NEC machines,
\item \texttt{-D\_\_ARM\_LIB} for ARM library,
\item \texttt{-D\_\_ARM\_LIB} for ARM Performance library,
\item \texttt{-D\_\_DFTI} for DFTI (Intel MKL library),
\item \texttt{-D\_\_FFTW3} for FFTW3 (external),
\item \texttt{-D\_\_FFTW}) for FFTW (internal library),

6
FFTXlib/fft_scalar.ARM_LIB.f90
View File

@ -71,9 +71,6 @@
INTEGER, SAVE :: icurrent = 1
LOGICAL :: found
#if defined __HPM
INTEGER :: OMP_GET_THREAD_NUM
#endif
INTEGER :: tid
#if defined(__OPENMP)
@ -195,9 +192,6 @@ END IF
LOGICAL :: dofft( nfftx ), found
INTEGER, PARAMETER :: stdout = 6
#if defined __HPM
INTEGER :: OMP_GET_THREAD_NUM
#endif
#if defined(__OPENMP)
INTEGER :: offset
INTEGER :: nx_t, ny_t, nzl_t, ldx_t, ldy_t

6
FFTXlib/fft_scalar.ESSL.f90
View File

@ -81,9 +81,6 @@
INTEGER, SAVE :: icurrent = 1
LOGICAL :: done
#if defined __HPM
INTEGER :: OMP_GET_THREAD_NUM
#endif
INTEGER :: tid
! ... Machine-Dependent parameters, work arrays and tables of factors
@ -216,9 +213,6 @@
LOGICAL :: dofft( nfftx ), done
INTEGER, PARAMETER :: stdout = 6
#if defined __HPM
INTEGER :: OMP_GET_THREAD_NUM
#endif
#if defined(__OPENMP)
INTEGER :: offset
INTEGER :: nx_t, ny_t, nzl_t, ldx_t, ldy_t

6
FFTXlib/fft_scalar.FFTW.f90
View File

@ -71,9 +71,6 @@
INTEGER, SAVE :: icurrent = 1
LOGICAL :: found
#if defined __HPM
INTEGER :: OMP_GET_THREAD_NUM
#endif
INTEGER :: tid
#if defined(__OPENMP)
@ -229,9 +226,6 @@
LOGICAL :: dofft( nfftx ), found
INTEGER, PARAMETER :: stdout = 6
#if defined __HPM
INTEGER :: OMP_GET_THREAD_NUM
#endif
#if defined(__OPENMP)
INTEGER :: offset
INTEGER :: nx_t, ny_t, nzl_t, ldx_t, ldy_t

3
FFTXlib/fft_scalar.FFTW3.f90
View File

@ -209,9 +209,6 @@
LOGICAL :: dofft( nfftx ), done
INTEGER, PARAMETER :: stdout = 6
#if defined __HPM
INTEGER :: OMP_GET_THREAD_NUM
#endif
#if defined(__OPENMP)
INTEGER :: offset
INTEGER :: nx_t, ny_t, nzl_t, ldx_t, ldy_t

13
Modules/mp.f90
View File

@ -5,11 +5,6 @@
! in the root directory of the present distribution,
! or http://www.gnu.org/copyleft/gpl.txt .
!
#if defined __HPM
# include "/cineca/prod/hpm/include/f_hpm.h"
#endif
!
! This module contains interfaces to most low-level MPI operations:
! initialization and stopping, broadcast, parallel sum, etc.
!
@ -155,10 +150,6 @@
IF (ierr/=0) CALL mp_stop( 8004 )
CALL mpi_comm_rank(group,taskid,ierr)
IF (ierr/=0) CALL mp_stop( 8005 )
#if defined __HPM
! initialize the IBM Hardware performance monitor
CALL f_hpminit( taskid, 'profiling' )
#endif
CALL mpi_comm_size(group,numtask,ierr)
IF (ierr/=0) CALL mp_stop( 8006 )
# endif
@ -198,10 +189,6 @@
#if defined(__MPI)
CALL mpi_comm_rank( groupid, taskid, ierr)
#if defined __HPM
! terminate the IBM Hardware performance monitor
CALL f_hpmterminate( taskid )
#endif
#endif
RETURN
END SUBROUTINE mp_end

3
include/defs.h.README
View File

@ -81,6 +81,7 @@ Libraries:
__FFTW FFT routines from internal FFTW library
__FFTW3 FFT routines from external FFTW v.3 library
__DFTI FFT routines from Intel MKL library
__ARM_LIB FFT routines from ARM Performance library
__ESSL use blas/lapack/fft routines from IBM ESSL library
__LINUX_ESSL use blas/lapack/fft routines from IBM ESSL library
(linux version)
@ -88,8 +89,6 @@ Libraries:
for parallel subspace diagonalization
__MASS use mathematical routines from IBM MASS library
ASL, MICRO SX-6 specific libraries
Timing:
__HPM Hardware Performance Monitor (IBM SP)
Signals:
__PTRACE Enable traceback
__TRAP_SIGUSR1 Enable signal trapping (experimental): code will stop