Fixes 2

At0mn1yIvan · Nov 30, 2023 · 092aeec · 092aeec
1 parent 86b7310
commit 092aeec
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/tasks/task_2/khramov_i_star_topology/main.cpp b/tasks/task_2/khramov_i_star_topology/main.cpp
@@ -14,7 +14,7 @@ TEST(Star_Topology_MPI, Test_Send_Through_Master) {
     int receiver = world_size - 1;
     int data = 0;
 
-    if (world_rank == source)
+    if (world_rank == source || world_size == 1)
         data = 200;
 
     sendDataStar(MPI_COMM_WORLD, master, source, receiver, 0, &data, MPI_INT);
@@ -78,7 +78,7 @@ TEST(Star_Topology_MPI, Test_Send_To_Yourself) {
     int receiver = master;
     int data = 0;
 
-    if (world_rank == source)
+    if (world_rank == source || world_size == 1)
         data = 1000;
 
     sendDataStar(MPI_COMM_WORLD, master, source, receiver, 0, &data, MPI_INT);
@@ -99,7 +99,7 @@ TEST(Star_Topology_MPI, Test_For_One_Processor) {
     int receiver = 0;
     int data = 0;
 
-    if (world_rank == source)
+    if (world_rank == source || world_size == 1)
         data = 200;
 
     sendDataStar(MPI_COMM_WORLD, master, source, receiver, 0, &data, MPI_INT);
@@ -120,7 +120,7 @@ TEST(Star_Topology_MPI, Test_For_Two_Processors) {
     int receiver = 1;
     int data = 0;
 
-    if (world_rank == source)
+    if (world_rank == source || world_size == 1)
         data = 200;
 
     sendDataStar(MPI_COMM_WORLD, master, source, receiver, 0, &data, MPI_INT);

diff --git a/tasks/task_2/khramov_i_star_topology/star_topology.cpp b/tasks/task_2/khramov_i_star_topology/star_topology.cpp
@@ -16,6 +16,7 @@ void sendDataStar(
     MPI_Comm_size(world, &world_size);
     MPI_Comm_rank(world, &world_rank);
 
+
     if (!(source < world_size && receiver < world_size)) return;
     if (receiver - source == 0) return;
 
@@ -32,8 +33,12 @@ void sendDataStar(
             MPI_Send(data, 1, datatype, master, tag, world);
         }
     } else if (world_rank == master) {
-        MPI_Recv(data, 1, datatype, source, tag, world, MPI_STATUS_IGNORE);
-        MPI_Send(data, 1, datatype, receiver, tag, world);
+        if (master != receiver) {
+            MPI_Recv(data, 1, datatype, source, tag, world, MPI_STATUS_IGNORE);
+            MPI_Send(data, 1, datatype, receiver, tag, world);
+        } else {
+            MPI_Recv(data, 1, datatype, source, tag, world, MPI_STATUS_IGNORE);
+        }
     } else if (world_rank == receiver) {
         MPI_Recv(data, 1, datatype, master, tag, world, MPI_STATUS_IGNORE);
     }