From bfcae6afc972de80064615222412e49f1bdf13f3 Mon Sep 17 00:00:00 2001 From: Max Hawkins <37495064+max-Hawkins@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:03:56 -0500 Subject: [PATCH 1/2] Fix rdma-mpi --- src/simulation/m_mpi_proxy.fpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/simulation/m_mpi_proxy.fpp b/src/simulation/m_mpi_proxy.fpp index 7da0b04d62..77386c2908 100644 --- a/src/simulation/m_mpi_proxy.fpp +++ b/src/simulation/m_mpi_proxy.fpp @@ -1076,20 +1076,18 @@ contains p_send => q_cons_buff_send(0) p_recv => q_cons_buff_recv(0) #:if rdma_mpi - !$acc data attach(p_send, p_recv) - !$acc host_data use_device(p_send, p_recv) + !$acc host_data use_device(q_cons_buff_send, q_cons_buff_recv) #:else !$acc update host(q_cons_buff_send, ib_buff_send) #:endif call MPI_SENDRECV( & - p_send, buffer_count, MPI_DOUBLE_PRECISION, dst_proc, send_tag, & - p_recv, buffer_count, MPI_DOUBLE_PRECISION, src_proc, recv_tag, & + q_cons_buff_send, buffer_count, MPI_DOUBLE_PRECISION, dst_proc, send_tag, & + q_cons_buff_recv, buffer_count, MPI_DOUBLE_PRECISION, src_proc, recv_tag, & MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr) #:if rdma_mpi !$acc end host_data - !$acc end data !$acc wait #:else !$acc update device(q_cons_buff_recv) From 4eccce85f9aba6baf2994544ed8fbbfc10dd3cc2 Mon Sep 17 00:00:00 2001 From: Max Hawkins Date: Thu, 7 Nov 2024 13:12:08 -0500 Subject: [PATCH 2/2] Remove unneeded variables --- src/simulation/m_mpi_proxy.fpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/simulation/m_mpi_proxy.fpp b/src/simulation/m_mpi_proxy.fpp index 77386c2908..c2658da1a3 100644 --- a/src/simulation/m_mpi_proxy.fpp +++ b/src/simulation/m_mpi_proxy.fpp @@ -872,8 +872,6 @@ contains integer :: pack_offsets(1:3), unpack_offsets(1:3) integer :: pack_offset, unpack_offset - real(kind(0d0)), pointer :: p_send, p_recv - integer, pointer, dimension(:) :: p_i_send, p_i_recv #ifdef MFC_MPI @@ -1073,8 +1071,6 @@ contains ! Send/Recv #:for rdma_mpi in [False, True] if (rdma_mpi .eqv. ${'.true.' if rdma_mpi else '.false.'}$) then - p_send => q_cons_buff_send(0) - p_recv => q_cons_buff_recv(0) #:if rdma_mpi !$acc host_data use_device(q_cons_buff_send, q_cons_buff_recv) #:else