Skip to content

[tmva][sofie] Fix Python C-API reference handling in Keras parser #20877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shlok-Saxena wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −8
Open

[tmva][sofie] Fix Python C-API reference handling in Keras parser #20877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions tmva/sofie_parsers/src/RModelParser_Keras.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ void PyRunString(TString code, PyObject *globalNS, PyObject *localNS)

const char *PyStringAsString(PyObject *string)
{
PyObject *encodedString = PyUnicode_AsUTF8String(string);
const char *cstring = PyBytes_AsString(encodedString);
return cstring;
return PyUnicode_AsUTF8(string);
}

std::vector<size_t> GetDataFromTuple(PyObject *tupleObject)
Expand All @@ -63,7 +61,10 @@ std::vector<size_t> GetDataFromTuple(PyObject *tupleObject)

PyObject *GetValueFromDict(PyObject *dict, const char *key)
{
return PyDict_GetItemWithError(dict, PyUnicode_FromString(key));
PyObject *pyKey = PyUnicode_FromString(key);
PyObject *val = PyDict_GetItemWithError(dict, pyKey);
Py_DECREF(pyKey);
return val;
}

} // namespace
Expand Down Expand Up @@ -666,10 +667,18 @@ std::unique_ptr<ROperator> MakeKerasBatchNorm(PyObject* fLayer)
std::string fLayerDType = PyStringAsString(GetValueFromDict(fLayer,"layerDType"));
std::string fNX = PyStringAsString(PyList_GetItem(fInputs,0));
std::string fNY = PyStringAsString(PyList_GetItem(fOutputs,0));
std::string fNScale = PyStringAsString(PyObject_GetAttrString(fGamma,"name"));
std::string fNB = PyStringAsString(PyObject_GetAttrString(fBeta,"name"));
std::string fNMean = PyStringAsString(PyObject_GetAttrString(fMoving_Mean,"name"));
std::string fNVar = PyStringAsString(PyObject_GetAttrString(fMoving_Var,"name"));
PyObject *gammaName = PyObject_GetAttrString(fGamma, "name");
PyObject *betaName = PyObject_GetAttrString(fBeta, "name");
PyObject *meanName = PyObject_GetAttrString(fMoving_Mean, "name");
PyObject *varName = PyObject_GetAttrString(fMoving_Var, "name");
std::string fNScale = PyStringAsString(gammaName);
std::string fNB = PyStringAsString(betaName);
std::string fNMean = PyStringAsString(meanName);
std::string fNVar = PyStringAsString(varName);
Py_DECREF(gammaName);
Py_DECREF(betaName);
Py_DECREF(meanName);
Py_DECREF(varName);
float fEpsilon = (float)PyFloat_AsDouble(GetValueFromDict(fAttributes,"epsilon"));
float fMomentum = (float)PyFloat_AsDouble(GetValueFromDict(fAttributes,"momentum"));

Expand Down