ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

[pybind] Update GIL hack for Python 3.7

Browse Source
This commit is contained in:
Matthias Hochsteger 2018-08-30 14:49:56 +02:00
parent c95d69f682
commit 8f16fdb159
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libsrc/general/ngpython.hpp
View File

@ -1,16 +1,27 @@
#ifdef NG_PYTHON #ifdef NG_PYTHON
// BEGIN EVIL HACK: Patch PyThread_get_key_value inside pybind11 to avoid deadlocks // BEGIN EVIL HACK: Patch PyThread_get_key_value/PyThread_tss_get inside pybind11 to avoid deadlocks
// see https://github.com/pybind/pybind11/pull/1211 // see https://github.com/pybind/pybind11/pull/1211 (please merge!)
#if defined(__GNUG__) && !defined(__clang__)
# pragma GCC diagnostic ignored "-Wattributes"
#endif
#include <Python.h> #include <Python.h>
#include <pythread.h> #include <pythread.h>
namespace pybind11 { #include <pybind11/cast.h>
inline void * PyThread_get_key_value(int state) { #undef PYBIND11_TLS_GET_VALUE
PyThreadState *tstate = (PyThreadState *) ::PyThread_get_key_value(state); #if PY_VERSION_HEX >= 0x03070000
inline void * PYBIND11_TLS_GET_VALUE(Py_tss_t *state) {
PyThreadState *tstate = (PyThreadState *) PyThread_tss_get(state);
if (!tstate) tstate = PyGILState_GetThisThreadState(); if (!tstate) tstate = PyGILState_GetThisThreadState();
return tstate; return tstate;
} }
} #else
inline void * PYBIND11_TLS_GET_VALUE(int state) {
PyThreadState *tstate = (PyThreadState *) PyThread_get_key_value(state);
if (!tstate) tstate = PyGILState_GetThisThreadState();
return tstate;
}
#endif
// END EVIL HACK // END EVIL HACK
#include <pybind11/pybind11.h> #include <pybind11/pybind11.h>
#include <pybind11/operators.h> #include <pybind11/operators.h>