[GR-53366] Fixes for pyod

PullRequest: graalpython/3319

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_pystate.py

@@ -36,14 +36,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+import sys
 
-from . import CPyExtTestCase, CPyExtFunction
+from . import CPyExtTestCase, CPyExtFunction, CPyExtType
 
 __dir__ = __file__.rpartition("/")[0]
 
 
 class TestPystate(CPyExtTestCase):
-
     test_PyThreadState_GetDict = CPyExtFunction(
         lambda args: type({}),
         lambda: (
@@ -58,3 +58,15 @@ class TestPystate(CPyExtTestCase):
         arguments=["PyObject* ignored"],
         callfunction="wrap_PyThreadState_GetDict",
     )
+
+    def test_PyThreadState_GetFrame(self):
+        Tester = CPyExtType(
+            "PyThreadState_GetFrameTester",
+            code="""
+            static PyObject* get_frame(PyObject* unused) {
+                return (PyObject*)PyThreadState_GetFrame(PyThreadState_GET());
+            }
+            """,
+            tp_methods='{"get_frame", (PyCFunction)get_frame, METH_NOARGS | METH_STATIC, NULL}',
+        )
+        assert Tester.get_frame() is sys._getframe(0)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextPyStateBuiltins.java

@@ -44,6 +44,7 @@
 import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Ignored;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Pointer;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyFrameObjectTransfer;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObjectBorrowed;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyThreadState;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
@@ -55,18 +56,23 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.cext.capi.PThreadState;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
+import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
+import com.oracle.graal.python.nodes.frame.GetCurrentFrameRef;
+import com.oracle.graal.python.nodes.frame.ReadCallerFrameNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.Node;
 
 public final class PythonCextPyStateBuiltins {
 
@@ -131,6 +137,18 @@ PDict get(@Cached PythonObjectFactory factory) {
         }
     }
 
+    @CApiBuiltin(ret = PyFrameObjectTransfer, args = {PyThreadState}, call = Direct)
+    abstract static class PyThreadState_GetFrame extends CApiUnaryBuiltinNode {
+        @Specialization
+        PFrame get(
+                        @Bind("this") Node inliningTarget,
+                        @Cached GetCurrentFrameRef getCurrentFrameRef,
+                        @Cached ReadCallerFrameNode readCallerFrameNode) {
+            PFrame.Reference frameRef = getCurrentFrameRef.execute(null, inliningTarget);
+            return readCallerFrameNode.executeWith(frameRef, 0);
+        }
+    }
+
     @CApiBuiltin(ret = PyObjectBorrowed, args = {Py_ssize_t}, call = Ignored)
     abstract static class PyTruffleState_FindModule extends CApiUnaryBuiltinNode {
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiFunction.java

@@ -865,7 +865,6 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PySys_WriteStdout", ret = Void, args = {ConstCharPtrAsTruffleString, VARARGS}, call = NotImplemented)
     @CApiBuiltin(name = "PyThreadState_Delete", ret = Void, args = {PyThreadState}, call = NotImplemented)
     @CApiBuiltin(name = "PyThreadState_EnterTracing", ret = Void, args = {PyThreadState}, call = NotImplemented)
-    @CApiBuiltin(name = "PyThreadState_GetFrame", ret = PyFrameObjectTransfer, args = {PyThreadState}, call = NotImplemented)
     @CApiBuiltin(name = "PyThreadState_GetID", ret = UINT64_T, args = {PyThreadState}, call = NotImplemented)
     @CApiBuiltin(name = "PyThreadState_GetInterpreter", ret = PyInterpreterState, args = {PyThreadState}, call = NotImplemented)
     @CApiBuiltin(name = "PyThreadState_LeaveTracing", ret = Void, args = {PyThreadState}, call = NotImplemented)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java

@@ -1583,8 +1583,15 @@ Object doNonWrapper(long pointer, boolean stealing,
     private static final int TP_REFCNT_OFFSET = 0;
 
     private static long addNativeRefCount(long pointer, long refCntDelta) {
+        return addNativeRefCount(pointer, refCntDelta, false);
+    }
+
+    private static long addNativeRefCount(long pointer, long refCntDelta, boolean ignoreIfDead) {
         assert PythonContext.get(null).isNativeAccessAllowed();
         long refCount = UNSAFE.getLong(pointer + TP_REFCNT_OFFSET);
+        if (ignoreIfDead && refCount == 0) {
+            return 0;
+        }
         assert (refCount & 0xFFFFFFFF00000000L) == 0 : String.format("suspicious refcnt value during managed adjustment for %016x (%d %016x + %d)\n", pointer, refCount, refCount, refCntDelta);
         assert (refCount + refCntDelta) > 0 : String.format("refcnt reached zero during managed adjustment for %016x (%d %016x + %d)\n", pointer, refCount, refCount, refCntDelta);
 
@@ -1629,11 +1636,20 @@ private static Object createAbstractNativeObject(HandleContext handleContext, Ob
 
         pollReferenceQueue();
         PythonAbstractNativeObject result = new PythonAbstractNativeObject(obj);
-        NativeObjectReference ref = new NativeObjectReference(handleContext, result, pointer);
-        nativeLookupPut(getContext(), pointer, ref);
-
         long refCntDelta = MANAGED_REFCNT - (transfer ? 1 : 0);
-        addNativeRefCount(pointer, refCntDelta);
+        /*
+         * Some APIs might be called from tp_dealloc/tp_del/tp_finalize where the refcount is 0. In
+         * that case we don't want to create a new reference, since that would resurrect the object
+         * and we would end up deallocating it twice.
+         */
+        long refCount = addNativeRefCount(pointer, refCntDelta, true);
+        if (refCount > 0) {
+            NativeObjectReference ref = new NativeObjectReference(handleContext, result, pointer);
+            nativeLookupPut(getContext(), pointer, ref);
+        } else if (LOGGER.isLoggable(Level.FINE)) {
+            LOGGER.fine(PythonUtils.formatJString("createAbstractNativeObject: creating PythonAbstractNativeObject for a dying object (refcount 0): 0x%x", pointer));
+        }
+
         return result;
     }
 

graalpython/lib-graalpython/patches/numba/metadata.toml

@@ -0,0 +1,4 @@
+[[rules]]
+# Not upstreamable, we disable the JIT
+version = '== 0.59.1'
+patch = 'numba-0.59.1.patch'

graalpython/lib-graalpython/patches/numba/numba-0.59.1.patch

@@ -0,0 +1,29 @@
+diff --git a/numba/core/decorators.py b/numba/core/decorators.py
+index 21f1125..00a28fe 100644
+--- a/numba/core/decorators.py
++++ b/numba/core/decorators.py
+@@ -217,6 +217,10 @@ def _jit(sigs, locals, target, cache, targetoptions, **dispatcher_args):
+                 f"{type(func)})."
+             )
+ 
++        if sys.implementation.name == 'graalpy':
++            if target == 'npyufunc':
++                raise NotImplementedError("Cannot create npyufunc under graalpy")
++            return func
+         if config.ENABLE_CUDASIM and target == 'cuda':
+             from numba import cuda
+             return cuda.jit(func)
+diff --git a/pyproject.toml b/pyproject.toml
+new file mode 100644
+index 0000000..fecb79e
+--- /dev/null
++++ b/pyproject.toml
+@@ -0,0 +1,8 @@
++[build-system]
++requires = ["setuptools >= 40.6.0", "wheel", "llvmlite<0.43,>=0.42.0dev0", "numpy<1.27,>=1.22", "versioneer"]
++build-backend = "setuptools.build_meta"
++
++[tool.versioneer]
++VCS = 'git'
++versionfile_source = 'numba/_version.py'
++versionfile_build ='numba/_version.py'