Ready to use

diff --git a/AdaoExchangeLayer4Quintet.cxx b/AdaoExchangeLayer4Quintet.cxx
index ea267bc5c71a08f468d3873ec11484779ee0d6c5..4b82af4bc44d253ba795c992ad57517089c263ba 100644 (file)
--- a/AdaoExchangeLayer4Quintet.cxx
+++ b/AdaoExchangeLayer4Quintet.cxx
@@ -29,7 +29,6 @@
 #include <semaphore.h>
 
 #include <iostream>
-#include <fstream>
 #include <sstream>
 #include <clocale>
 #include <cstdlib>
@@ -308,10 +307,6 @@ void AdaoExchangeLayer4Quintet::loadTemplate(AdaoModel::MainModel *model)
   //
   {
     std::string sciptPyOfModelMaker(model->pyStr());
-    {
-      std::ofstream ofs("/tmp/H87074/jj");
-      ofs << sciptPyOfModelMaker;
-    }
     PyObjectRAII res(PyObjectRAII::FromNew(PyRun_String(sciptPyOfModelMaker.c_str(),Py_file_input,this->_internal->_context,this->_internal->_context)));
     PyErr_Print();
     _internal->_adao_case = PyObjectRAII::FromNew(PyDict_GetItemString(this->_internal->_context,"case"));

diff --git a/TestAdaoExchange.cxx b/TestAdaoExchange.cxx
index a690fe6a4dda8f638c8137f8e5850270836f0ffe..803cbc1ee5b1403e8b63a2541ce9fe5e4daabcdc 100644 (file)
--- a/TestAdaoExchange.cxx
+++ b/TestAdaoExchange.cxx
@@ -32,58 +32,66 @@
 
 #include "TestAdaoHelper.cxx"
 
-PyObject *multiFunc(PyObject *inp)
+// Functor a remplacer par un appel a un evaluateur parallele
+class NonParallelFunctor
 {
-  PyGILState_STATE gstate(PyGILState_Ensure());
-  PyObjectRAII iterator(PyObjectRAII::FromNew(PyObject_GetIter(inp)));
-  if(iterator.isNull())
-    throw AdaoExchangeLayerException("Input object is not iterable !");
-  PyObject *item(nullptr);
-  PyObjectRAII numpyModule(PyObjectRAII::FromNew(PyImport_ImportModule("numpy")));
-  if(numpyModule.isNull())
-    throw AdaoExchangeLayerException("Failed to load numpy");
-  PyObjectRAII ravelFunc(PyObjectRAII::FromNew(PyObject_GetAttrString(numpyModule,"ravel")));
-  std::vector< PyObjectRAII > pyrets;
-  while( item = PyIter_Next(iterator) )
-    {
-      PyObjectRAII item2(PyObjectRAII::FromNew(item));
+public:
+  NonParallelFunctor(std::function< std::vector<double>(const std::vector<double>&) > cppFunction):_cpp_function(cppFunction) { }
+  PyObject *operator()(PyObject *inp) const
+  {
+    PyGILState_STATE gstate(PyGILState_Ensure());
+    PyObjectRAII iterator(PyObjectRAII::FromNew(PyObject_GetIter(inp)));
+    if(iterator.isNull())
+      throw AdaoExchangeLayerException("Input object is not iterable !");
+    PyObject *item(nullptr);
+    PyObjectRAII numpyModule(PyObjectRAII::FromNew(PyImport_ImportModule("numpy")));
+    if(numpyModule.isNull())
+      throw AdaoExchangeLayerException("Failed to load numpy");
+    PyObjectRAII ravelFunc(PyObjectRAII::FromNew(PyObject_GetAttrString(numpyModule,"ravel")));
+    std::vector< PyObjectRAII > pyrets;
+    while( item = PyIter_Next(iterator) )
       {
-        PyObjectRAII args(PyObjectRAII::FromNew(PyTuple_New(1)));
-        PyTuple_SetItem(args,0,item2.retn());
-        PyObjectRAII npyArray(PyObjectRAII::FromNew(PyObject_CallObject(ravelFunc,args)));
-        // Waiting management of npy arrays into py2cpp
-        PyObjectRAII lolistFunc(PyObjectRAII::FromNew(PyObject_GetAttrString(npyArray,"tolist")));
-        PyObjectRAII listPy;
+        PyObjectRAII item2(PyObjectRAII::FromNew(item));
         {
-          PyObjectRAII args2(PyObjectRAII::FromNew(PyTuple_New(0)));
-          listPy=PyObjectRAII::FromNew(PyObject_CallObject(lolistFunc,args2));
+          PyObjectRAII args(PyObjectRAII::FromNew(PyTuple_New(1)));
+          PyTuple_SetItem(args,0,item2.retn());
+          PyObjectRAII npyArray(PyObjectRAII::FromNew(PyObject_CallObject(ravelFunc,args)));
+          // Waiting management of npy arrays into py2cpp
+          PyObjectRAII lolistFunc(PyObjectRAII::FromNew(PyObject_GetAttrString(npyArray,"tolist")));
+          PyObjectRAII listPy;
+          {
+            PyObjectRAII args2(PyObjectRAII::FromNew(PyTuple_New(0)));
+            listPy=PyObjectRAII::FromNew(PyObject_CallObject(lolistFunc,args2));
           }
-        std::vector<double> vect;
-        {
-          py2cpp::PyPtr listPy2(listPy.retn());
-          py2cpp::fromPyPtr(listPy2,vect);
+          std::vector<double> vect;
+          {
+            py2cpp::PyPtr listPy2(listPy.retn());
+            py2cpp::fromPyPtr(listPy2,vect);
+          }
+          //
+          PyGILState_Release(gstate);
+          std::vector<double> res(_cpp_function(vect));// L'appel effectif est ici
+          gstate=PyGILState_Ensure();
+          //
+          py2cpp::PyPtr resPy(py2cpp::toPyPtr(res));
+          PyObjectRAII resPy2(PyObjectRAII::FromBorrowed(resPy.get()));
+          pyrets.push_back(resPy2);
         }
-        //
-        PyGILState_Release(gstate);
-        std::vector<double> res(funcBase(vect));
-        gstate=PyGILState_Ensure();
-        //
-        py2cpp::PyPtr resPy(py2cpp::toPyPtr(res));
-        PyObjectRAII resPy2(PyObjectRAII::FromBorrowed(resPy.get()));
-        pyrets.push_back(resPy2);
       }
-    }
-  std::size_t len(pyrets.size());
-  PyObjectRAII ret(PyObjectRAII::FromNew(PyList_New(len)));
-  for(std::size_t i=0;i<len;++i)
-    {
-      PyList_SetItem(ret,i,pyrets[i].retn());
-    }
-  //PyObject *tmp(PyObject_Repr(ret));
-  // std::cerr << PyUnicode_AsUTF8(tmp) << std::endl;
-  PyGILState_Release(gstate);
-  return ret.retn();
-}
+    std::size_t len(pyrets.size());
+    PyObjectRAII ret(PyObjectRAII::FromNew(PyList_New(len)));
+    for(std::size_t i=0;i<len;++i)
+      {
+        PyList_SetItem(ret,i,pyrets[i].retn());
+      }
+    //PyObject *tmp(PyObject_Repr(ret));
+    // std::cerr << PyUnicode_AsUTF8(tmp) << std::endl;
+    PyGILState_Release(gstate);
+    return ret.retn();
+  }
+private:
+  std::function< std::vector<double>(const std::vector<double>&) > _cpp_function;
+};
 
 PyObjectRAII NumpyToListWaitingForPy2CppManagement(PyObject *npObj)
 {
@@ -111,6 +119,7 @@ using namespace AdaoModel;
 
 void AdaoExchangeTest::test3DVar()
 {
+  NonParallelFunctor functor(funcBase);
   MainModel mm;
   AdaoExchangeLayer4Quintet adao;
   adao.init();
@@ -122,13 +131,13 @@ void AdaoExchangeTest::test3DVar()
   //
   {
     std::string sciptPyOfModelMaker(mm.pyStr());
-    std::cerr << sciptPyOfModelMaker << std::endl;
+    //std::cerr << sciptPyOfModelMaker << std::endl;
   }
   adao.execute();
   PyObject *listOfElts( nullptr );
   while( adao.next(listOfElts) )
     {
-      PyObject *resultOfChunk(multiFunc(listOfElts));
+      PyObject *resultOfChunk(functor(listOfElts));
       adao.setResult(resultOfChunk);
     }
   PyObject *res(adao.getResult());
@@ -160,6 +169,7 @@ void AdaoExchangeTest::testBlue()
     void exitSubDir(DictKeyVal *subdir) { }
   };
 
+  NonParallelFunctor functor(funcBase);
   MainModel mm;
   //
   TestBlueVisitor vis;
@@ -175,13 +185,13 @@ void AdaoExchangeTest::testBlue()
   //
   {
     std::string sciptPyOfModelMaker(mm.pyStr());
-    std::cerr << sciptPyOfModelMaker << std::endl;
+    //std::cerr << sciptPyOfModelMaker << std::endl;
   }
   adao.execute();
     PyObject *listOfElts( nullptr );
     while( adao.next(listOfElts) )
       {
-        PyObject *resultOfChunk(multiFunc(listOfElts));
+        PyObject *resultOfChunk(functor(listOfElts));
         adao.setResult(resultOfChunk);
       }
     PyObject *res(adao.getResult());
@@ -212,7 +222,7 @@ void AdaoExchangeTest::testNonLinearLeastSquares()
     void enterSubDir(DictKeyVal *subdir) { }
     void exitSubDir(DictKeyVal *subdir) { }
   };
-
+  NonParallelFunctor functor(funcBase);
   MainModel mm;
   //
   TestNonLinearLeastSquaresVisitor vis;
@@ -228,13 +238,13 @@ void AdaoExchangeTest::testNonLinearLeastSquares()
   //
   {
     std::string sciptPyOfModelMaker(mm.pyStr());
-    std::cerr << sciptPyOfModelMaker << std::endl;
+    //std::cerr << sciptPyOfModelMaker << std::endl;
   }
   adao.execute();
   PyObject *listOfElts( nullptr );
   while( adao.next(listOfElts) )
     {
-      PyObject *resultOfChunk(multiFunc(listOfElts));
+      PyObject *resultOfChunk(functor(listOfElts));
       adao.setResult(resultOfChunk);
     }
   PyObject *res(adao.getResult());
@@ -253,6 +263,7 @@ void AdaoExchangeTest::testNonLinearLeastSquares()
 
 void AdaoExchangeTest::testCasCrue()
 {
+  NonParallelFunctor functor(funcCrue);
   MainModel mm;
   AdaoExchangeLayer4Quintet adao;
   adao.init();
@@ -264,13 +275,13 @@ void AdaoExchangeTest::testCasCrue()
   //
   {
     std::string sciptPyOfModelMaker(mm.pyStr());
-    std::cerr << sciptPyOfModelMaker << std::endl;
+    //std::cerr << sciptPyOfModelMaker << std::endl;
   }
   adao.execute();
   PyObject *listOfElts( nullptr );
   while( adao.next(listOfElts) )
     {
-      PyObject *resultOfChunk(multiFuncCrue(listOfElts));
+      PyObject *resultOfChunk(functor(listOfElts));
       adao.setResult(resultOfChunk);
     }
   PyObject *res(adao.getResult());

diff --git a/TestAdaoHelper.cxx b/TestAdaoHelper.cxx
index 09d89297e5acbf1c0223b1994291c3a7cafb512c..553be51339c0ca6f00a3fb05f2e674b1844243e3 100644 (file)
--- a/TestAdaoHelper.cxx
+++ b/TestAdaoHelper.cxx
@@ -34,59 +34,7 @@ std::vector<double> funcCrue(const std::vector<double>& vec)
   return ret;
 }
 
-PyObject *multiFuncCrue(PyObject *inp)
-{
-  PyGILState_STATE gstate(PyGILState_Ensure());
-  PyObjectRAII iterator(PyObjectRAII::FromNew(PyObject_GetIter(inp)));
-  if(iterator.isNull())
-    throw AdaoExchangeLayerException("Input object is not iterable !");
-  PyObject *item(nullptr);
-  PyObjectRAII numpyModule(PyObjectRAII::FromNew(PyImport_ImportModule("numpy")));
-  if(numpyModule.isNull())
-    throw AdaoExchangeLayerException("Failed to load numpy");
-  PyObjectRAII ravelFunc(PyObjectRAII::FromNew(PyObject_GetAttrString(numpyModule,"ravel")));
-  std::vector< PyObjectRAII > pyrets;
-  while( item = PyIter_Next(iterator) )
-    {
-      PyObjectRAII item2(PyObjectRAII::FromNew(item));
-      {
-        PyObjectRAII args(PyObjectRAII::FromNew(PyTuple_New(1)));
-        PyTuple_SetItem(args,0,item2.retn());
-        PyObjectRAII npyArray(PyObjectRAII::FromNew(PyObject_CallObject(ravelFunc,args)));
-        // Waiting management of npy arrays into py2cpp
-        PyObjectRAII lolistFunc(PyObjectRAII::FromNew(PyObject_GetAttrString(npyArray,"tolist")));
-        PyObjectRAII listPy;
-        {
-          PyObjectRAII args2(PyObjectRAII::FromNew(PyTuple_New(0)));
-          listPy=PyObjectRAII::FromNew(PyObject_CallObject(lolistFunc,args2));
-          }
-        std::vector<double> vect;
-        {
-          py2cpp::PyPtr listPy2(listPy.retn());
-          py2cpp::fromPyPtr(listPy2,vect);
-        }
-        //
-        PyGILState_Release(gstate);
-        std::vector<double> res(funcCrue(vect));
-        gstate=PyGILState_Ensure();
-        //
-        py2cpp::PyPtr resPy(py2cpp::toPyPtr(res));
-        PyObjectRAII resPy2(PyObjectRAII::FromBorrowed(resPy.get()));
-        pyrets.push_back(resPy2);
-      }
-    }
-  std::size_t len(pyrets.size());
-  PyObjectRAII ret(PyObjectRAII::FromNew(PyList_New(len)));
-  for(std::size_t i=0;i<len;++i)
-    {
-      PyList_SetItem(ret,i,pyrets[i].retn());
-    }
-  //PyObject *tmp(PyObject_Repr(ret));
-  // std::cerr << PyUnicode_AsUTF8(tmp) << std::endl;
-  PyGILState_Release(gstate);
-  return ret.retn();
-}
-
+/* Visitor commun pour test3DVar testBlue et testNonLinearLeastSquares*/
 class Visitor2 : public AdaoModel::PythonLeafVisitor
 {
 public:
@@ -142,6 +90,7 @@ private:
   PyObject *_context = nullptr;
 };
 
+/* Visitor pour testCasCrue */
 class VisitorCruePython : public AdaoModel::PythonLeafVisitor
 {
 public: