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

Cleanup of laxlib tests: use laxlib_parallel_include instead of module mpi, 

not always compiled for the same compiler. Closes issue 380.
This commit is contained in:
Paolo Giannozzi 2022-01-06 22:34:27 +01:00
parent a5e9449b32
commit 35b51e4fc3
11 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LAXlib/tests/Makefile
View File

@ -2,7 +2,7 @@
include ../../make.inc
MODFLAGS= $(MOD_FLAG)../../UtilXlib $(MOD_FLAG)../../ELPA/src $(MOD_FLAG).. $(MOD_FLAG).
MODFLAGS= $(MOD_FLAG)../../UtilXlib $(MOD_FLAG).. $(MOD_FLAG).
SRCS = test_diaghg_1.f90 \
test_diaghg_2.f90 \

4
LAXlib/tests/mp_world.f90
View File

@ -2,9 +2,7 @@
MODULE mp_world
!----------------------------------------------------------------------------
!
#if defined(__MPI)
USE mpi
#endif
USE laxlib_parallel_include
USE mp, ONLY : mp_barrier, mp_start, mp_end, mp_stop
USE mp, ONLY : mp_count_nodes
!

5
LAXlib/tests/test_diaghg_1.f90
View File

@ -1,7 +1,6 @@
program test_diaghg
#if defined(__MPI)
USE MPI
#endif
USE laxlib_parallel_include
USE mp, ONLY : mp_bcast
USE mp_world, ONLY : mp_world_start, mp_world_end, mpime, &
root, world_comm

5
LAXlib/tests/test_diaghg_2.f90
View File

@ -1,7 +1,6 @@
program test_diaghg_2
#if defined(__MPI)
USE MPI
#endif
USE laxlib_parallel_include
USE mp, ONLY : mp_bcast
USE mp_world, ONLY : mp_world_start, mp_world_end, mpime, &
root, world_comm

5
LAXlib/tests/test_diaghg_3.f90
View File

@ -1,7 +1,6 @@
program test_diaghg_3
#if defined(__MPI)
USE MPI
#endif
USE laxlib_parallel_include
USE mp, ONLY : mp_bcast
USE mp_world, ONLY : mp_world_start, mp_world_end, mpime, &
root, world_comm

7
LAXlib/tests/test_diaghg_4.f90
View File

@ -8,13 +8,12 @@
! - SiGeK1.bin
! - SiGeK2.bin
!
! If the scalacpak or ELPA driver is used, the test is skipped.
! If the scalapack or ELPA driver is used, the test is skipped.
!
#if ! defined(__SCALAPACK)
program test_diaghg_4
#if defined(__MPI)
USE MPI
#endif
USE laxlib_parallel_include
USE mp, ONLY : mp_bcast
USE mp_world, ONLY : mp_world_start, mp_world_end, mpime, &
root, world_comm

5
LAXlib/tests/test_diaghg_gpu_1.f90
View File

@ -1,8 +1,7 @@
#if defined(__CUDA)
program test_diaghg_gpu
#if defined(__MPI)
USE MPI
#endif
USE laxlib_parallel_include
USE mp, ONLY : mp_bcast
USE mp_world, ONLY : mp_world_start, mp_world_end, mpime, &
root, nproc, world_comm

5
LAXlib/tests/test_diaghg_gpu_2.f90
View File

@ -1,8 +1,7 @@
#if defined(__CUDA)
program test_diaghg_gpu_2
#if defined(__MPI)
USE MPI
#endif
USE laxlib_parallel_include
USE mp, ONLY : mp_bcast
USE mp_world, ONLY : mp_world_start, mp_world_end, mpime, &
root, nproc, world_comm

5
LAXlib/tests/test_diaghg_gpu_3.f90
View File

@ -1,8 +1,7 @@
#ifdef __CUDA
program test_diaghg_gpu_3
#if defined(__MPI)
USE MPI
#endif
USE laxlib_parallel_include
USE mp, ONLY : mp_bcast
USE mp_world, ONLY : mp_world_start, mp_world_end, mpime, &
root, nproc, world_comm

7
LAXlib/tests/test_diaghg_gpu_4.f90
View File

@ -8,13 +8,12 @@
! - SiGeK1.bin
! - SiGeK2.bin
!
! If the scalacpak or ELPA driver is used, the test is skipped.
! If the scalapack or ELPA driver is used, the test is skipped.
!
#if ( ! defined(__SCALAPACK) ) && defined(__CUDA)
program test_diaghg_gpu_4
#if defined(__MPI)
USE MPI
#endif
USE laxlib_parallel_include
USE mp, ONLY : mp_bcast
USE mp_world, ONLY : mp_world_start, mp_world_end, mpime, &
root, nproc, world_comm

10
LAXlib/tests/utils.f90
View File

@ -1,7 +1,6 @@
SUBROUTINE collect_results(test)
#if defined(__MPI)
USE mpi
#endif
USE laxlib_parallel_include
USE tester
IMPLICIT NONE
!
@ -34,9 +33,8 @@ END SUBROUTINE collect_results
SUBROUTINE no_test
#if defined(__MPI)
USE mpi
#endif
USE laxlib_parallel_include
USE tester
IMPLICIT NONE
!TYPE(tester_t) :: test