From a3e180789bbdf764223b9e12221df06b21b75049 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Wed, 22 Feb 2017 17:47:34 -0600
Subject: [PATCH] Use proper attribute to override get_grid_sizes_for_insn_ids
---
loopy/kernel/__init__.py | 15 +++++++++------
loopy/kernel/tools.py | 3 ++-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/loopy/kernel/__init__.py b/loopy/kernel/__init__.py
index d65aca6e9..793d31791 100644
--- a/loopy/kernel/__init__.py
+++ b/loopy/kernel/__init__.py
@@ -199,7 +199,7 @@ class LoopKernel(ImmutableRecordWithoutPickling):
# When kernels get intersected in slab decomposition,
# their grid sizes shouldn't change. This provides
# a way to forward sub-kernel grid size requests.
- get_grid_sizes_for_insn_ids=None):
+ overridden_get_grid_sizes_for_insn_ids=None):
if cache_manager is None:
from loopy.kernel.tools import SetOperationCacheManager
@@ -265,10 +265,6 @@ class LoopKernel(ImmutableRecordWithoutPickling):
if np.iinfo(index_dtype.numpy_dtype).min >= 0:
raise TypeError("index_dtype must be signed")
- if get_grid_sizes_for_insn_ids is not None:
- # overwrites method down below
- self.get_grid_sizes_for_insn_ids = get_grid_sizes_for_insn_ids
-
if state not in [
kernel_state.INITIAL,
kernel_state.PREPROCESSED,
@@ -302,7 +298,9 @@ class LoopKernel(ImmutableRecordWithoutPickling):
index_dtype=index_dtype,
options=options,
state=state,
- target=target)
+ target=target,
+ overridden_get_grid_sizes_for_insn_ids=(
+ overridden_get_grid_sizes_for_insn_ids))
self._kernel_executor_cache = {}
@@ -923,6 +921,11 @@ class LoopKernel(ImmutableRecordWithoutPickling):
*global_size* and *local_size* are :class:`islpy.PwAff` objects.
"""
+ if self.overridden_get_grid_sizes_for_insn_ids:
+ return self.overridden_get_grid_sizes_for_insn_ids(
+ insn_ids,
+ ignore_auto=ignore_auto)
+
all_inames_by_insns = set()
for insn_id in insn_ids:
all_inames_by_insns |= self.insn_inames(insn_id)
diff --git a/loopy/kernel/tools.py b/loopy/kernel/tools.py
index 5f1239632..539bfbed0 100644
--- a/loopy/kernel/tools.py
+++ b/loopy/kernel/tools.py
@@ -439,7 +439,8 @@ class DomainChanger:
# Changing the domain might look like it wants to change grid
# sizes. Not true.
# (Relevant for 'slab decomposition')
- get_grid_sizes_for_insn_ids=self.kernel.get_grid_sizes_for_insn_ids)
+ overridden_get_grid_sizes_for_insn_ids=(
+ self.kernel.get_grid_sizes_for_insn_ids))
# }}}
--
GitLab