rmontanana/PyWrap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Complete Example

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2023-11-04 01:21:43 +01:00
parent bec04bc3a6
commit 7b6d05b5ac
6 changed files with 227 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/PyWrap.cc
View File

@@ -5,7 +5,6 @@
#include <string>
#include <map>
#include <boost/python/numpy.hpp>
#include "PyHelper.hpp"
namespace pywrap {
namespace np = boost::python::numpy;
@@ -34,12 +33,9 @@ namespace pywrap {
PyWrap::~PyWrap()
{
for (const auto& item : moduleClassMap) {
Py_DECREF(std::get<0>(item.second));
Py_DECREF(std::get<1>(item.second));
Py_DECREF(std::get<2>(item.second));
}
std::cout << "Destruyendo PyWrap" << std::endl;
Py_Finalize();
std::cout << "PyWrap destruido" << std::endl;
}
void PyWrap::importClass(const std::string& moduleName, const std::string& className)
@@ -50,15 +46,15 @@ namespace pywrap {
return;
}
std::cout << "No estaba en el mapa" << std::endl;
PyObject* module = PyImport_ImportModule(moduleName.c_str());
CPyObject module = PyImport_ImportModule(moduleName.c_str());
if (PyErr_Occurred()) {
errorAbort("Could't import module " + moduleName);
}
PyObject* classObject = PyObject_GetAttrString(module, className.c_str());
CPyObject classObject = PyObject_GetAttrString(module, className.c_str());
if (PyErr_Occurred()) {
errorAbort("Couldn't find class " + className);
}
PyObject* instance = PyObject_CallObject(classObject, NULL);
CPyObject instance = PyObject_CallObject(classObject, NULL);
if (PyErr_Occurred()) {
errorAbort("Couldn't create instance of class " + className);
}
@@ -74,9 +70,6 @@ namespace pywrap {
return;
}
std::cout << "--> Limpiando" << std::endl;
Py_DECREF(std::get<0>(result->second));
Py_DECREF(std::get<1>(result->second));
Py_DECREF(std::get<2>(result->second));
moduleClassMap.erase(result);
std::cout << "Limpieza terminada" << std::endl;
}
@@ -100,14 +93,13 @@ namespace pywrap {
std::string PyWrap::callMethodString(const std::string& moduleName, const std::string& className, const std::string& method)
{
std::cout << "Llamando método " << method << std::endl;
PyObject* instance = getClass(moduleName, className);
PyObject* result;
CPyObject instance = getClass(moduleName, className);
CPyObject result;
if (!(result = PyObject_CallMethod(instance, method.c_str(), NULL)))
errorAbort("Couldn't call method " + method);
std::string value = PyUnicode_AsUTF8(result);
std::cout << "Result: " << value << std::endl;
Py_DECREF(result);
return value;
}
std::string PyWrap::version(const std::string& moduleName, const std::string& className)
@@ -115,31 +107,30 @@ namespace pywrap {
return callMethodString(moduleName, className, "version");
}
void PyWrap::fit(const std::string& moduleName, const std::string& className, PyObject* X, PyObject* y)
void PyWrap::fit(const std::string& moduleName, const std::string& className, CPyObject& X, CPyObject& y)
{
std::cout << "Llamando método fit" << std::endl;
PyObject* instance = getClass(moduleName, className);
PyObject* result;
CPyObject instance = getClass(moduleName, className);
CPyObject result;
std::string method = "fit";
if (!(result = PyObject_CallMethodObjArgs(instance, PyUnicode_FromString(method.c_str()), X, y, NULL)))
errorAbort("Couldn't call method fit");
Py_DECREF(result);
}
PyObject* PyWrap::predict(const std::string& moduleName, const std::string& className, PyObject* X)
CPyObject PyWrap::predict(const std::string& moduleName, const std::string& className, CPyObject& X)
{
std::cout << "Llamando método predict" << std::endl;
PyObject* instance = getClass(moduleName, className);
PyObject* result;
CPyObject instance = getClass(moduleName, className);
CPyObject result;
std::string method = "predict";
if (!(result = PyObject_CallMethodObjArgs(instance, PyUnicode_FromString(method.c_str()), X, NULL)))
errorAbort("Couldn't call method predict");
return result; // The caller has to decref the result
}
double PyWrap::score(const std::string& moduleName, const std::string& className, PyObject* X, PyObject* y)
double PyWrap::score(const std::string& moduleName, const std::string& className, CPyObject& X, CPyObject& y)
{
std::cout << "Llamando método score" << std::endl;
PyObject* instance = getClass(moduleName, className);
PyObject* result;
CPyObject instance = getClass(moduleName, className);
CPyObject result;
std::string method = "score";
if (!(result = PyObject_CallMethodObjArgs(instance, PyUnicode_FromString(method.c_str()), X, y, NULL)))
errorAbort("Couldn't call method score");