From 01b2fdd2050f2e6b8a7f8b8b65bd89f78ad8163d Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Wed, 30 Apr 2025 11:39:36 -0400 Subject: [PATCH 1/3] feat(pybind11): added infra to compile with pybind11 --- src/composition/py/meson.build | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/composition/py/meson.build diff --git a/src/composition/py/meson.build b/src/composition/py/meson.build new file mode 100644 index 0000000..e69de29 From a27b9da464cbc99eaef115f0ed191ec6b1f678c6 Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Wed, 30 Apr 2025 11:41:10 -0400 Subject: [PATCH 2/3] feat(python-composition): added composition module interface --- assets/static/atomic/include/atomicSpecies.h | 4 +--- build-config/meson.build | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/assets/static/atomic/include/atomicSpecies.h b/assets/static/atomic/include/atomicSpecies.h index 64c6596..be265b3 100644 --- a/assets/static/atomic/include/atomicSpecies.h +++ b/assets/static/atomic/include/atomicSpecies.h @@ -1,5 +1,4 @@ -#ifndef SPECIES_MASS_DATA_H -#define SPECIES_MASS_DATA_H +#pragma once #include #include #include @@ -7205,4 +7204,3 @@ namespace chemSpecies { {"Og-295", Og_295}, }; }; // namespace chemSpecies -#endif // SPECIES_MASS_DATA_H diff --git a/build-config/meson.build b/build-config/meson.build index f7f6466..be2adc5 100644 --- a/build-config/meson.build +++ b/build-config/meson.build @@ -5,3 +5,17 @@ subdir('yaml-cpp') subdir('quill') subdir('boost') subdir('opatIO') +subdir('pybind') + +# Set the config file error handling options +configErr = get_option('config_error_handling') + +# build up any -D flags we need +commonCppArgs = [] +if configErr == 'warn' + commonCppArgs += ['-DCONFIG_WARN'] +elif configErr == 'harsh' + commonCppArgs += ['-DCONFIG_HARSH'] +endif + +add_project_arguments(commonCppArgs, language: 'cpp') \ No newline at end of file From 36f241368385714513d338be5997f437d7d41970 Mon Sep 17 00:00:00 2001 From: Emily Boudreaux Date: Wed, 30 Apr 2025 11:41:52 -0400 Subject: [PATCH 3/3] fix(composition): removed old py structure --- src/composition/meson.build | 3 +-- src/composition/public/composition.h | 1 - src/composition/py/meson.build | 0 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 src/composition/py/meson.build diff --git a/src/composition/meson.build b/src/composition/meson.build index 8b297b4..fe928d8 100644 --- a/src/composition/meson.build +++ b/src/composition/meson.build @@ -9,13 +9,12 @@ composition_headers = files( dependencies = [ probe_dep, - config_dep, quill_dep, species_weight_dep ] # Define the libcomposition library so it can be linked against by other parts of the build system -libcomposition = static_library('composition', +libcomposition = library('composition', composition_sources, include_directories: include_directories('public'), cpp_args: ['-fvisibility=default'], diff --git a/src/composition/public/composition.h b/src/composition/public/composition.h index 30c61fc..94e644b 100644 --- a/src/composition/public/composition.h +++ b/src/composition/public/composition.h @@ -190,7 +190,6 @@ namespace composition{ */ class Composition { private: - Config& m_config = Config::getInstance(); Probe::LogManager& m_logManager = Probe::LogManager::getInstance(); quill::Logger* m_logger = m_logManager.getLogger("log"); diff --git a/src/composition/py/meson.build b/src/composition/py/meson.build deleted file mode 100644 index e69de29..0000000