Decouple Core lib and Python

environment.yml

@@ -2,7 +2,7 @@ name: pyorbit
 channels:
   - conda-forge
 dependencies:
-  - python=3.10
+  - python>=3.11
   - fftw
   - numpy
   - scipy

meson.build

@@ -10,4 +10,6 @@ project('PyORBIT',
 )
 
 subdir('src')
-subdir('py/orbit')
+if get_option('BUILD_PYTHON')
+  subdir('py/orbit')
+endif

meson_options.txt

@@ -1 +1,2 @@
 option('USE_MPI', type: 'string', value: 'auto', description: 'Choose MPI implementation (mpich, openmpi, none, auto)')
+option('BUILD_PYTHON', type: 'boolean', value: true, description: 'Build and install Python bindings')

pyproject.toml

@@ -6,7 +6,7 @@ requires = ['meson-python', "setuptools>=45", "wheel", "setuptools_scm"]
 name = 'PyORBIT'
 dynamic = ["version"]
 description = 'Use meson-python to build c++ anf python modules.'
-requires-python = '>=3.9'
+requires-python = '>=3.11'
 #dependencies = [
 #'setuptools',
 #'setuptools-scm'

src/core/aperture_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_aperture.hh"
+#include "orbit/Apertures/wrap_aperture.hh"
 PyMODINIT_FUNC PyInit_aperture(void) {
     return wrap_aperture::initaperture();
 }

src/core/bunch_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_bunch.hh"
+#include "orbit/wrap_bunch.hh"
 PyMODINIT_FUNC PyInit_bunch(void) {
     return wrap_orbit_bunch::initbunch();
 }

src/core/collimator_init.cc

@@ -1,4 +1,4 @@
-# include "wrap_collimator.hh"
+# include "orbit/MaterialInteractions/wrap_collimator.hh"
 PyMODINIT_FUNC PyInit_collimator(void) {
     return wrap_collimator::initcollimator();
 }

src/core/error_base_init.cc

@@ -1,5 +1,5 @@
 #include <Python.h>
-# include "wrap_errorbase.hh"
+# include "orbit/Errors/wrap_errorbase.hh"
 PyMODINIT_FUNC PyInit_error_base(void) {
     return wrap_errorbase::initerrorbase();
 }

src/core/field_sources_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_field_sources_module.hh"
+#include "utils/field_sources/wrap_field_sources_module.hh"
 PyMODINIT_FUNC PyInit_field_sources(void) {
     return wrap_field_sources_module::initFieldSourcesModule();
 }

src/core/fieldtracker_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_fieldtracker.hh"
+#include "orbit/FieldTracker/wrap_fieldtracker.hh"
 PyMODINIT_FUNC PyInit_fieldtracker(void) {
     return wrap_fieldtracker::initfieldtracker();
 }

src/core/foil_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_foil.hh"
+#include "orbit/MaterialInteractions/wrap_foil.hh"
 PyMODINIT_FUNC PyInit_foil(void) {
     return wrap_foil::initfoil();
 }

src/core/impedances_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_impedances.hh"
+#include "orbit/Impedances/wrap_impedances.hh"
 PyMODINIT_FUNC PyInit_impedances(void) {
     return wrap_impedances::initimpedances();
 }

src/core/linac_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_linacmodule.hh"
+#include "linac/wrap_linacmodule.hh"
 PyMODINIT_FUNC PyInit_linac(void) {
     return wrap_linac::initlinac();
 }

src/core/mpi_init.cc

@@ -1,6 +1,6 @@
-#include "Python.h"
-#include "wrap_orbit_mpi.hh"
+#include <Python.h>
+#include "mpi/wrap_orbit_mpi.hh"
 
 PyMODINIT_FUNC PyInit_orbit_mpi(void) {
     return wrap_orbit_mpi::initorbit_mpi();
-}
+}

src/core/rfcavities_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_rfcavities.hh"
+#include "orbit/RFCavities/wrap_rfcavities.hh"
 PyMODINIT_FUNC PyInit_rfcavities(void) {
     return wrap_rfcavities::initrfcavities();
 }

src/core/spacecharge_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_spacecharge.hh"
+#include "spacecharge/wrap_spacecharge.hh"
 PyMODINIT_FUNC PyInit_spacecharge(void) {
     return initspacecharge();
 }

src/core/teapot_base_init.cc

@@ -1,7 +1,7 @@
 #include <Python.h>
-#include "wrap_orbit_mpi.hh"
-#include "wrap_teapotbase.hh"
-#include "wrap_errorbase.hh"
+#include "mpi/wrap_orbit_mpi.hh"
+#include "teapot/wrap_teapotbase.hh"
+#include "orbit/Errors/wrap_errorbase.hh"
 
 PyMODINIT_FUNC PyInit_teapot_base(void) {
     return wrap_teapotbase::initteapotbase();

src/core/trackerrk4_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_trackerrk4.hh"
+#include "trackerrk4/wrap_trackerrk4.hh"
 PyMODINIT_FUNC PyInit_trackerrk4(void) {
     return inittrackerrk4();
 }

src/core/type_accessors.cc

@@ -0,0 +1,68 @@
+#include <Python.h>
+
+#include "orbit/wrap_bunch.hh"
+#include "spacecharge/wrap_spacecharge.hh"
+#include "mpi/wrap_mpi_comm.hh"
+#include "utils/wrap_utils.hh"
+#include "trackerrk4/wrap_trackerrk4.hh"
+
+extern "C" {
+
+namespace {
+
+PyObject* getModuleAttribute(const char* module_name, const char* name){
+    PyObject* module = PyImport_ImportModule(module_name);
+    if(module == NULL){
+        return NULL;
+    }
+    PyObject* attribute = PyDict_GetItemString(PyModule_GetDict(module), name);
+    Py_DECREF(module);
+    if(attribute == NULL){
+        PyErr_Format(PyExc_AttributeError, "module '%s' has no attribute '%s'", module_name, name);
+    }
+    return attribute;
+}
+
+}
+
+namespace wrap_orbit_bunch {
+
+PyObject* getBunchType(const char* name){
+    return getModuleAttribute("orbit.core.bunch", name);
+}
+
+}
+
+PyObject* getSpaceChargeType(const char* name){
+    return getModuleAttribute("orbit.core.spacecharge", name);
+}
+
+namespace wrap_orbit_mpi_comm {
+
+PyObject* getMPI_CommType(const char* name){
+    PyObject* mpi_comm_module = getModuleAttribute("orbit.core.orbit_mpi", "mpi_comm");
+    if(mpi_comm_module == NULL){
+        return NULL;
+    }
+    PyObject* type = PyDict_GetItemString(PyModule_GetDict(mpi_comm_module), name);
+    if(type == NULL){
+        PyErr_Format(PyExc_AttributeError, "module 'mpi_comm' has no attribute '%s'", name);
+    }
+    return type;
+}
+
+}
+
+namespace wrap_orbit_utils {
+
+PyObject* getOrbitUtilsType(const char* name){
+    return getModuleAttribute("orbit.core.orbit_utils", name);
+}
+
+}
+
+PyObject* getTrackerRK4Type(const char* name){
+    return getModuleAttribute("orbit.core.trackerrk4", name);
+}
+
+}

src/core/utils_init.cc

@@ -1,4 +1,4 @@
-#include "wrap_utils.hh"
+#include "utils/wrap_utils.hh"
 PyMODINIT_FUNC PyInit_orbit_utils(void) {
     return wrap_orbit_utils::initutils();
 }

src/linac/rfgap/BaseRfGap.cc

@@ -8,20 +8,20 @@ A. Shishlo, J. Holmes,
 ORNL Tech. Note ORNL/TM-2015/247, June 2015
 */
 
-#include "BaseRfGap.hh"
-#include "ParticleMacroSize.hh"
+#include "linac/rfgap/BaseRfGap.hh"
+#include "orbit/ParticlesAttributes/ParticleMacroSize.hh"
 
 #include <iostream>
 #include <cmath>
 
-#include "Bunch.hh"
-#include "bessel.hh"
-#include "OrbitConst.hh"
+#include "orbit/Bunch.hh"
+#include "utils/bessel.hh"
+#include "orbit/OrbitConst.hh"
 
 using namespace OrbitUtils;
 
 // Constructor
-BaseRfGap::BaseRfGap(): CppPyWrapper(NULL)
+BaseRfGap::BaseRfGap()
 {
 }
 

src/linac/rfgap/BaseRfGap.hh

@@ -5,25 +5,22 @@
 #define BASE_RF_GAP_H
 
 //MPI Function Wrappers
-#include "orbit_mpi.hh"
-#include "wrap_mpi_comm.hh"
+#include "mpi/orbit_mpi.hh"
 
 #include <cstdlib>
 #include <cmath>
 
 //ORBIT bunch
-#include "Bunch.hh"
+#include "orbit/Bunch.hh"
 
 //pyORBIT utils
-#include "CppPyWrapper.hh"
 
-using namespace std;
 
 /**
   This class represents a 2D rectangular grid.
 */
 
-class BaseRfGap: public OrbitUtils::CppPyWrapper
+class BaseRfGap
 {
 public:
 

src/linac/rfgap/BaseRfGap_slow.cc

@@ -15,20 +15,20 @@ so the name of the class has the word slow in the name.
 
 */
 
-#include "BaseRfGap_slow.hh"
-#include "ParticleMacroSize.hh"
+#include "linac/rfgap/BaseRfGap_slow.hh"
+#include "orbit/ParticlesAttributes/ParticleMacroSize.hh"
 
 #include <iostream>
 #include <cmath>
 
-#include "Bunch.hh"
-#include "bessel.hh"
-#include "OrbitConst.hh"
+#include "orbit/Bunch.hh"
+#include "utils/bessel.hh"
+#include "orbit/OrbitConst.hh"
 
 using namespace OrbitUtils;
 
 // Constructor
-BaseRfGap_slow::BaseRfGap_slow(): CppPyWrapper(NULL)
+BaseRfGap_slow::BaseRfGap_slow()
 {
 }
 

src/linac/rfgap/BaseRfGap_slow.hh

@@ -9,25 +9,22 @@
 #define BASE_RF_GAP_SLOW_H
 
 //MPI Function Wrappers
-#include "orbit_mpi.hh"
-#include "wrap_mpi_comm.hh"
+#include "mpi/orbit_mpi.hh"
 
 #include <cstdlib>
 #include <cmath>
 
 //ORBIT bunch
-#include "Bunch.hh"
+#include "orbit/Bunch.hh"
 
 //pyORBIT utils
-#include "CppPyWrapper.hh"
 
-using namespace std;
 
 /**
   This class represents a 2D rectangular grid.
 */
 
-class BaseRfGap_slow: public OrbitUtils::CppPyWrapper
+class BaseRfGap_slow
 {
 public:
 

src/linac/rfgap/MatrixRfGap.cc

@@ -9,20 +9,20 @@ A. Shishlo, J. Holmes,
 ORNL Tech. Note ORNL/TM-2015/247, June 2015
 */
 
-#include "MatrixRfGap.hh"
-#include "ParticleMacroSize.hh"
+#include "linac/rfgap/MatrixRfGap.hh"
+#include "orbit/ParticlesAttributes/ParticleMacroSize.hh"
 
-#include "Bunch.hh"
-#include "bessel.hh"
-#include "OrbitConst.hh"
+#include "orbit/Bunch.hh"
+#include "utils/bessel.hh"
+#include "orbit/OrbitConst.hh"
 
 #include <iostream>
 #include <cmath>
 
 using namespace OrbitUtils;
 
 // Constructor
-MatrixRfGap::MatrixRfGap(): CppPyWrapper(NULL)
+MatrixRfGap::MatrixRfGap()
 {
 }
 

src/linac/rfgap/MatrixRfGap.hh

@@ -8,25 +8,22 @@ For this RF gap we know the E0TL, frequency, and phase only.
 #define MATRIX_RF_GAP_H
 
 //MPI Function Wrappers
-#include "orbit_mpi.hh"
-#include "wrap_mpi_comm.hh"
+#include "mpi/orbit_mpi.hh"
 
 #include <cstdlib>
 #include <cmath>
 
 //ORBIT bunch
-#include "Bunch.hh"
+#include "orbit/Bunch.hh"
 
 //pyORBIT utils
-#include "CppPyWrapper.hh"
 
-using namespace std;
 
 /**
   This class represents a RF gap as transport matrix. No nonlinear effects.
 */
 
-class MatrixRfGap: public OrbitUtils::CppPyWrapper
+class MatrixRfGap
 {
 public: