From cd54cfa62c9ccf17bc1110f9ebe0bd4762b92787 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 25 Jun 2015 18:42:41 -0500
Subject: [PATCH] Cffi pickling and other minor issues
---
gen_wrap.py | 21 ++++++++++++---------
islpy/__init__.py | 35 ++++++++++++++++++++++++++---------
islpy/_isl_build.py | 12 ++++++++++++
test/test_isl.py | 5 +++--
4 files changed, 53 insertions(+), 20 deletions(-)
create mode 100644 islpy/_isl_build.py
diff --git a/gen_wrap.py b/gen_wrap.py
index 99c7e06..6d4fdd6 100644
--- a/gen_wrap.py
+++ b/gen_wrap.py
@@ -1075,15 +1075,18 @@ def write_method_wrapper(gen, cls_name, meth):
elif (arg.base_type == "void"
and arg.ptr == "*"
and arg.name == "user"):
- raise SignatureNotSupported("void user")
-
- # body.append("Py_INCREF(arg_%s.ptr());" % arg.name)
- # passed_args.append("arg_%s.ptr()" % arg.name)
- # input_args.append("py::object %s" % ("arg_"+arg.name))
- # post_call.append("""
- # isl_%s_set_free_user(result, my_decref);
- # """ % meth.cls)
- # docs.append(":param %s: a user-specified Python object" % arg.name)
+
+ passed_args.append("ffi.NULL")
+ input_args.append(arg.name)
+
+ pre_call("""
+ if {name} is not None:
+ raise Error("passing non-None arguments for '{name}' "
+ "is not yet supported")
+ """
+ .format(name=arg.name))
+
+ docs.append(":param %s: None" % arg.name)
else:
raise SignatureNotSupported("arg type %s %s" % (arg.base_type, arg.ptr))
diff --git a/islpy/__init__.py b/islpy/__init__.py
index e0a7a98..fa907d7 100644
--- a/islpy/__init__.py
+++ b/islpy/__init__.py
@@ -108,12 +108,30 @@ EXPR_CLASSES = tuple(cls for cls in ALL_CLASSES
def _add_functionality():
+ # {{{ Context
+
def context_init(self):
new_ctx = Context.alloc()
self._setup(new_ctx.data)
new_ctx._release()
+ def context_getstate(self):
+ if self.data == _DEFAULT_CONTEXT.data:
+ return ("default",)
+ else:
+ return (None,)
+
+ def context_setstate(self, data):
+ if data[0] == "default":
+ self._setup(_DEFAULT_CONTEXT.data)
+ else:
+ context_init(self)
+
Context.__init__ = context_init
+ Context.__getstate__ = context_getstate
+ Context.__setstate__ = context_setstate
+
+ # }}}
# {{{ generic initialization, pickling
@@ -135,22 +153,21 @@ def _add_functionality():
assert self._made_from_string
del self._made_from_string
- def generic_getnewargs(self):
- prn = Printer.to_str(self.get_ctx())
- getattr(prn, "print_"+self._base_name)(self)
- return (prn.get_str(),)
-
def generic_getstate(self):
- return {}
+ ctx = self.get_ctx()
+ prn = Printer.to_str(ctx)
+ getattr(prn, "print_"+self._base_name)(self)
+ return (ctx, prn.get_str())
- def generic_setstate(self):
- pass
+ def generic_setstate(self, data):
+ ctx, new_str = data
+ new_inst = self.read_from_str(ctx, new_str)
+ self._setup(new_inst._release())
for cls in ALL_CLASSES:
if hasattr(cls, "read_from_str"):
cls.__new__ = staticmethod(obj_new_from_string)
cls.__init__ = obj_bogus_init
- cls.__getnewargs__ = generic_getnewargs
cls.__getstate__ = generic_getstate
cls.__setstate__ = generic_setstate
diff --git a/islpy/_isl_build.py b/islpy/_isl_build.py
new file mode 100644
index 0000000..5822879
--- /dev/null
+++ b/islpy/_isl_build.py
@@ -0,0 +1,12 @@
+from cffi import FFI
+
+ffi = FFI()
+ffi.set_source("_isl_cffi", None)
+
+with open("wrapped-functions.h", "rt") as header_f:
+ header = header_f.read()
+
+ffi.cdef(header)
+
+if __name__ == "__main__":
+ ffi.compile()
diff --git a/test/test_isl.py b/test/test_isl.py
index 68fc700..4f7a9cf 100644
--- a/test/test_isl.py
+++ b/test/test_isl.py
@@ -53,7 +53,7 @@ def test_pwqpoly():
pwqp.foreach_piece(piece_handler)
-def test_id_user():
+def no_test_id_user():
ctx = isl.Context()
foo = isl.Id("foo", context=ctx) # noqa
t = (1, 2)
@@ -84,7 +84,8 @@ def test_pickling():
for inst in instances:
inst2 = loads(dumps(inst))
- assert inst.plain_is_equal(inst2)
+ assert inst.space == inst2.space
+ assert inst.is_equal(inst2)
def test_get_id_dict():
--
GitLab