making nosv also with lpf and mpi (even if they don't work now)

Author: noabauma

examples/jacobi3d/meson.build

@@ -1,50 +1,49 @@
 testSuite = [ 'examples', 'jacobi3d' ]
 
-# Handling distributed engine options
 if distributedEngine == 'mpi'
 	TaskRDistributedCppFlag = '-D_TASKR_DISTRIBUTED_ENGINE_MPI'
+
 	mpirunExecutable = HiCRProject.get_variable('mpirunExecutable')
-elif distributedEngine == 'lpf'
-	TaskRDistributedCppFlag = '-D_TASKR_DISTRIBUTED_ENGINE_LPF'
-	lpfrunExecutable = HiCRProject.get_variable('lpfrunExecutable')
-elif distributedEngine == 'none'
-	TaskRDistributedCppFlag = '-D_TASKR_DISTRIBUTED_ENGINE_NONE'
-endif
 
-if distributedEngine == 'mpi'
 	if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('processingUnitType')
 		threading = executable('threading', [ 'source/pthreads.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
+		
 		if get_option('buildTests')
 			test('threading', mpirunExecutable, args : [ '-n', '2', '--oversubscribe', threading.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], suite: testSuite, workdir: threading.path() + '.p' )
 		endif
 	endif
 
-	# nOS-V backend with MPI not yet supported (we run without mpirun)
 	if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
 		nosv = executable('nosv', [ 'source/nosv.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
-
+		
 		if get_option('buildTests')
-			test('nosv', nosv, args : [ '-n', '64', '-i', '10' ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
+			test('nosv', mpirunExecutable, args : [ '-n', '2', '--oversubscribe', nosv.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
 		endif
 	endif
 
 elif distributedEngine == 'lpf'
+	TaskRDistributedCppFlag = '-D_TASKR_DISTRIBUTED_ENGINE_LPF'
+
+	lpfrunExecutable = HiCRProject.get_variable('lpfrunExecutable')
+
 	if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('processingUnitType')
 		threading = executable('threading', [ 'source/pthreads.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
+		
 		if get_option('buildTests')
-			test('threading', lpfrunExecutable, args : [ '-n', '2', threading.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], suite: testSuite, workdir: threading.path() + '.p' )
+			test('threading', lpfrunExecutable, args : [ '-n', '2', '-engine', 'zero', threading.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], suite: testSuite, workdir: threading.path() + '.p' )
 		endif
 	endif
 
-	# nOS-V backend with LPF not yet supported (we run without lpfrun)
-	# if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
-	# 	nosv = executable('nosv', [ 'source/nosv.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
+	if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
+		nosv = executable('nosv', [ 'source/nosv.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
+
+		if get_option('buildTests')
+			test('nosv', lpfrunExecutable, args : [ '-n', '2', '-engine', 'zero', nosv.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
+		endif
+	endif
+elif distributedEngine == 'none' # Atm these are segfaulting (TODO fix!)
+	TaskRDistributedCppFlag = '-D_TASKR_DISTRIBUTED_ENGINE_NONE'
 
-	# 	if get_option('buildTests')
-	# 		test('nosv', nosv, args : [ '-n', '64', '-i', '10' ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
-	# 	endif
-	# endif
-elif distributedEngine == 'none' # Atm these segfault
 	if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('processingUnitType')
 		threading = executable('threading', [ 'source/pthreads.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
 

examples/jacobi3d/source/nosv.cpp

@@ -26,6 +26,15 @@
 #include <hicr/backends/nosv/common.hpp>
 #include <hicr/backends/nosv/computeManager.hpp>
 
+#ifdef _TASKR_DISTRIBUTED_ENGINE_LPF
+  #include <lpf/core.h>
+  #include <lpf/mpi.h>
+  #include <mpi.h>
+  #include <hicr/backends/lpf/communicationManager.hpp>
+  #include <hicr/backends/mpi/instanceManager.hpp>
+  #include <hicr/backends/lpf/memoryManager.hpp>
+#endif
+
 #ifdef _TASKR_DISTRIBUTED_ENGINE_MPI
   #include <hicr/backends/mpi/communicationManager.hpp>
   #include <hicr/backends/mpi/instanceManager.hpp>
@@ -42,6 +51,7 @@
 #include "task.hpp"
 #include "jacobi3d.hpp"
 
+
 // Setting default values (globali)
 size_t  gDepth = 1;
 size_t  N      = 128;
@@ -115,6 +125,55 @@ void jacobiDriver(HiCR::InstanceManager *instanceManager, HiCR::CommunicationMan
   instanceManager->finalize();
 }
 
+
+#ifdef _TASKR_DISTRIBUTED_ENGINE_LPF
+
+// flag needed when using MPI to launch
+const int LPF_MPI_AUTO_INITIALIZE = 0;
+
+  /**
+ * #DEFAULT_MEMSLOTS The memory slots used by LPF
+ * in lpf_resize_memory_register . This value is currently
+ * guessed as sufficiently large for a program
+ */
+  #define DEFAULT_MEMSLOTS 100
+
+  /**
+ * #DEFAULT_MSGSLOTS The message slots used by LPF
+ * in lpf_resize_message_queue . This value is currently
+ * guessed as sufficiently large for a program
+ */
+  #define DEFAULT_MSGSLOTS 100
+
+// Global pointer to the
+HiCR::InstanceManager *instanceManager;
+
+void spmd(lpf_t lpf, lpf_pid_t pid, lpf_pid_t nprocs, lpf_args_t args)
+{
+  // Initializing LPF
+  CHECK(lpf_resize_message_queue(lpf, DEFAULT_MSGSLOTS));
+  CHECK(lpf_resize_memory_register(lpf, DEFAULT_MEMSLOTS));
+  CHECK(lpf_sync(lpf, LPF_SYNC_DEFAULT));
+
+  // Creating HWloc topology object
+  hwloc_topology_t topology;
+
+  // Reserving memory for hwloc
+  hwloc_topology_init(&topology);
+
+  // Initializing host (CPU) topology manager
+  HiCR::backend::hwloc::TopologyManager tm(&topology);
+
+  // Creating memory and communication managers
+  std::unique_ptr<HiCR::CommunicationManager> communicationManager = std::make_unique<HiCR::backend::lpf::CommunicationManager>(nprocs, pid, lpf);
+  std::unique_ptr<HiCR::MemoryManager> memoryManager = std::make_unique<HiCR::backend::lpf::MemoryManager>(lpf);
+
+  // Running the remote memcpy example
+  jacobiDriver(instanceManager, communicationManager.get(), memoryManager.get());
+}
+#endif
+
+
 int main(int argc, char *argv[])
 {
   // Initialize nosv
@@ -142,7 +201,16 @@ int main(int argc, char *argv[])
   }
 
 #ifdef _TASKR_DISTRIBUTED_ENGINE_LPF
-  #error "LPF backend not supported yet for nOS-V backend"
+  // Initializing instance manager
+  auto im         = HiCR::backend::mpi::InstanceManager::createDefault(&argc, &argv);
+  instanceManager = im.get();
+
+  lpf_init_t init;
+  lpf_args_t args;
+
+  CHECK(lpf_mpi_initialize_with_mpicomm(MPI_COMM_WORLD, &init));
+  CHECK(lpf_hook(init, &spmd, args));
+  CHECK(lpf_mpi_finalize(init));
 #endif
 
 #ifdef _TASKR_DISTRIBUTED_ENGINE_MPI

examples/jacobi3d/source/pthreads.cpp

@@ -29,7 +29,7 @@
   #include <lpf/mpi.h>
   #include <mpi.h>
   #include <hicr/backends/lpf/communicationManager.hpp>
-  #include <hicr/backends/hwloc/instanceManager.hpp>
+  #include <hicr/backends/mpi/instanceManager.hpp>
   #include <hicr/backends/lpf/memoryManager.hpp>
 #endif
 
@@ -49,53 +49,6 @@
 #include "task.hpp"
 #include "jacobi3d.hpp"
 
-#ifdef _TASKR_DISTRIBUTED_ENGINE_LPF
-
-// flag needed when using MPI to launch
-const int LPF_MPI_AUTO_INITIALIZE = 0;
-
-  /**
- * #DEFAULT_MEMSLOTS The memory slots used by LPF
- * in lpf_resize_memory_register . This value is currently
- * guessed as sufficiently large for a program
- */
-  #define DEFAULT_MEMSLOTS 100
-
-  /**
- * #DEFAULT_MSGSLOTS The message slots used by LPF
- * in lpf_resize_message_queue . This value is currently
- * guessed as sufficiently large for a program
- */
-  #define DEFAULT_MSGSLOTS 100
-
-// Global pointer to the
-HiCR::InstanceManager *instanceManager;
-
-void spmd(lpf_t lpf, lpf_pid_t pid, lpf_pid_t nprocs, lpf_args_t args)
-{
-  // Initializing LPF
-  CHECK(lpf_resize_message_queue(lpf, DEFAULT_MSGSLOTS));
-  CHECK(lpf_resize_memory_register(lpf, DEFAULT_MEMSLOTS));
-  CHECK(lpf_sync(lpf, LPF_SYNC_DEFAULT));
-
-  // Creating HWloc topology object
-  hwloc_topology_t topology;
-
-  // Reserving memory for hwloc
-  hwloc_topology_init(&topology);
-
-  // Initializing host (CPU) topology manager
-  HiCR::backend::hwloc::TopologyManager tm(&topology);
-
-  // Creating memory and communication managers
-  HiCR::backend::lpf::MemoryManager        mm(lpf);
-  HiCR::backend::lpf::CommunicationManager cc(nprocs, pid, lpf);
-
-  // Running the remote memcpy example
-  jaccobiDriver(instanceManager, &mm, &cc);
-}
-#endif
-
 // Setting default values (globali)
 size_t  gDepth = 1;
 size_t  N      = 128;
@@ -168,10 +121,56 @@ void jacobiDriver(HiCR::InstanceManager *instanceManager, HiCR::CommunicationMan
   // running the Jacobi3D example
   jacobi3d(instanceManager, taskr, g.get(), gDepth, N, nIters, pt, lt);
 
-  // Finalizing instances
-  instanceManager->finalize();
+  
 }
 
+#ifdef _TASKR_DISTRIBUTED_ENGINE_LPF
+
+// flag needed when using MPI to launch
+const int LPF_MPI_AUTO_INITIALIZE = 0;
+
+  /**
+ * #DEFAULT_MEMSLOTS The memory slots used by LPF
+ * in lpf_resize_memory_register . This value is currently
+ * guessed as sufficiently large for a program
+ */
+  #define DEFAULT_MEMSLOTS 100
+
+  /**
+ * #DEFAULT_MSGSLOTS The message slots used by LPF
+ * in lpf_resize_message_queue . This value is currently
+ * guessed as sufficiently large for a program
+ */
+  #define DEFAULT_MSGSLOTS 100
+
+// Global pointer to the
+HiCR::InstanceManager *instanceManager;
+
+void spmd(lpf_t lpf, lpf_pid_t pid, lpf_pid_t nprocs, lpf_args_t args)
+{
+  // Initializing LPF
+  CHECK(lpf_resize_message_queue(lpf, DEFAULT_MSGSLOTS));
+  CHECK(lpf_resize_memory_register(lpf, DEFAULT_MEMSLOTS));
+  CHECK(lpf_sync(lpf, LPF_SYNC_DEFAULT));
+
+  // Creating HWloc topology object
+  hwloc_topology_t topology;
+
+  // Reserving memory for hwloc
+  hwloc_topology_init(&topology);
+
+  // Initializing host (CPU) topology manager
+  HiCR::backend::hwloc::TopologyManager tm(&topology);
+
+  // Creating memory and communication managers
+  std::unique_ptr<HiCR::CommunicationManager> communicationManager = std::make_unique<HiCR::backend::lpf::CommunicationManager>(nprocs, pid, lpf);
+  std::unique_ptr<HiCR::MemoryManager> memoryManager = std::make_unique<HiCR::backend::lpf::MemoryManager>(lpf);
+
+  // Running the remote memcpy example
+  jacobiDriver(instanceManager, communicationManager.get(), memoryManager.get());
+}
+#endif
+
 int main(int argc, char *argv[])
 {
   //// Instantiating distributed execution machinery
@@ -219,4 +218,7 @@ int main(int argc, char *argv[])
   // Running the remote memcpy example
   jacobiDriver(instanceManager.get(), communicationManager.get(), &memoryManager.get());
 #endif
+
+  // Finalizing instances
+  instanceManager->finalize();
 }