Merge pull request #953 from PhilipDeegan/pybindwerror

minimized deps for cpp_etc / etc

Author: nicolasaunai

src/initializer/python_data_provider.hpp

@@ -6,18 +6,8 @@
 
 #include "initializer/data_provider.hpp"
 
-#include "core/def/pragma_disable.hpp"
-
-// clang-format off
-DISABLE_WARNING(shadow, shadow-field-in-constructor-modified, 42)
-
-#undef HAVE_SYS_TIMES_H // included in python again, possibly with different value
-#undef HAVE_UNISTD_H
-
 #include <pybind11/embed.h> // everything needed for embedding
 #include <pybind11/functional.h>
-ENABLE_WARNING(shadow, shadow-field-in-constructor-modified, 42)
-// clang-format on
 
 namespace py = pybind11;
 

src/python3/CMakeLists.txt

@@ -27,8 +27,8 @@ endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
 
 
 pybind11_add_module(cpp_etc cpp_etc.cpp)
-target_link_libraries(cpp_etc PUBLIC phare_simulator)
 target_compile_options(cpp_etc PRIVATE ${PHARE_WERROR_FLAGS} -DPHARE_HAS_HIGHFIVE=${PHARE_HAS_HIGHFIVE})
+target_link_libraries(cpp_etc PUBLIC phare_amr) # gives us samrai header includes
 set_target_properties(cpp_etc
     PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/pybindlibs"

src/python3/cpp_etc.cpp

@@ -1,9 +1,14 @@
 
+#include "core/def.hpp"
+#include "core/def/phare_config.hpp"
+
 #include "python3/pybind_def.hpp"
-#include "simulator/simulator.hpp"
 
-#include "core/def/phare_config.hpp"
+#include "hdf5/phare_hdf5.hpp"
 
+#if PHARE_HAS_HIGHFIVE
+#include "hdf5/detail/h5/h5_file.hpp"
+#endif
 
 #include "amr/wrappers/hierarchy.hpp" // for HierarchyRestarter::getRestartFileFullPath
 

src/python3/pybind_def.hpp

@@ -10,8 +10,7 @@
 
 #include "pybind11/stl.h"
 #include "pybind11/numpy.h"
-#undef HAVE_SYS_TIMES_H // included in python again, possibly with different value
-#undef HAVE_UNISTD_H
+
 
 namespace PHARE::pydata
 {