From 57c916f9615c08f2dcc4f90fa170cdb4d0623761 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sat, 14 Jul 2018 15:31:05 +0200 Subject: [PATCH 1/3] Update aksetup --- aksetup_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aksetup_helper.py b/aksetup_helper.py index 5dc1413..50507af 100644 --- a/aksetup_helper.py +++ b/aksetup_helper.py @@ -285,7 +285,7 @@ class ConfigSchema: if value is not None: filevars[key] = value - keys = filevars.keys() + keys = list(filevars.keys()) keys.sort() outf = open(filename, "w") -- GitLab From 57e5528d22b36174fa6f819aa3fb4835ab0b7ebc Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sat, 14 Jul 2018 15:31:36 +0200 Subject: [PATCH 2/3] Add lexmin test scavenged from mailing list --- test/test_isl.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/test_isl.py b/test/test_isl.py index 28f023d..46855df 100644 --- a/test/test_isl.py +++ b/test/test_isl.py @@ -300,6 +300,14 @@ def test_creation_error(): "{ [i0, i1, i2] : 0 <= i0 < n1 and 0 and 0 <= i2 <= 15 }") +def test_lexmin(): + print(isl.Set("""{ [s] : exists a,b,c : + 0 <= a <= 5 and 1 <= b <= 4 and 2 <= c <= 7 and + ((2 <= b and b <= 3) implies (a <= 1 or a >= 3)) and + ((not (c < 5 or b > 3)) implies (a > 2 and c < 3)) and s = a + b + c } + """).lexmin()) + + if __name__ == "__main__": import sys if len(sys.argv) > 1: -- GitLab From b975e61fcec17c2cf79e672b5c6c913312b05f8a Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 26 Jul 2018 20:54:53 -0500 Subject: [PATCH 3/3] Update isl to 0.20 --- gen_wrap.py | 6 ++++-- isl | 2 +- setup.py | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gen_wrap.py b/gen_wrap.py index 3e5231d..cbbe940 100644 --- a/gen_wrap.py +++ b/gen_wrap.py @@ -140,14 +140,16 @@ CLASSES = [ "basic_set_list", "basic_map_list", "set_list", "map_list", "union_set_list", "constraint_list", - "aff_list", "pw_aff_list", + "aff_list", "pw_aff_list", "pw_multi_aff_list", "ast_expr_list", "ast_node_list", + "pw_qpolynomial_list", + "pw_qpolynomial_fold_list", # maps "id_to_ast_expr", # others - "printer", "val", "multi_val", "vec", "mat", + "printer", "val", "multi_val", "vec", "mat", "fixed_box", "aff", "pw_aff", "union_pw_aff", "multi_aff", "multi_pw_aff", "pw_multi_aff", "union_pw_multi_aff", "union_pw_aff_list", diff --git a/isl b/isl index 0ce949a..fbdfd06 160000 --- a/isl +++ b/isl @@ -1 +1 @@ -Subproject commit 0ce949a1277de2e3121ed5715bdde639d6f4ba0f +Subproject commit fbdfd06a010f4d19ed863d54f5fa46044c4a59a4 diff --git a/setup.py b/setup.py index 6f273c3..6cc8bb3 100644 --- a/setup.py +++ b/setup.py @@ -130,14 +130,21 @@ def main(): "isl_multi_floor.c", "isl_multi_apply_union_set.c", "isl_multi_cmp.c", + "isl_multi_pw_aff_explicit_domain.c", "isl_multi_hash.c", "isl_multi_dims.c", + "isl_multi_explicit_domain.c", + "isl_multi_no_explicit_domain.c", + "isl_multi_align_set.c", + "isl_multi_align_union_set.c", + "isl_multi_union_pw_aff_explicit_domain.c", "isl_union_templ.c", "isl_union_multi.c", "isl_union_eval.c", "isl_union_neg.c", "isl_union_single.c", "isl_pw_hash.c", + "isl_pw_eval.c", "isl_pw_union_opt.c", "isl_pw_union_opt.c", ] -- GitLab