From a03d4d0a3119a743ac72d21ccd029fa53fb32a12 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sat, 28 Feb 2015 14:01:19 -0600
Subject: [PATCH] Shave off a few parameters in precompute, simplifying code
along the way
---
loopy/precompute.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/loopy/precompute.py b/loopy/precompute.py
index 2bde8022c..45daded04 100644
--- a/loopy/precompute.py
+++ b/loopy/precompute.py
@@ -249,7 +249,7 @@ def find_var_base_indices_and_shape_from_inames(
return list(zip(*base_indices_and_sizes))
-def compute_bounds(kernel, domain, subst_name, stor2sweep,
+def compute_bounds(kernel, domain, stor2sweep,
primed_sweep_inames, storage_axis_names):
bounds_footprint_map = move_to_par_from_out(
@@ -259,9 +259,7 @@ def compute_bounds(kernel, domain, subst_name, stor2sweep,
storage_domain = bounds_footprint_map.domain().coalesce()
if not storage_domain.is_bounded():
- raise RuntimeError("In precomputation of substitution '%s': "
- "sweep did not result in a bounded storage domain"
- % subst_name)
+ raise RuntimeError("sweep did not result in a bounded storage domain")
return find_var_base_indices_and_shape_from_inames(
storage_domain, [saxis+"'" for saxis in storage_axis_names],
@@ -270,7 +268,7 @@ def compute_bounds(kernel, domain, subst_name, stor2sweep,
# }}}
-def get_access_info(kernel, domain, subst_name,
+def get_access_info(kernel, domain,
storage_axis_names, storage_axis_sources,
sweep_inames, invocation_descriptors):
@@ -299,7 +297,7 @@ def get_access_info(kernel, domain, subst_name,
sweep_inames, primed_sweep_inames, prime_sweep_inames)
storage_base_indices, storage_shape = compute_bounds(
- kernel, domain, subst_name, stor2sweep, primed_sweep_inames,
+ kernel, domain, stor2sweep, primed_sweep_inames,
storage_axis_names)
# compute augmented domain
@@ -805,7 +803,7 @@ def precompute(kernel, subst_use, sweep_inames=[], within=None,
(non1_storage_axis_names, new_domain,
storage_base_indices, non1_storage_base_indices, non1_storage_shape) = \
- get_access_info(kernel, domch.domain, subst_name,
+ get_access_info(kernel, domch.domain,
storage_axis_names, storage_axis_sources,
sweep_inames, invocation_descriptors)
--
GitLab