minor more stuff

Author: Noah Baumann

examples/jacobi3d/source/nosv.cpp

@@ -108,25 +108,39 @@ void jacobiDriver(HiCR::InstanceManager *instanceManager, HiCR::CommunicationMan
 
   // Compute resources to use
   HiCR::Device::computeResourceList_t cr;
+  int size;
+  MPI_Comm_size( MPI_COMM_WORLD, &size);
 
-  // Adding it to the list
-  // auto itr      = computeResources.begin();
-  // for (size_t i = 0; i < 2ul; i++)
-  // {
-  //   // Getting up-casted pointer for the processing unit
-  //   auto c = dynamic_pointer_cast<HiCR::backend::hwloc::ComputeResource>(*itr);
-
-  //   // Checking whether the execution unit passed is compatible with this backend
-  //   if (c == nullptr) HICR_THROW_LOGIC("The passed compute resource is not supported by this processing unit type\n");
-
-  //   // Getting the logical processor ID of the compute resource
-  //   auto pid = c->getProcessorId();
-
-  //   printf("numaDomainId: %lu has PID: %u\n", numaDomainId, pid); fflush(stdout);
-  //   cr.push_back(*itr);
-  //   itr++;
-  // }
+  for(size_t i = 0; i < (size_t)(lt.x * lt.y * lt.z); i++)
+  {
+    cr.push_back(computeResources[(myInstanceId*size+i)%(computeResources.size())]);
+  }
 
+  // cr.push_back(numaDomains[0]->getComputeResourceList()[0]);
+  
+  for (int i = 0; i < size; ++i) {
+    if (myInstanceId == (size_t)i) {
+      auto itr      = cr.begin();
+      for (size_t i = 0; i < cr.size(); i++)
+      {
+        // Getting up-casted pointer for the processing unit
+        auto c = dynamic_pointer_cast<HiCR::backend::hwloc::ComputeResource>(*itr);
+
+        // Checking whether the execution unit passed is compatible with this backend
+        if (c == nullptr) HICR_THROW_LOGIC("The passed compute resource is not supported by this processing unit type\n");
+
+        // Getting the logical processor ID of the compute resource
+        auto pid = c->getProcessorId();
+
+        printf("%u ", pid); fflush(stdout);
+
+        itr++;
+        // cr.push_back(*itr);
+      }
+      printf("]\n"); fflush(stdout);
+    }
+    MPI_Barrier(MPI_COMM_WORLD);
+  }
   // printf("PUs Per NUMA Domain: %lu\n", computeResources.size());
 
   // Initializing nosv-based compute manager to run tasks in parallel

examples/jacobi3d/source/pthreads.cpp

@@ -56,6 +56,8 @@ ssize_t nIters = 100;
 D3      pt     = D3({.x = 1, .y = 1, .z = 1});
 D3      lt     = D3({.x = 1, .y = 1, .z = 1});
 
+std::mutex mpi_mutex;
+
 void jacobiDriver(HiCR::InstanceManager *instanceManager, HiCR::CommunicationManager *communicationManager, HiCR::MemoryManager *memoryManager)
 {
   // Creating (local host) topology manager
@@ -104,6 +106,8 @@ void jacobiDriver(HiCR::InstanceManager *instanceManager, HiCR::CommunicationMan
   {
     cr.push_back(computeResources[(myInstanceId*size+i)%(computeResources.size())]);
   }
+
+  // cr.push_back(numaDomains[0]->getComputeResourceList()[0]);
 
   for (int i = 0; i < size; ++i) {
     if (myInstanceId == (size_t)i) {
@@ -138,7 +142,7 @@ void jacobiDriver(HiCR::InstanceManager *instanceManager, HiCR::CommunicationMan
   // Creating taskr object
   nlohmann::json taskrConfig;
   taskrConfig["Remember Finished Objects"] = true;
-  taskr::Runtime taskr(&boostComputeManager, &pthreadsComputeManager, cr, taskrConfig);
+  taskr::Runtime taskr(&boostComputeManager, &pthreadsComputeManager, computeResources, taskrConfig);
 
   // Allowing tasks to immediately resume upon suspension -- they won't execute until their pending operation is finished
   taskr.setTaskCallbackHandler(HiCR::tasking::Task::callback_t::onTaskSuspend, [&taskr](taskr::Task *task) { taskr.resumeTask(task); });
@@ -154,8 +158,6 @@ void jacobiDriver(HiCR::InstanceManager *instanceManager, HiCR::CommunicationMan
 
   // running the Jacobi3D example
   jacobi3d(instanceManager, taskr, g.get(), gDepth, N, nIters, pt, lt);
-
-  
 }
 
 #ifdef _TASKR_DISTRIBUTED_ENGINE_LPF