Add a wrapper for Barvinok

Author: inducer

gen_wrap.py

@@ -1057,9 +1057,22 @@ def write_wrappers(expf, wrapf, methods):
     print("SKIP (%d undocumented methods): %s" % (len(undoc), ", ".join(undoc)))
 
 
-def gen_wrapper(include_dirs):
+ADD_VERSIONS = {
+        "union_pw_aff": 15,
+        "multi_union_pw_aff": 15,
+        "basic_map_list": 15,
+        "map_list": 15,
+        "union_set_list": 15,
+        }
+
+
+def gen_wrapper(include_dirs, include_barvinok=False, isl_version=None):
     fdata = FunctionData(["."] + include_dirs)
-    fdata.read_header("isl_declaration_macros_expanded.h")
+    if isl_version is None:
+        fdata.read_header("isl_declaration_macros_expanded.h")
+    else:
+        fdata.read_header("isl_declaration_macros_expanded_v%d.h"
+                % isl_version)
     fdata.read_header("isl/id.h")
     fdata.read_header("isl/space.h")
     fdata.read_header("isl/set.h")
@@ -1083,10 +1096,20 @@ def gen_wrapper(include_dirs):
     fdata.read_header("isl/ast.h")
     fdata.read_header("isl/ast_build.h")
 
+    if include_barvinok:
+        fdata.read_header("barvinok/isl.h")
+
     for part, classes in PART_TO_CLASSES.items():
         expf = open("src/wrapper/gen-expose-%s.inc" % part, "wt")
         wrapf = open("src/wrapper/gen-wrap-%s.inc" % part, "wt")
 
+        classes = [
+                cls
+                for cls in classes
+                if isl_version is None
+                or ADD_VERSIONS.get(cls) is None
+                or ADD_VERSIONS.get(cls) <= isl_version]
+
         write_wrappers(expf, wrapf, [
             meth
             for cls in classes

isl_declaration_macros.h

@@ -14,10 +14,14 @@ ISL_DECLARE_LIST(pw_aff)
 ISL_DECLARE_LIST(constraint)
 
 ISL_DECLARE_LIST(basic_set)
+#if ISLPY_ISL_VERSION >= 15
 ISL_DECLARE_LIST(basic_map)
+#endif
 ISL_DECLARE_LIST(set)
+#if ISLPY_ISL_VERSION >= 15
 ISL_DECLARE_LIST(map)
 ISL_DECLARE_LIST(union_set)
+#endif
 
 ISL_DECLARE_LIST(ast_expr)
 ISL_DECLARE_LIST(ast_node)