* @see http://github.com/nnstreamer/nnstreamer
* @author Dongju Chae <dongju.chae@samsung.com>
* @bug No known bugs except for NYI items
+ * @todo This would be better if this inherits tensor_filter_subplugin class.
*/
/**
CB_END,
} cb_type;
+#define Py_LOCK() PyGILState_Ensure()
+#define Py_UNLOCK(gstate) PyGILState_Release(gstate)
+
/**
* @brief Python embedding core structure
*/
{
return callback_type;
}
- /** @brief Lock python-related actions */
- void Py_LOCK ()
- {
- g_mutex_lock (&py_mutex);
- }
- /** @brief Unlock python-related actions */
- void Py_UNLOCK ()
- {
- g_mutex_unlock (&py_mutex);
- }
int checkTensorType (int nns_type, int np_type);
int checkTensorSize (GstTensorMemory *output, PyArrayObject *array);
PyObject *core_obj;
PyObject *shape_cls;
- GMutex py_mutex;
GstTensorsInfo inputTensorMeta; /**< The tensor info of input tensors */
GstTensorsInfo outputTensorMeta; /**< The tensor info of output tensors */
configured = false;
shape_cls = NULL;
- /** to prevent concurrent Python C-API calls */
- g_mutex_init (&py_mutex);
}
/**
gst_tensors_info_free (&inputTensorMeta);
gst_tensors_info_free (&outputTensorMeta);
+ PyGILState_STATE gstate = Py_LOCK ();
Py_SAFEDECREF (core_obj);
Py_SAFEDECREF (shape_cls);
PyErr_Clear ();
+ Py_UNLOCK (gstate);
dlclose (handle);
- g_mutex_clear (&py_mutex);
}
/**
int
PYCore::init (const GstTensorFilterProperties *prop)
{
+ PyGILState_STATE gstate = Py_LOCK ();
+ int ret = -EINVAL;
/** Find nnstreamer_api module */
PyObject *api_module = PyImport_ImportModule ("nnstreamer_python");
if (api_module == NULL) {
Py_ERRMSG ("Cannt find `nnstreamer_python` module");
- return -EINVAL;
+ goto exit;
}
shape_cls = PyObject_GetAttrString (api_module, "TensorShape");
if (shape_cls == NULL) {
Py_ERRMSG ("Failed to get `TensorShape` from `nnstreamer_python` module");
- return -EINVAL;
+ goto exit;
}
gst_tensors_info_copy (&inputTensorMeta, &prop->input_meta);
gst_tensors_info_copy (&outputTensorMeta, &prop->output_meta);
- return loadScript ();
+ ret = loadScript ();
+exit:
+ Py_UNLOCK (gstate);
+ return ret;
}
/**
gint64 start_time = g_get_real_time ();
#endif
+ int ret = -EINVAL;
+ PyGILState_STATE gstate = Py_LOCK ();
+
PyObject *module = PyImport_ImportModule (module_name.c_str ());
if (module) {
PyObject *cls = PyObject_GetAttrString (module, "CustomFilter");
if (argc < 1) {
g_strfreev (g_args);
ml_loge ("Cannot load python script for python-custom-filter.\n");
- return -EINVAL;
+ goto exit;
}
py_args = PyTuple_New (argc);
callback_type = CB_END;
} else {
Py_ERRMSG ("Fail to create an instance 'CustomFilter'\n");
- return -3;
+ ret = -3;
+ goto exit;
}
Py_SAFEDECREF (cls);
} else {
Py_ERRMSG ("Cannot find 'CustomFilter' class in the script\n");
- return -2;
+ ret = -2;
+ goto exit;
}
Py_SAFEDECREF (module);
} else {
Py_ERRMSG ("the script is not properly loaded\n");
- return -1;
+ ret = -1;
+ goto exit;
}
configured = true;
g_message ("Script is loaded: %" G_GINT64_FORMAT, (stop_time - start_time));
#endif
- return 0;
+ ret = 0;
+exit:
+ Py_UNLOCK (gstate);
+ return ret;
}
/**
if (nullptr == output || nullptr == array)
throw std::invalid_argument ("Null pointers are given to PYCore::checkTensorSize().\n");
+ PyGILState_STATE gstate = Py_LOCK ();
size_t total_size = PyArray_ITEMSIZE (array);
for (int i = 0; i < PyArray_NDIM (array); i++)
total_size *= PyArray_DIM (array, i);
+ Py_UNLOCK (gstate);
+
return (output->size == total_size);
}
if (nullptr == info)
throw std::invalid_argument ("A null pointer is given to PYCore::getInputTensorDim().\n");
- Py_LOCK ();
+ PyGILState_STATE gstate = Py_LOCK ();
PyObject *result = PyObject_CallMethod (core_obj, (char *)"getInputDim", NULL);
if (result) {
res = -1;
}
- Py_UNLOCK ();
+ Py_UNLOCK (gstate);
return res;
}
if (nullptr == info)
throw std::invalid_argument ("A null pointer is given to PYCore::getOutputTensorDim().\n");
- Py_LOCK ();
+ PyGILState_STATE gstate = Py_LOCK ();
PyObject *result = PyObject_CallMethod (core_obj, (char *)"getOutputDim", NULL);
if (result) {
res = -1;
}
- Py_UNLOCK ();
+ Py_UNLOCK (gstate);
return res;
}
if (nullptr == in_info || nullptr == out_info)
throw std::invalid_argument ("Null pointers are given to PYCore::setInputTensorDim().\n");
- Py_LOCK ();
+ PyGILState_STATE gstate = Py_LOCK ();
/** to Python list object */
PyObject *param = PyList_New (in_info->num_tensors);
res = -1;
}
- Py_UNLOCK ();
+ Py_UNLOCK (gstate);
return res;
}
PYCore::freeOutputTensors (void *data)
{
std::map<void *, PyArrayObject *>::iterator it;
+ PyGILState_STATE gstate = Py_LOCK ();
it = outputArrayMap.find (data);
if (it != outputArrayMap.end ()) {
} else {
ml_loge ("Cannot find output data: 0x%lx", (unsigned long)data);
}
+
+ Py_UNLOCK (gstate);
}
/**
PYCore::run (const GstTensorMemory *input, GstTensorMemory *output)
{
int res = 0;
+ PyObject *result;
#if (DBG)
gint64 start_time = g_get_real_time ();
if (nullptr == output || nullptr == input)
throw std::invalid_argument ("Null pointers are given to PYCore::run().\n");
- Py_LOCK ();
+ PyGILState_STATE gstate = Py_LOCK ();
PyObject *param = PyList_New (inputTensorMeta.num_tensors);
for (unsigned int i = 0; i < inputTensorMeta.num_tensors; i++) {
PyList_SetItem (param, i, input_array);
}
- PyObject *result
+
+ result
= PyObject_CallMethod (core_obj, (char *)"invoke", (char *)"(O)", param);
+
if (result) {
if ((unsigned int)PyList_Size (result) != outputTensorMeta.num_tensors) {
res = -EINVAL;
exit_decref:
Py_SAFEDECREF (param);
- Py_UNLOCK ();
+ Py_UNLOCK (gstate);
#if (DBG)
gint64 stop_time = g_get_real_time ();
/* init null */
*private_data = NULL;
+ PyGILState_STATE gstate = PyGILState_Ensure();
core = new PYCore (script_path, prop->custom_properties);
if (core == NULL) {
g_printerr ("Failed to allocate memory for filter subplugin: Python\n");
+ PyGILState_Release (gstate);
return -1;
}
if (core->init (prop) != 0) {
delete core;
g_printerr ("failed to initailize the object: Python\n");
+ PyGILState_Release (gstate);
return -2;
}
if (core->getCbType () != CB_SETDIM && core->getCbType () != CB_GETDIM) {
delete core;
g_printerr ("Wrong callback type\n");
+ PyGILState_Release (gstate);
return -2;
}
+ PyGILState_Release (gstate);
*private_data = core;
.allocateInInvoke = nullptr,
} } };
+static PyThreadState* st;
/** @brief Initialize this object for tensor_filter subplugin runtime register */
void
init_filter_py (void)
/** Python should be initialized and finalized only once */
if (!Py_IsInitialized ())
Py_Initialize ();
+ PyEval_InitThreads_IfGood ();
+ st = PyEval_SaveThread();
nnstreamer_filter_probe (&NNS_support_python);
nnstreamer_filter_set_custom_property_desc (filter_subplugin_python,
void
fini_filter_py (void)
{
+ PyEval_RestoreThread (st);
nnstreamer_filter_exit (NNS_support_python.v0.name);
/** Python should be initialized and finalized only once */
projects / platform / upstream / nnstreamer.git / commitdiff