Add cleanup to core and ensure that the cleanup happens in runSofa

Author: bakpaul

Plugin/src/SofaPython3/DataHelper.cpp

@@ -249,10 +249,17 @@ py::slice toSlice(const py::object& o)
 
 std::map<void*, std::pair<int, py::array>>& getObjectCache()
 {
-    static std::map<void*, std::pair<int, py::array>> s_objectcache {} ;
+    static std::map<void*, std::pair<int, py::array>>  s_objectcache{};
     return s_objectcache;
 }
 
+
+void clearCache()
+{
+    msg_info("SofaPython3") << "Clearing Sofa.Core cache...";
+    getObjectCache().clear();
+}
+
 void trimCache()
 {
     auto& memcache = getObjectCache();

Plugin/src/SofaPython3/DataHelper.h

@@ -194,6 +194,7 @@ SOFAPYTHON3_API std::string getPathTo(Base* b);
 SOFAPYTHON3_API const char* getFormat(const AbstractTypeInfo& nfo);
 
 SOFAPYTHON3_API std::map<void*, std::pair<int, pybind11::array>>& getObjectCache();
+SOFAPYTHON3_API void clearCache();
 SOFAPYTHON3_API void trimCache();
 
 SOFAPYTHON3_API bool hasArrayFor(BaseData* d);

Plugin/src/SofaPython3/PythonEnvironment.cpp

@@ -480,6 +480,12 @@ void PythonEnvironment::addPluginManagerCallback()
             }
         }
     );
+    PluginManager::getInstance().addOnPluginCleanupCallbacks(pluginLibraryPath,
+        []()
+        {
+            PythonEnvironment::Release();
+        }
+    );
 }
 
 void PythonEnvironment::removePluginManagerCallback()

Plugin/src/SofaPython3/PythonEnvironment.h

@@ -23,6 +23,7 @@
 #include <vector>
 #include <string>
 #include <sofa/helper/logging/FileInfo.h>
+#include <SofaPython3/DataHelper.h>
 
 /// Fixes compile errors:
 /// removing all slots macros is necessary if embedded in a Qt project

bindings/Sofa/src/SofaPython3/Sofa/Core/Submodule_Core.cpp

@@ -137,10 +137,13 @@ PYBIND11_MODULE(Core, core)
     auto atexit = py::module_::import("atexit");
     atexit.attr("register")(py::cpp_function([]() {
 
+        clearCache();
+
         sofa::core::cleanup();
 
         msg_info("SofaPython3.Core") << "Sofa.Core unload()";
     }));
+
 }
 
 } ///namespace sofapython3