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

Begin predict

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2023-11-06 15:22:27 +01:00
parent 3e92372d1c
commit ed21f90b69
8 changed files with 55 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/PyWrap.cc
View File

@@ -47,12 +47,10 @@ namespace pywrap {
}
void PyWrap::importClass(const std::string& moduleName, const std::string& className)
{
std::cout << "Importando clase" << std::endl;
auto result = moduleClassMap.find({ moduleName, className });
if (result != moduleClassMap.end()) {
return;
}
std::cout << "No estaba en el mapa" << std::endl;
CPyObject module = PyImport_ImportModule(moduleName.c_str());
if (PyErr_Occurred()) {
errorAbort("Could't import module " + moduleName);
@@ -75,12 +73,12 @@ namespace pywrap {
void PyWrap::clean(const std::string& moduleName, const std::string& className)
{
std::lock_guard<std::mutex> lock(mutex);
std::cout << "Limpiando" << std::endl;
std::cout << "Start cleaning " << moduleName << "." << className << std::endl;
auto result = moduleClassMap.find({ moduleName, className });
if (result == moduleClassMap.end()) {
return;
}
std::cout << "--> Limpiando" << std::endl;
std::cout << "--> Cleaning PyObject" << std::endl;
Py_DECREF(std::get<0>(result->second));
Py_DECREF(std::get<1>(result->second));
Py_DECREF(std::get<2>(result->second));
@@ -92,7 +90,7 @@ namespace pywrap {
if (moduleClassMap.empty()) {
RemoveInstance();
}
std::cout << "Limpieza terminada" << std::endl;
std::cout << "End Cleaning " << moduleName << "." << className << std::endl;
}
void PyWrap::errorAbort(const std::string& message)
{
@@ -107,12 +105,10 @@ namespace pywrap {
if (item == moduleClassMap.end()) {
errorAbort("Module " + moduleName + " and class " + className + " not found");
}
std::cout << "Clase encontrada" << std::endl;
return std::get<2>(item->second);
}
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;
try {
@@ -125,21 +121,15 @@ namespace pywrap {
exit(1);
}
std::string value = PyUnicode_AsUTF8(result);
std::cout << "Result: " << value << std::endl;
Py_DECREF(result);
Py_XDECREF(result);
return value;
}
std::string PyWrap::version(const std::string& moduleName, const std::string& className)
{
return callMethodString(moduleName, className, "version");
}
std::string PyWrap::graph(const std::string& moduleName, const std::string& className)
{
return callMethodString(moduleName, className, "graph");
}
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);
CPyObject result;
std::string method = "fit";
@@ -153,11 +143,12 @@ namespace pywrap {
exit(1);
}
}
CPyObject PyWrap::predict(const std::string& moduleName, const std::string& className, CPyObject& X)
PyObject* PyWrap::predict(const std::string& moduleName, const std::string& className, CPyObject& X)
{
std::cout << "Llamando método predict" << std::endl;
CPyObject instance = getClass(moduleName, className);
CPyObject result;
PyObject* instance = getClass(moduleName, className);
PyObject* result;
std::string method = "predict";
try {
if (!(result = PyObject_CallMethodObjArgs(instance, PyUnicode_FromString(method.c_str()), X.getObject(), NULL)))
@@ -168,11 +159,10 @@ namespace pywrap {
RemoveInstance();
exit(1);
}
return result;
return result; // Caller must free this object
}
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);
CPyObject result;
std::string method = "score";