From a3abcb86946056e3cb9870d5f71f49f628f09bc2 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 16 Apr 2015 14:26:26 -0500
Subject: [PATCH] Naming/cleanups
---
doc/reference.rst | 2 +-
loopy/__init__.py | 4 ++--
loopy/{array_buffer.py => array_buffer_map.py} | 0
loopy/{buffer_writes.py => buffer.py} | 11 +++++------
loopy/precompute.py | 2 +-
test/test_fortran.py | 2 +-
6 files changed, 10 insertions(+), 11 deletions(-)
rename loopy/{array_buffer.py => array_buffer_map.py} (100%)
rename loopy/{buffer_writes.py => buffer.py} (98%)
diff --git a/doc/reference.rst b/doc/reference.rst
index 75592a63c..9d75a924b 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -402,7 +402,7 @@ Caching, Precomputation and Prefetching
.. autofunction:: add_prefetch
-.. autofunction:: buffer_write
+.. autofunction:: buffer_array
Influencing data access
^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/loopy/__init__.py b/loopy/__init__.py
index d9f67a437..4a5b54040 100644
--- a/loopy/__init__.py
+++ b/loopy/__init__.py
@@ -55,7 +55,7 @@ from loopy.kernel.creation import make_kernel, UniqueName
from loopy.library.reduction import register_reduction_parser
from loopy.subst import extract_subst, expand_subst, temporary_to_subst
from loopy.precompute import precompute
-from loopy.buffer_writes import buffer_write
+from loopy.buffer import buffer_array
from loopy.padding import (split_arg_axis, find_padding_multiple,
add_padding)
from loopy.preprocess import (preprocess_kernel, realize_reduction,
@@ -83,7 +83,7 @@ __all__ = [
"register_reduction_parser",
"extract_subst", "expand_subst", "temporary_to_subst",
- "precompute", "buffer_write",
+ "precompute", "buffer_array",
"split_arg_axis", "find_padding_multiple", "add_padding",
"get_dot_dependency_graph",
diff --git a/loopy/array_buffer.py b/loopy/array_buffer_map.py
similarity index 100%
rename from loopy/array_buffer.py
rename to loopy/array_buffer_map.py
diff --git a/loopy/buffer_writes.py b/loopy/buffer.py
similarity index 98%
rename from loopy/buffer_writes.py
rename to loopy/buffer.py
index 7616dcba5..e8e15dbdf 100644
--- a/loopy/buffer_writes.py
+++ b/loopy/buffer.py
@@ -1,6 +1,5 @@
from __future__ import division, absolute_import
-import six
-from six.moves import range, zip
+from six.moves import range
__copyright__ = "Copyright (C) 2012-2015 Andreas Kloeckner"
@@ -24,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
"""
-from loopy.array_buffer import (ArrayToBufferMap, NoOpArrayToBufferMap,
+from loopy.array_buffer_map import (ArrayToBufferMap, NoOpArrayToBufferMap,
AccessDescriptor)
from loopy.symbolic import (get_dependencies, ExpandingIdentityMapper,
SubstitutionMapper)
@@ -111,7 +110,7 @@ class ArrayAccessReplacer(ExpandingIdentityMapper):
# }}}
-def buffer_write(kernel, var_name, buffer_inames, init_expression=None,
+def buffer_array(kernel, var_name, buffer_inames, init_expression=None,
store_expression=None, within=None, default_tag="l.auto",
temporary_is_local=None, fetch_bounding_box=False):
"""
@@ -186,7 +185,7 @@ def buffer_write(kernel, var_name, buffer_inames, init_expression=None,
expands_footprint=True,
storage_axis_exprs=index))
- # {{{ use given / find new storage_axes
+ # {{{ find fetch/store inames
init_inames = []
store_inames = []
@@ -204,7 +203,7 @@ def buffer_write(kernel, var_name, buffer_inames, init_expression=None,
# }}}
- # {{{ modify loop domains
+ # {{{ modify loop domain
non1_init_inames = []
non1_store_inames = []
diff --git a/loopy/precompute.py b/loopy/precompute.py
index 3044b8f7d..15b46ecd6 100644
--- a/loopy/precompute.py
+++ b/loopy/precompute.py
@@ -32,7 +32,7 @@ import numpy as np
from pymbolic import var
-from loopy.array_buffer import (ArrayToBufferMap, NoOpArrayToBufferMap,
+from loopy.array_buffer_map import (ArrayToBufferMap, NoOpArrayToBufferMap,
AccessDescriptor)
diff --git a/test/test_fortran.py b/test/test_fortran.py
index eeac0b23a..04be96b04 100644
--- a/test/test_fortran.py
+++ b/test/test_fortran.py
@@ -316,7 +316,7 @@ def test_matmul(ctx_factory, buffer_inames):
knl = lp.precompute(knl, "a_acc", "k_inner,i_inner")
knl = lp.precompute(knl, "b_acc", "j_inner,k_inner")
- knl = lp.buffer_write(knl, "c", buffer_inames=buffer_inames,
+ knl = lp.buffer_array(knl, "c", buffer_inames=buffer_inames,
init_expression="0", store_expression="base+buffer")
#ctx = ctx_factory()
--
GitLab