This commit is contained in:
WickedJack99
2025-06-29 21:45:29 +02:00
parent 1654cc9c12
commit 11614b4a2d

View File

@@ -104,25 +104,25 @@ void Jacobi::exchangeHaloLayersNodeMPIProcSecond(Matrix &phi)
// communication with second rank on same node via shared memory
// We write our send row to shared memory row 0
while (states->shmStates[0] == SharedmemState::Unread)
while (states->shmStates[1] == SharedmemState::Unread)
{
MPI_Win_sync(win_);
}
for (int j = 0; j < sendSize; ++j)
shm0[j] = phi(1, j);
states->shmStates[0] = SharedmemState::Unread;
shm1[j] = phi(1, j);
states->shmStates[1] = SharedmemState::Unread;
MPI_Win_sync(win_); // ensure memory visibility
// Wait for second proc to write its row back to shared memory row 1
while (states->shmStates[1] == SharedmemState::Read)
while (states->shmStates[0] == SharedmemState::Read)
{
MPI_Win_sync(win_);
}
for (int j = 0; j < sendSize; ++j)
phi(0, j) = shm1[j]; // halo from second proc
states->shmStates[1] = SharedmemState::Read;
phi(0, j) = shm0[j]; // halo from second proc
states->shmStates[0] = SharedmemState::Read;
MPI_Win_sync(win_);
}
@@ -157,7 +157,7 @@ void Jacobi::exchangeHaloLayersNodeMPIProcFirst(Matrix &phi)
// communication with second rank on same node via shared memory
// We write our send row to shared memory row 0
while (states->shmStates[1] == SharedmemState::Unread)
while (states->shmStates[0] == SharedmemState::Unread)
{
MPI_Win_sync(win_);
}
@@ -167,14 +167,13 @@ void Jacobi::exchangeHaloLayersNodeMPIProcFirst(Matrix &phi)
}
for (int j = 0; j < sendSize; ++j)
shm1[j] = phi(n - 2, j); // our last inner row
states->shmStates[1] = SharedmemState::Unread;
shm0[j] = phi(n - 2, j); // our last inner row
states->shmStates[0] = SharedmemState::Unread;
MPI_Win_sync(win_); // ensure memory visibility
// Wait for first proc to write its row back to shared memory row 0
while (states->shmStates[0] == SharedmemState::Read)
while (states->shmStates[1] == SharedmemState::Read)
{
MPI_Win_sync(win_);
}
if (rank_ == (numProc_ - 2))
@@ -182,12 +181,12 @@ void Jacobi::exchangeHaloLayersNodeMPIProcFirst(Matrix &phi)
std::cout << "t2" << std::endl;
}
for (int j = 0; j < sendSize; ++j)
phi(n - 1, j) = shm0[j]; // halo from first proc
phi(n - 1, j) = shm1[j]; // halo from second proc
if (rank_ == (numProc_ - 2))
{
std::cout << "t3" << std::endl;
}
states->shmStates[0] = SharedmemState::Read;
states->shmStates[1] = SharedmemState::Read;
MPI_Win_sync(win_);
}