Merge branch 'master' into pr-fix-callpoint-api

Author: damienmarchal

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04, macos-10.15, windows-2019]
         sofa_branch: [master]
-        python_version: ['3.9']
+        python_version: ['3.8']
 
     steps:
       - name: Setup SOFA and environment

Plugin/src/SofaPython3/DataHelper.h

@@ -221,9 +221,9 @@ void copyScalar(BaseData* a, const AbstractTypeInfo& nfo, pybind11::array_t<T, p
     void* ptr = a->beginEditVoidPtr();
 
     auto r = src.unchecked();
-    for (ssize_t i = 0; i < r.shape(0); i++)
+    for (pybind11::ssize_t i = 0; i < r.shape(0); i++)
     {
-        for (ssize_t j = 0; j < r.shape(1); j++)
+        for (pybind11::ssize_t j = 0; j < r.shape(1); j++)
         {
             nfo.setScalarValue( ptr, i*r.shape(1)+j, r(i,j) );
         }

Plugin/src/SofaPython3/PythonEnvironment.cpp

@@ -181,27 +181,26 @@ void PythonEnvironment::Init()
     }
 
     PyEval_InitThreads();
-    gil lock;
 
     // Required for sys.path, used in addPythonModulePath().
-    PyRun_SimpleString("import sys");
+    executePython([]{ PyRun_SimpleString("import sys");});
 
     // Force C locale.
-    PyRun_SimpleString("import locale");
-    PyRun_SimpleString("locale.setlocale(locale.LC_ALL, 'C')");
+    executePython([]{ PyRun_SimpleString("import locale");});
+    executePython([]{ PyRun_SimpleString("locale.setlocale(locale.LC_ALL, 'C')");});
 
     // Workaround: try to import numpy and to launch numpy.finfo to cache data;
     // this prevents a deadlock when calling numpy.finfo from a worker thread.
-    PyRun_SimpleString("try:\n\timport numpy;numpy.finfo(float)\nexcept:\n\tpass");
+    executePython([]{ PyRun_SimpleString("try:\n\timport numpy;numpy.finfo(float)\nexcept:\n\tpass");});
 
     // Workaround: try to import scipy from the main thread this prevents a deadlock when importing
     // scipy from a worker thread when we use the SofaScene asynchronous loading
-    PyRun_SimpleString("try:\n\tfrom scipy import misc, optimize\nexcept:\n\tpass\n");
+    executePython([]{ PyRun_SimpleString("try:\n\tfrom scipy import misc, optimize\nexcept:\n\tpass\n");});
 
     // If the script directory is not available (e.g. if the interpreter is invoked interactively
     // or if the script is read from standard input), path[0] is the empty string,
     // which directs Python to search modules in the current directory first.
-    PyRun_SimpleString(std::string("sys.path.insert(0,\"\")").c_str());
+    executePython([]{ PyRun_SimpleString(std::string("sys.path.insert(0,\"\")").c_str());});
 
     // Add the paths to the plugins' python modules to sys.path.  Those paths
     // are read from all the files in 'etc/sofa/python.d'
@@ -238,12 +237,12 @@ void PythonEnvironment::Init()
     // Lastly, we (try to) add modules from the root of SOFA
     addPythonModulePathsFromDirectory( Utils::getSofaPathPrefix() );
 
-    getStaticData()->m_sofaModule = py::module::import("Sofa");
-    getStaticData()->m_sofaRuntimeModule = py::module::import("SofaRuntime");
-    PyRun_SimpleString("import SofaRuntime");
+    executePython([]{ getStaticData()->m_sofamodule = py::module::import("Sofa"); });
+    executePython([]{ getStaticData()->m_sofaRuntimeModule = py::module::import("SofaRuntime"); });
+    executePython([]{ PyRun_SimpleString("import SofaRuntime");});
 
     // python livecoding related
-    PyRun_SimpleString("from Sofa.livecoding import onReimpAFile");
+    executePython([]{ PyRun_SimpleString("from Sofa.livecoding import onReimpAFile");});
 
     // general sofa-python stuff
 
@@ -313,16 +312,14 @@ void PythonEnvironment::Release()
 void PythonEnvironment::addPythonModulePath(const std::string& path)
 {
     PythonEnvironmentData* data = getStaticData() ;
-    if (  data->addedPath.find(path)==data->addedPath.end()) {
+    if (  data->addedPath.find(path)==data->addedPath.end())
+    {
         // note not to insert at first 0 place
         // an empty string must be at first so modules can be found in the current directory first.
 
-        {
-            gil lock;
-            PyRun_SimpleString(std::string("sys.path.insert(1,\""+path+"\")").c_str());
-        }
+        executePython([&]{ PyRun_SimpleString(std::string("sys.path.insert(1,\""+path+"\")").c_str());});
 
-        msg_info("SofaPython3") << "Added '" + path + "' to sys.path";
+        msg_info("SofaPython3")<< "Added '" + path + "' to sys.path";
         data->addedPath.insert(path);
     }
 }
@@ -541,9 +538,8 @@ void PythonEnvironment::setArguments(const std::string& filename, const std::vec
 
 void PythonEnvironment::SceneLoaderListerner::rightBeforeLoadingScene()
 {
-    gil lock;
     // unload python modules to force importing their eventual modifications
-    PyRun_SimpleString("SofaRuntime.unloadModules()");
+    executePython([]{ PyRun_SimpleString("SofaRuntime.unloadModules()");});
 }
 
 void PythonEnvironment::setAutomaticModuleReload( bool b )
@@ -556,8 +552,7 @@ void PythonEnvironment::setAutomaticModuleReload( bool b )
 
 void PythonEnvironment::excludeModuleFromReload( const std::string& moduleName )
 {
-    gil lock;
-    PyRun_SimpleString( std::string( "try: SofaRuntime.__SofaPythonEnvironment_modulesExcludedFromReload.append('" + moduleName + "')\nexcept:pass" ).c_str() );
+    executePython([&]{ PyRun_SimpleString( std::string( "try: SofaRuntime.__SofaPythonEnvironment_modulesExcludedFromReload.append('" + moduleName + "')\nexcept:pass" ).c_str() );});
 }
 
 static const bool debug_gil = false;

bindings/Sofa/Bindings.SofaConfig.cmake.in

@@ -7,6 +7,10 @@ find_package(SofaPython3 QUIET REQUIRED COMPONENTS Plugin)
 
 # Required by Bindings.Sofa.Components, Bindings.Sofa.Core, Bindings.Sofa.Helper, Bindings.Sofa.Simulation, Bindings.Sofa.Types, Bindings.SofaGui
 find_package(SofaFramework QUIET REQUIRED)
+# Required by Bindings.Sofa.Core
+find_package(SofaBaseCollision QUIET REQUIRED)
+find_package(SofaBaseVisual QUIET REQUIRED)
+find_package(SofaBaseUtils QUIET REQUIRED)
 # Required by Bindings.Sofa.Simulation, Bindings.SofaRuntime
 find_package(SofaSimulationGraph QUIET REQUIRED)