diff options
| author | Mark Wiebe <mwiebe@enthought.com> | 2011-07-07 12:32:41 -0500 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-07-07 11:54:06 -0600 |
| commit | c5c1a4808bf3c2386c5ee6c39b8156a4978092f7 (patch) | |
| tree | 3cac18ceaa8a19b245efa1837c3d81be8e97c88d /numpy | |
| parent | 62a5ce1b537c9720d45e00b90924e38a432284f1 (diff) | |
| download | numpy-c5c1a4808bf3c2386c5ee6c39b8156a4978092f7.tar.gz | |
ENH: nditer: Rename nditer.c.src to indicate it has just the templated bits
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/SConscript | 2 | ||||
| -rw-r--r-- | numpy/core/code_generators/genapi.py | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 4 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/nditer_templ.c.src (renamed from numpy/core/src/multiarray/nditer.c.src) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index f831515b9..178c7de37 100644 --- a/numpy/core/SConscript +++ b/numpy/core/SConscript @@ -380,7 +380,7 @@ umath_loops_src = env.GenerateFromTemplate(pjoin('src', 'umath', 'loops.c.src')) arraytypes_src = env.GenerateFromTemplate( pjoin('src', 'multiarray', 'arraytypes.c.src')) nditer_src = env.GenerateFromTemplate( - pjoin('src', 'multiarray', 'nditer.c.src')) + pjoin('src', 'multiarray', 'nditer_templ.c.src')) lowlevel_strided_loops_src = env.GenerateFromTemplate( pjoin('src', 'multiarray', 'lowlevel_strided_loops.c.src')) einsum_src = env.GenerateFromTemplate(pjoin('src', 'multiarray', 'einsum.c.src')) diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py index 38628d1c6..29cbb271f 100644 --- a/numpy/core/code_generators/genapi.py +++ b/numpy/core/code_generators/genapi.py @@ -47,10 +47,10 @@ API_FILES = [join('multiarray', 'methods.c'), join('multiarray', 'datetime_strings.c'), join('multiarray', 'datetime_busday.c'), join('multiarray', 'datetime_busdaycal.c'), - join('multiarray', 'nditer.c.src'), join('multiarray', 'nditer_api.c'), join('multiarray', 'nditer_constr.c'), join('multiarray', 'nditer_pywrap.c'), + join('multiarray', 'nditer_templ.c.src'), join('multiarray', 'einsum.c.src'), join('umath', 'ufunc_object.c'), join('umath', 'ufunc_type_resolution.c'), diff --git a/numpy/core/setup.py b/numpy/core/setup.py index aa3175b20..d5f2edcc3 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -686,7 +686,7 @@ def configuration(parent_package='',top_path=None): subpath = join('src', 'multiarray') sources = [join(local_dir, subpath, 'scalartypes.c.src'), join(local_dir, subpath, 'arraytypes.c.src'), - join(local_dir, subpath, 'nditer.c.src'), + join(local_dir, subpath, 'nditer_templ.c.src'), join(local_dir, subpath, 'lowlevel_strided_loops.c.src'), join(local_dir, subpath, 'einsum.c.src')] @@ -773,7 +773,7 @@ def configuration(parent_package='',top_path=None): join('src', 'multiarray', 'mapping.c'), join('src', 'multiarray', 'methods.c'), join('src', 'multiarray', 'multiarraymodule.c'), - join('src', 'multiarray', 'nditer.c.src'), + join('src', 'multiarray', 'nditer_templ.c.src'), join('src', 'multiarray', 'nditer_api.c'), join('src', 'multiarray', 'nditer_constr.c'), join('src', 'multiarray', 'nditer_pywrap.c'), diff --git a/numpy/core/src/multiarray/nditer.c.src b/numpy/core/src/multiarray/nditer_templ.c.src index 59aae244b..59aae244b 100644 --- a/numpy/core/src/multiarray/nditer.c.src +++ b/numpy/core/src/multiarray/nditer_templ.c.src |