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

Passing numpy working partially

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2023-11-03 22:00:46 +01:00
parent 28bbe18115
commit bec04bc3a6
8 changed files with 283 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/PyClassifier.cc
View File

@@ -1,10 +1,13 @@
#include "PyClassifier.h"
#include <boost/python/numpy.hpp>
#include <torch/csrc/autograd/python_variable.h>
#include <torch/csrc/utils/tensor_numpy.h>
//#include "tensorflow/python/lib/core/py_func.h"
#include <iostream>
namespace pywrap {
namespace p = boost::python;
namespace np = boost::python::numpy;
PyClassifier::PyClassifier(const std::string& module, const std::string& className) : module(module), className(className)
{
pyWrap = PyWrap::GetInstance();
@@ -15,11 +18,23 @@ namespace pywrap {
{
pyWrap->clean(module, className);
}
PyObject* PyClassifier::toPyObject(torch::Tensor& tensor)
PyObject* PyClassifier::toPyObject(torch::Tensor& data_tensor)
{
return torch::utils::tensor_to_numpy(tensor);
//return THPVariable_Wrap(tensor);
// return torch::utils::tensor_to_numpy(data_tensor);
return THPVariable_Wrap(data_tensor);
//auto data_numpy = np::from_data(data_tensor.data_ptr(), np::dtype::get_builtin<float>(), p::make_tuple(m, n), p::make_tuple(sizeof(data_tensor.dtype()) * 2 * n, sizeof(data_tensor.dtype()) * 2), p::object());
// PyObject* numpyObject = data_numpy.ptr();
// return numpyObject;
}
// PyObject* PyClassifier::toPyObjecty(torch::Tensor& data_tensor)
// {
// //return THPVariable_Wrap(tensor);
// auto y_numpy = np::from_data(data_tensor.data_ptr(), np::dtype::get_builtin<int32_t>(), p::make_tuple(m), p::make_tuple(sizeof(data_tensor.dtype()) * 2), p::object());
// PyObject* numpyObject = y_numpy.ptr();
// }
std::string PyClassifier::version()
{
return pyWrap->version(module, className);
@@ -29,16 +44,28 @@ namespace pywrap {
{
return pyWrap->callMethodString(module, className, method);
}
void print_array(np::ndarray& array)
{
std::cout << "Array: " << std::endl;
std::cout << p::extract<char const*>(p::str(array)) << std::endl;
}
PyClassifier& PyClassifier::fit(torch::Tensor& X, torch::Tensor& y, const std::vector<std::string>& features, const std::string& className, std::map<std::string, std::vector<int>>& states)
{
std::cout << "Converting X to PyObject" << std::endl;
std::cout << "X.defined() = " << X.defined() << std::endl;
//std::cout << "X.pyobj() = " << X.pyobj() << std::endl;
PyObject* Xp = toPyObject(X);
//PyObject* Xp = torch::utils::tensor_to_numpy(X);
auto XX = X.transpose(0, 1);
int m = XX.size(0);
int n = XX.size(1);
auto data_numpy = np::from_data(XX.data_ptr(), np::dtype::get_builtin<float>(), p::make_tuple(m, n), p::make_tuple(sizeof(XX.dtype()) * 2 * n, sizeof(XX.dtype()) * 2), p::object());
print_array(data_numpy);
PyObject* Xp = data_numpy.ptr();
std::cout << "Converting y to PyObject" << std::endl;
PyObject* yp = toPyObject(y);
auto y_numpy = np::from_data(y.data_ptr(), np::dtype::get_builtin<int32_t>(), p::make_tuple(m), p::make_tuple(sizeof(y.dtype()) * 2), p::object());
PyObject* yp = y_numpy.ptr();
std::cout << "Calling fit" << std::endl;
pyWrap->fit(module, className, Xp, yp);
pyWrap->fit(module, this->className, Xp, yp);
Py_DECREF(Xp);
Py_DECREF(yp);
return *this;
@@ -54,8 +81,19 @@ namespace pywrap {
}
double PyClassifier::score(torch::Tensor& X, torch::Tensor& y)
{
PyObject* Xp = toPyObject(X);
PyObject* yp = toPyObject(y);
std::cout << "Converting X to PyObject" << std::endl;
std::cout << "X.defined() = " << X.defined() << std::endl;
//std::cout << "X.pyobj() = " << X.pyobj() << std::endl;
//PyObject* Xp = torch::utils::tensor_to_numpy(X);
auto XX = X.transpose(0, 1);
int m = XX.size(0);
int n = XX.size(1);
auto data_numpy = np::from_data(XX.data_ptr(), np::dtype::get_builtin<float>(), p::make_tuple(m, n), p::make_tuple(sizeof(XX.dtype()) * 2 * n, sizeof(XX.dtype()) * 2), p::object());
print_array(data_numpy);
PyObject* Xp = data_numpy.ptr();
std::cout << "Converting y to PyObject" << std::endl;
auto y_numpy = np::from_data(y.data_ptr(), np::dtype::get_builtin<int32_t>(), p::make_tuple(m), p::make_tuple(sizeof(y.dtype()) * 2), p::object());
PyObject* yp = y_numpy.ptr();
auto result = pyWrap->score(module, className, Xp, yp);
Py_DECREF(Xp);
Py_DECREF(yp);