|
25 | 25 | #include <numpy/arrayobject.h> |
26 | 26 |
|
27 | 27 |
|
28 | | -namespace TMVA{ |
29 | | -namespace Experimental{ |
30 | | -namespace SOFIE{ |
31 | | -namespace PyKeras{ |
| 28 | +namespace TMVA::Experimental::SOFIE::PyKeras { |
32 | 29 |
|
33 | | -// Referencing Python utility functions present in PyMethodBase |
34 | | -static void(& PyRunString)(TString, PyObject*, PyObject*) = PyMethodBase::PyRunString; |
35 | | -static const char*(& PyStringAsString)(PyObject*) = PyMethodBase::PyStringAsString; |
36 | | -static std::vector<size_t>(& GetDataFromTuple)(PyObject*) = PyMethodBase::GetDataFromTuple; |
37 | | -static PyObject*(& GetValueFromDict)(PyObject*, const char*) = PyMethodBase::GetValueFromDict; |
| 30 | +namespace { |
| 31 | + |
| 32 | +// Utility functions (taken from PyMethodBase in PyMVA) |
| 33 | + |
| 34 | +void PyRunString(TString code, PyObject *globalNS, PyObject *localNS) |
| 35 | +{ |
| 36 | + PyObject *fPyReturn = PyRun_String(code, Py_single_input, globalNS, localNS); |
| 37 | + if (!fPyReturn) { |
| 38 | + std::cout << "\nPython error message:\n"; |
| 39 | + PyErr_Print(); |
| 40 | + throw std::runtime_error("\nFailed to run python code: " + code); |
| 41 | + } |
| 42 | +} |
| 43 | + |
| 44 | +const char *PyStringAsString(PyObject *string) |
| 45 | +{ |
| 46 | + PyObject *encodedString = PyUnicode_AsUTF8String(string); |
| 47 | + const char *cstring = PyBytes_AsString(encodedString); |
| 48 | + return cstring; |
| 49 | +} |
| 50 | + |
| 51 | +std::vector<size_t> GetDataFromTuple(PyObject *tupleObject) |
| 52 | +{ |
| 53 | + std::vector<size_t> tupleVec; |
| 54 | + for (Py_ssize_t tupleIter = 0; tupleIter < PyTuple_Size(tupleObject); ++tupleIter) { |
| 55 | + auto itemObj = PyTuple_GetItem(tupleObject, tupleIter); |
| 56 | + if (itemObj == Py_None) |
| 57 | + tupleVec.push_back(0); // case shape is for example (None,2,3) |
| 58 | + else |
| 59 | + tupleVec.push_back((size_t)PyLong_AsLong(itemObj)); |
| 60 | + } |
| 61 | + return tupleVec; |
| 62 | +} |
| 63 | + |
| 64 | +PyObject *GetValueFromDict(PyObject *dict, const char *key) |
| 65 | +{ |
| 66 | + return PyDict_GetItemWithError(dict, PyUnicode_FromString(key)); |
| 67 | +} |
| 68 | + |
| 69 | +} // namespace |
38 | 70 |
|
39 | 71 | namespace INTERNAL{ |
40 | 72 |
|
@@ -1036,7 +1068,5 @@ RModel Parse(std::string filename, int batch_size){ |
1036 | 1068 |
|
1037 | 1069 | return rmodel; |
1038 | 1070 | } |
1039 | | -}//PyKeras |
1040 | | -}//SOFIE |
1041 | | -}//Experimental |
1042 | | -}//TMVA |
| 1071 | + |
| 1072 | +} // namespace TMVA::Experimental::SOFIE::PyKeras |
0 commit comments