Merge pull request #34 from EuropeanSpallationSource/orbit-mpi

Automated enabling of MPI support
PyORBIT-Collaboration · Dec 12, 2024 · ac20928 · ac20928
2 parents 54a6ab2 + 03f448f
commit ac20928
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 206 deletions.
diff --git a/py/orbit/core/__init__.py b/py/orbit/core/__init__.py
@@ -0,0 +1 @@
+from . import orbit_mpi
diff --git a/py/orbit/core/meson.build b/py/orbit/core/meson.build
@@ -0,0 +1,10 @@
+
+py_sources = files([
+	'__init__.py',
+])
+
+python.install_sources(
+    py_sources,
+    subdir: 'orbit/core',
+    # pure: true,
+)
diff --git a/py/orbit/meson.build b/py/orbit/meson.build
@@ -1,5 +1,6 @@
 
 subdir('bumps')
+subdir('core')
 subdir('matching')
 subdir('time_dep')
 subdir('bunch_utils')

diff --git a/src/libmain/libmain.cc b/src/libmain/libmain.cc
diff --git a/src/libmain/module_template/__init__.py b/src/libmain/module_template/__init__.py
diff --git a/src/libmain/orbit/__init__.py b/src/libmain/orbit/__init__.py
diff --git a/src/libmain/orbit/_module_loader.py b/src/libmain/orbit/_module_loader.py
diff --git a/src/libmain/orbit/pyORBIT.py b/src/libmain/orbit/pyORBIT.py
diff --git a/src/meson.build b/src/meson.build
@@ -14,6 +14,20 @@ dependencies = []
 
 dependencies += dependency('fftw3', version: '>= 3.0.0', required: true)
 
+# Detecting if MPICH or OPENMPI are installed and enabling support if present
+mpich_dependency = dependency('mpich', version: '>= 4.0.0', required: false)
+openmpi_dependency = dependency('ompi', version: '>= 5.0.0', required: false)
+
+if mpich_dependency.found()
+	cpp_args = ['-fPIC', '-std=c++11', '-DUSE_MPI=1']
+	dependencies += mpich_dependency
+elif openmpi_dependency.found()
+	cpp_args = ['-fPIC', '-std=c++11', '-DUSE_MPI=1']
+	dependencies += openmpi_dependency
+else
+	cpp_args = ['-fPIC', '-std=c++11']
+endif
+
 sources = files([
     'linac/wrap_linacmodule.cc',
 	'linac/tracking/linac_tracking.cc',
@@ -111,7 +125,6 @@ sources = files([
 	'trackerrk4/PyExternalEffects.cc',
 	'trackerrk4/RungeKuttaTracker.cc',
 	'trackerrk4/wrap_ext_effects_container.cc',
-	'libmain/libmain.cc',
 	'mpi/wrap_orbit_mpi.cc',
 	'mpi/wrap_mpi_comm.cc',
 	'mpi/orbit_mpi.cc',
@@ -208,7 +221,7 @@ sources = files([
 	'teapot/wrap_matrix_generator.cc',
 	'teapot/teapotbase.cc',
 	'teapot/MatrixGenerator.cc'
-]) 
+])
 inc = include_directories([
   python.get_variable('INCLUDEPY', ''),
     'main',
@@ -237,31 +250,26 @@ inc = include_directories([
 	'orbit/BunchDiagnostics',
 	'orbit',
 	'utils/integration',
-	'libmain',
 	'orbit/Apertures'
-    
+
 ])
 
 
 core_lib = library('core',
     sources: sources,
     include_directories: inc,
-    cpp_args: ['-fPIC', '-std=c++11'],
+    cpp_args: cpp_args,
     override_options: ['b_lundef=false'],
     dependencies: dependencies,
     install: true,
-
 )
 
 core_dep = declare_dependency(link_with : core_lib)
 
-
-
-
 python.extension_module('orbit_mpi',
       sources: [base + '/mpi_init.cc'],
       include_directories: inc,
-      cpp_args: ['-fPIC', '-std=c++11'],
+      cpp_args: cpp_args,
       dependencies: [core_dep],
       install: true,
       subdir: 'orbit/core',
@@ -393,9 +401,3 @@ python.extension_module('error_base',
     install: true,
    subdir: 'orbit/core',
 )
-
-
-
-
-
-
diff --git a/src/mpi/wrap_orbit_mpi.cc b/src/mpi/wrap_orbit_mpi.cc
@@ -178,7 +178,7 @@ namespace wrap_orbit_mpi{
 		};
 
 		PyMODINIT_FUNC initorbit_mpi(void) {
-					// Initialize MPI
+			// Initialize MPI
 			ORBIT_MPI_Init();
 
 			PyObject *m, *d;