From 8f53ee6dd1955ea014c314cceacf653128af570c Mon Sep 17 00:00:00 2001
From: faffinito <faffinito@c92efa57-630b-4861-b058-cf58834340f0>
Date: Fri, 18 Nov 2016 15:35:23 +0000
Subject: [PATCH] Fixed a small mistype in test.f90 and introduced non-blocking
 alltoall in unpack_group_sticks (used only in test.f90 and harmless
 elsewhere)

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@13164 c92efa57-630b-4861-b058-cf58834340f0
---
 FFTXlib/fft_parallel.f90 | 40 ++++++++++++++++++++++++++++++++++++++++
 FFTXlib/test.f90         | 23 ++++++++++++++---------
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/FFTXlib/fft_parallel.f90 b/FFTXlib/fft_parallel.f90
index 2d0c07553..6bad6aee0 100644
--- a/FFTXlib/fft_parallel.f90
+++ b/FFTXlib/fft_parallel.f90
@@ -532,6 +532,46 @@ END SUBROUTINE bw_tg_cft3_xy
   END SUBROUTINE unpack_group_sticks
 
 
+  SUBROUTINE unpack_group_sticks_i( yf, f, dtgs, req )
+
+     USE task_groups,  ONLY : task_groups_descriptor
+
+     IMPLICIT NONE
+#if defined(__MPI)
+  INCLUDE 'mpif.h'
+#endif
+
+     COMPLEX(DP), INTENT(out)    :: f( : )  ! array containing all bands, and gvecs distributed across processors
+     COMPLEX(DP), INTENT(in)    :: yf( : )  ! array containing bands collected into task groups
+     TYPE (task_groups_descriptor), INTENT(in) :: dtgs
+     !
+     !  Bring pencils back to their original distribution
+     !
+     INTEGER                     :: ierr, req
+     !
+     IF( dtgs%tg_usdsp(dtgs%nogrp) + dtgs%tg_snd(dtgs%nogrp) > size( f ) ) THEN
+        CALL fftx_error__( 'unpack_group_sticks', ' inconsistent size ', 3 )
+     ENDIF
+     IF( dtgs%tg_rdsp(dtgs%nogrp) + dtgs%tg_rcv(dtgs%nogrp) > size( yf ) ) THEN
+        CALL fftx_error__( 'unpack_group_sticks', ' inconsistent size ', 4 )
+     ENDIF
+
+     CALL start_clock( 'ALLTOALL' )
+
+#if defined(__MPI)
+     CALL MPI_IAlltoallv( yf(1), &
+          dtgs%tg_rcv, dtgs%tg_rdsp, MPI_DOUBLE_COMPLEX, f(1), &
+          dtgs%tg_snd, dtgs%tg_usdsp, MPI_DOUBLE_COMPLEX, dtgs%ogrp_comm, req, IERR)
+     IF( ierr /= 0 ) THEN
+        CALL fftx_error__( 'unpack_group_sticks', ' alltoall error 2 ', abs(ierr) )
+     ENDIF
+#endif
+
+     CALL stop_clock( 'ALLTOALL' )
+
+     RETURN
+  END SUBROUTINE unpack_group_sticks_i
+
 SUBROUTINE tg_gather( dffts, dtgs, v, tg_v )
    !
    USE fft_types,      ONLY : fft_type_descriptor
diff --git a/FFTXlib/test.f90 b/FFTXlib/test.f90
index 5b68eb44b..bb70b7e4d 100644
--- a/FFTXlib/test.f90
+++ b/FFTXlib/test.f90
@@ -400,12 +400,18 @@ program test
      CALL bw_tg_cft3_z( psis( :, ipsi ), dffts, aux, dtgs )
      time(9) = MPI_WTIME()
      !
-     CALL unpack_group_sticks( psis( :, ipsi ), aux, dtgs )
-     !
+     IF(ireq == 2)THEN
+       CALL unpack_group_sticks_i( psis( :, ipsi ), aux, dtgs , req_u(ireq) )
+     ELSE
+       CALL MPI_WAIT(req_u(ireq-1), MPI_STATUS_IGNORE, ierr )
+       ipsi = MOD( ireq + 1, 2 ) + 1 ! ireq = 2, ipsi = 2; ireq = 3, ipsi = 1
+       CALL unpack_group_sticks_i( psis( :, ipsi ), aux, dtgs, req_u(ireq) )
+     ENDIF
+
+     call accumulate_hpsi( ib, nbnd, ngms, hpsi, aux, nls, nlsm, dtgs, dffts)
+
      time(10) = MPI_WTIME()
      !
-     call accumulate_hpsi( ib, nbnd, ngms, hpsi, aux, nls, nlsm, dgts, dffts)
-     !
      do i = 2, 10
         my_time(i) = my_time(i) + (time(i) - time(i-1))
      end do
@@ -413,6 +419,7 @@ program test
      ncount = ncount + 1
      !
   enddo
+  CALL MPI_WAIT(req_u(ireq),MPI_STATUS_IGNORE,ierr)
 
 #else
 
@@ -453,15 +460,13 @@ program test
      CALL unpack_group_sticks( psis( :, ipsi ), aux, dtgs )
 
      time(10) = MPI_WTIME()
-
-     call accumulate_hpsi( ib, nbnd, ngms, hpsi, aux, nls, nlsm, dtgs, dffts)
-
+     !
      do i = 2, 10
         my_time(i) = my_time(i) + (time(i) - time(i-1))
      end do
-
+     !
      ncount = ncount + 1
-
+     !
   enddo
 #endif