From 71b36c932c933a72c5d387f7b7299988c27f5ea5 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 7 Dec 2016 12:47:23 -0600 Subject: [PATCH 1/2] Default terminal colors to on --- loopy/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loopy/options.py b/loopy/options.py index 33b216e1e..7c778681d 100644 --- a/loopy/options.py +++ b/loopy/options.py @@ -28,7 +28,7 @@ from pytools import ImmutableRecord import re -ALLOW_TERMINAL_COLORS = False +ALLOW_TERMINAL_COLORS = True class _ColoramaStub(object): -- GitLab From 79a043724dd77cba4efe3a7e05984582e404ebc0 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 7 Dec 2016 12:48:24 -0600 Subject: [PATCH 2/2] Fix unintended modification of inames_to_dup in insn_options_stack --- loopy/kernel/creation.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/loopy/kernel/creation.py b/loopy/kernel/creation.py index 82f7ac566..019b89959 100644 --- a/loopy/kernel/creation.py +++ b/loopy/kernel/creation.py @@ -211,10 +211,15 @@ def parse_insn_options(opt_dict, options_str, assignee_names=None): for value in opt_value.split(":"): arrow_idx = value.find("->") if arrow_idx >= 0: - result.setdefault("inames_to_dup", []).append( - (value[:arrow_idx], value[arrow_idx+2:])) + result["inames_to_dup"] = ( + result.get("inames_to_dup", []) + + + [(value[:arrow_idx], value[arrow_idx+2:])]) else: - result.setdefault("inames_to_dup", []).append((value, None)) + result["inames_to_dup"] = ( + result.get("inames_to_dup", []) + + + [(value, None)]) elif opt_key == "dep" and opt_value is not None: if opt_value.startswith("*"): @@ -1765,6 +1770,9 @@ def make_kernel(domains, instructions, kernel_data=["..."], **kwargs): *seq_dependencies* added. """ + logger.info( + "%s: kernel creation start" % kwargs.get("name", "(unnamed)")) + defines = kwargs.pop("defines", {}) default_order = kwargs.pop("default_order", "C") default_offset = kwargs.pop("default_offset", 0) @@ -1904,6 +1912,7 @@ def make_kernel(domains, instructions, kernel_data=["..."], **kwargs): # Must infer inames before determining shapes. # ------------------------------------------------------------------------- knl = determine_shapes_of_temporaries(knl) + knl = expand_defines_in_shapes(knl, defines) knl = guess_arg_shape_if_requested(knl, default_order) knl = apply_default_order_to_args(knl, default_order) @@ -1924,6 +1933,9 @@ def make_kernel(domains, instructions, kernel_data=["..."], **kwargs): from loopy.preprocess import prepare_for_caching knl = prepare_for_caching(knl) + logger.info( + "%s: kernel creation done" % knl.name) + return knl # }}} -- GitLab