remove einspect

Author: makslevental

mlir/extras/ast/py_type.py

@@ -1,154 +1,216 @@
-from __future__ import annotations
-
 from ctypes import (
     c_char,
     c_char_p,
     c_uint,
     c_ulong,
     pointer,
+    Structure,
+    _Pointer,
+    PYFUNCTYPE,
+    py_object,
+    c_int,
+    c_void_p,
+    c_ssize_t,
+    POINTER,
+    cast,
 )
-from typing import TypeVar
-
-from einspect.structs.include.descrobject_h import PyGetSetDef, PyMemberDef
-from einspect.structs.include.methodobject_h import PyMethodDef
-from einspect.structs.include.object_h import (
-    destructor,
-    getattrfunc,
-    setattrfunc,
-    PyAsyncMethods,
-    reprfunc,
-    PyNumberMethods,
-    PySequenceMethods,
-    PyMappingMethods,
-    hashfunc,
-    ternaryfunc,
-    getattrofunc,
-    setattrofunc,
-    PyBufferProcs,
-    traverseproc,
-    inquiry,
-    richcmpfunc,
-    getiterfunc,
-    iternextfunc,
-    descrgetfunc,
-    descrsetfunc,
-    initproc,
-    allocfunc,
-    newfunc,
-    freefunc,
-    vectorcallfunc,
+from typing import get_origin, _SpecialForm, _GenericAlias
+
+from _ctypes import sizeof
+
+Py_ssize_t = c_ssize_t
+
+_SelfPtr = object()
+
+
+@_SpecialForm
+def Self(self, parameters):
+    raise TypeError(f"{self} is not subscriptable")
+
+
+class _Ptr(_Pointer):
+    def __new__(cls, *args, **kwargs):
+        return pointer(*args, **kwargs)
+
+    def __class_getitem__(cls, item):
+        """Return a `ctypes.POINTER` of the given type."""
+        # For ptr[Self], return a special object
+        if item is Self:
+            return _SelfPtr
+
+        # Get base of generic alias
+        # noinspection PyUnresolvedReferences, PyProtectedMember
+        if isinstance(item, _GenericAlias):
+            item = get_origin(item)
+
+        try:
+            return POINTER(item)
+        except TypeError as e:
+            raise TypeError(f"{e} (During POINTER({item}))") from e
+
+
+def address(obj) -> int:
+    source = py_object(obj)
+    addr = c_void_p.from_buffer(source).value
+    if addr is None:
+        raise ValueError("address: NULL object")  # pragma: no cover
+    return addr
+
+
+# https://github.com/python/cpython/blob/3.11/Include/object.h#L196-L227
+unaryfunc = PYFUNCTYPE(py_object, py_object)
+binaryfunc = PYFUNCTYPE(py_object, py_object, py_object)
+ternaryfunc = PYFUNCTYPE(py_object, py_object, py_object, py_object)
+inquiry = PYFUNCTYPE(c_int, py_object)
+lenfunc = PYFUNCTYPE(Py_ssize_t, py_object)
+ssizeargfunc = PYFUNCTYPE(py_object, py_object, Py_ssize_t)
+ssizessizeargfunc = PYFUNCTYPE(py_object, py_object, Py_ssize_t, Py_ssize_t)
+ssizeobjargproc = PYFUNCTYPE(c_int, py_object, Py_ssize_t, py_object)
+ssizessizeobjargproc = PYFUNCTYPE(c_int, py_object, Py_ssize_t, Py_ssize_t, py_object)
+objobjargproc = PYFUNCTYPE(c_int, py_object, py_object, py_object)
+
+objobjproc = PYFUNCTYPE(c_int, py_object, py_object)
+visitproc = PYFUNCTYPE(c_int, py_object, c_void_p)
+traverseproc = PYFUNCTYPE(c_int, py_object, visitproc, c_void_p)
+
+freefunc = PYFUNCTYPE(None, c_void_p)
+destructor = PYFUNCTYPE(None, py_object)
+getattrfunc = PYFUNCTYPE(py_object, py_object, c_char_p)
+getattrofunc = PYFUNCTYPE(py_object, py_object, py_object)
+setattrfunc = PYFUNCTYPE(c_int, py_object, c_char_p, py_object)
+setattrofunc = PYFUNCTYPE(c_int, py_object, py_object, py_object)
+reprfunc = PYFUNCTYPE(py_object, py_object)
+hashfunc = PYFUNCTYPE(Py_ssize_t, py_object)
+richcmpfunc = PYFUNCTYPE(py_object, py_object, py_object, c_int)
+getiterfunc = PYFUNCTYPE(py_object, py_object)
+iternextfunc = PYFUNCTYPE(py_object, py_object)
+
+descrgetfunc = PYFUNCTYPE(py_object, py_object, py_object, py_object)
+descrsetfunc = PYFUNCTYPE(c_int, py_object, py_object, py_object)
+initproc = PYFUNCTYPE(c_int, py_object, py_object, py_object)
+newfunc = PYFUNCTYPE(py_object, py_object, py_object, py_object)
+allocfunc = PYFUNCTYPE(py_object, py_object, Py_ssize_t)
+
+# PyObject *(*vectorcallfunc)(PyObject *callable, PyObject *const *args, size_t nargsf, PyObject *kwnames)
+vectorcallfunc = PYFUNCTYPE(
+    py_object, py_object, _Ptr[py_object], Py_ssize_t, py_object
 )
-from einspect.structs.py_object import PyObject, PyVarObject
-from einspect.types import ptr
-from typing_extensions import Annotated, Self
-
-__all__ = ("PyTypeObject",)
-
-_T = TypeVar("_T")
-
-DEFAULT = object()
-
-
-# noinspection PyPep8Naming
-class PyTypeObject(PyVarObject[_T, None, None]):
-    """
-    Defines a PyTypeObject Structure.
-
-    https://github.com/python/cpython/blob/3.11/Doc/includes/typestruct.h
-
-    ..
-        source: Include/cpython/object.h (struct _typeobject)
-    """
-
-    tp_name: Annotated[bytes, c_char_p]
-    # For allocation
-    tp_basicsize: int
-    tp_itemsize: int
-    # Methods to implement standard operations
-    tp_dealloc: destructor
-    tp_vectorcall_offset: int
-    tp_getattr: getattrfunc
-    tp_setattr: setattrfunc
-    # formerly known as tp_compare (Python 2) or tp_reserved (Python 3)
-    tp_as_async: ptr[PyAsyncMethods]
-
-    tp_repr: reprfunc
-
-    # Method suites for standard classes
-    tp_as_number: ptr[PyNumberMethods]
-    tp_as_sequence: ptr[PySequenceMethods]
-    tp_as_mapping: ptr[PyMappingMethods]
-
-    # More standard operations (here for binary compatibility)
-    tp_hash: hashfunc
-    tp_call: ternaryfunc
-    tp_str: reprfunc
-    tp_getattro: getattrofunc
-    tp_setattro: setattrofunc
-
-    # Functions to access object as input/output buffer
-    tp_as_buffer: ptr[PyBufferProcs]
-
-    # Flags to define presence of optional/expanded features
-    tp_flags: Annotated[int, c_ulong]
-
-    tp_doc: Annotated[bytes, c_char_p]  # Documentation string
-
-    # Assigned meaning in release 2.0
-    # call function for all accessible objects
-    tp_traverse: traverseproc
-
-    tp_clear: inquiry  # delete references to contained objects
-
-    # Assigned meaning in release 2.1
-    # rich comparisons
-    tp_richcompare: richcmpfunc
-
-    tp_weaklistoffset: int  # weak reference enabler
-
-    # Iterators
-    tp_iter: getiterfunc
-    tp_iternext: iternextfunc
-
-    # Attribute descriptor and subclassing stuff
-    tp_methods: ptr[PyMethodDef]
-    tp_members: ptr[PyMemberDef]
-    tp_getset: ptr[PyGetSetDef]
-
-    # Strong reference on a heap type, borrowed reference on a static type
-    tp_base: pointer[Self]
-    tp_dict: ptr[PyObject]
-    tp_descr_get: descrgetfunc
-    tp_descr_set: descrsetfunc
-    tp_dictoffset: int
-    tp_init: initproc
-    tp_alloc: allocfunc
-    tp_new: newfunc
-    tp_free: freefunc  # Low-level free-memory routine
-    tp_is_gc: inquiry  # For PyObject_IS_GC
-    tp_bases: ptr[PyObject]
-    tp_mro: ptr[PyObject]  # method resolution order
-    tp_cache: ptr[PyObject]
-    tp_subclasses: ptr[PyObject]  # for static builtin types this is an index
-    tp_weaklist: ptr[PyObject]
-    tp_del: destructor
-
-    # Type attribute cache version tag. Added in version 2.6
-    tp_version_tag: Annotated[int, c_uint]
-
-    tp_finalize: destructor
-    tp_vectorcall: vectorcallfunc
-
-    # bitset of which type-watchers care about this type
-    tp_watched: c_char
+# PySendResult (*sendfunc)(PyObject *iter, PyObject *value, PyObject **result)
+sendfunc = PYFUNCTYPE(c_int, py_object, py_object, _Ptr[py_object])
+
+
+class PyObject(Structure):
+    _fields_ = [
+        ("ob_refcnt", c_ssize_t),
+        ("ob_type", _Ptr[py_object]),
+    ]
+
+    def as_ref(self) -> _Ptr[Self]:
+        """Return a pointer to the Structure."""
+        return pointer(self)  # type: ignore
+
+    def into_object(self):
+        """Cast the PyObject into a Python object."""
+        py_obj = cast(self.as_ref(), py_object)
+        return py_obj.value
+
+
+class PyTypeObject(Structure):
+    _fields_ = [
+        ("ob_refcnt", c_ssize_t),
+        # ("ob_type", LP_PyTypeObject),
+        ("ob_type", _Ptr[PyObject]),
+        ("ob_size", c_ssize_t),
+        ("tp_name", c_char_p),
+        ("tp_basicsize", c_ssize_t),
+        ("tp_itemsize", c_ssize_t),
+        ("tp_dealloc", destructor),
+        ("tp_vectorcall_offset", c_ssize_t),
+        ("tp_getattr", getattrfunc),
+        ("tp_setattr", setattrfunc),
+        # ("tp_as_async", _Ptr[PyAsyncMethods]),
+        ("tp_as_async", _Ptr[PyObject]),
+        ("tp_repr", reprfunc),
+        # ("tp_as_number", _Ptr[PyNumberMethods]),
+        ("tp_as_number", _Ptr[PyObject]),
+        # ("tp_as_sequence", _Ptr[PySequenceMethods]),
+        ("tp_as_sequence", _Ptr[PyObject]),
+        # ("tp_as_mapping", _Ptr[PyMappingMethods]),
+        ("tp_as_mapping", _Ptr[PyObject]),
+        ("tp_hash", hashfunc),
+        ("tp_call", ternaryfunc),
+        ("tp_str", reprfunc),
+        ("tp_getattro", getattrofunc),
+        ("tp_setattro", setattrofunc),
+        # ("tp_as_buffer", _Ptr[PyBufferProcs]),
+        ("tp_as_buffer", _Ptr[PyObject]),
+        ("tp_flags", c_ulong),
+        ("tp_doc", c_char_p),
+        ("tp_traverse", traverseproc),
+        ("tp_clear", inquiry),
+        ("tp_richcompare", richcmpfunc),
+        ("tp_weaklistoffset", c_ssize_t),
+        ("tp_iter", getiterfunc),
+        ("tp_iternext", iternextfunc),
+        ("tp_methods", _Ptr[PyObject]),
+        ("tp_members", _Ptr[PyObject]),
+        ("tp_getset", _Ptr[PyObject]),
+        # ("tp_base", _Ptr[PyTypeObject]),
+        ("tp_base", _Ptr[PyObject]),
+        ("tp_dict", _Ptr[PyObject]),
+        ("tp_descr_get", descrgetfunc),
+        ("tp_descr_set", descrsetfunc),
+        ("tp_dictoffset", c_ssize_t),
+        ("tp_init", initproc),
+        ("tp_alloc", allocfunc),
+        ("tp_new", newfunc),
+        ("tp_free", freefunc),
+        ("tp_is_gc", inquiry),
+        ("tp_bases", _Ptr[PyObject]),
+        ("tp_mro", _Ptr[PyObject]),
+        ("tp_cache", _Ptr[PyObject]),
+        ("tp_subclasses", _Ptr[PyObject]),
+        ("tp_weaklist", _Ptr[PyObject]),
+        ("tp_del", destructor),
+        ("tp_version_tag", c_uint),
+        ("tp_finalize", descrsetfunc),
+        ("tp_vectorcall", vectorcallfunc),
+        ("tp_watched", c_char),
+    ]
+
+    @classmethod
+    def from_object(cls, obj) -> Self:
+        """Create a PyObject from an object."""
+        return cls.from_address(address(obj))
 
 
 # https://github.com/python/cpython/blob/809aa9a682fc865f7502e7421da0a74d204aab6d/Objects/typevarobject.c#L29
-class PyTypeVarObject(PyVarObject[_T, None, None]):
-    name: ptr[PyObject]
-    # not sure why but this is the only thing that works but that's fine because it's the only thing we need
-    bound: ptr[PyObject]
+class PyTypeVarObject(Structure):
+    _fields_ = [
+        ("ob_refcnt", c_ssize_t),
+        # ("ob_type", LP_PyTypeObject),
+        ("ob_type", _Ptr[PyObject]),
+        ("ob_size", c_ssize_t),
+        ("name", _Ptr[PyObject]),
+        # not sure why but this is the only thing that works but that's fine because it's the only thing we need
+        ("bound", _Ptr[PyObject]),
+    ]
+
+    @classmethod
+    def from_object(cls, obj) -> Self:
+        """Create a PyObject from an object."""
+        return cls.from_address(address(obj))
 
 
 if __name__ == "__main__":
-    print(PyTypeObject.from_object(type(3.14)))
+    # for k, v in PyObject._fields_:
+    #     print(f"('{k}', {v.__name__}),")
+    # for k, v in PyVarObject._fields_:
+    #     print(f"('{k}', {v.__name__}),")
+    # for k, v in PyTypeObject._fields_:
+    #     print(f"('{k}', {v.__name__}),")
+    print(PyTypeObject.from_object(type(3.14)).tp_name)
+    print(PyTypeObject.from_object(type(3.14)).tp_base)
+    print(PyTypeObject.from_object(type(3.14)).ob_type)
+    for k, v in PyTypeVarObject._fields_:
+        print(f"('{k}', {v.__name__}),")

mlir/extras/dialects/ext/func.py

@@ -308,7 +308,7 @@ def __getitem__(self, item):
         generics = copy.deepcopy(self.generics)
         for i, t in enumerate(generics):
             if sys.version_info >= (3, 12):
-                type_var_bound = PyTypeVarObject.try_from(t).bound
+                type_var_bound = PyTypeVarObject.from_object(t).bound
             else:
                 type_var_bound = t.__bound__
             if type_var_bound:

requirements.txt

@@ -1,5 +1,4 @@
 PyYAML>=5.4.0
 bytecode @ git+https://github.com/MatthieuDartiailh/[email protected]
 cloudpickle>=3.0.0
-einspect @ git+https://github.com/makslevental/einspect@makslevental/bump-py.3.13
 numpy>=1.19.5, <=2.1.2

tests/test_gpu.py

@@ -610,7 +610,7 @@ def fun2[foo, bar, A: foo + bar]():
     A_type_param = fun2.__type_params__[2]
 
 
-    a = PyTypeVarObject.try_from(A_type_param)
+    a = PyTypeVarObject.from_object(A_type_param)
     a_something = a.bound.contents.into_object()
     a_something.__closure__[0].cell_contents = 5
     a_something.__closure__[1].cell_contents = 7