diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2011-06-07 13:48:02 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-06-16 20:15:00 -0600 |
| commit | aa6f11da12873ae8ce1cfde08aa7484ecafdf761 (patch) | |
| tree | d20cc78339173bc03ac0a5ac49b8ad09bfa015e3 /numpy | |
| parent | 60054e398e52c690a3769dea9a25883bf4cae9f4 (diff) | |
| download | numpy-aa6f11da12873ae8ce1cfde08aa7484ecafdf761.tar.gz | |
ENH: Rename the sorting directory to npysort.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/SConscript | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 4 | ||||
| -rw-r--r-- | numpy/core/src/npysort/npy_sort_common.h (renamed from numpy/core/src/sorting/npy_sort_common.h) | 0 | ||||
| -rw-r--r-- | numpy/core/src/npysort/sortmodule.c.src (renamed from numpy/core/src/sorting/sortmodule.c.src) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index 055f3c297..b495af824 100644 --- a/numpy/core/SConscript +++ b/numpy/core/SConscript @@ -384,7 +384,7 @@ nditer_src = env.GenerateFromTemplate( lowlevel_strided_loops_src = env.GenerateFromTemplate( pjoin('src', 'multiarray', 'lowlevel_strided_loops.c.src')) einsum_src = env.GenerateFromTemplate(pjoin('src', 'multiarray', 'einsum.c.src')) -sortmodule_src = env.GenerateFromTemplate(pjoin('src', 'sorting','sortmodule.c.src')) +sortmodule_src = env.GenerateFromTemplate(pjoin('src', 'npysort','sortmodule.c.src')) umathmodule_src = env.GenerateFromTemplate(pjoin('src', 'umath', 'umathmodule.c.src')) umath_tests_src = env.GenerateFromTemplate(pjoin('src', 'umath', diff --git a/numpy/core/setup.py b/numpy/core/setup.py index ab4f913c0..5883b09ee 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -653,7 +653,7 @@ def configuration(parent_package='',top_path=None): config.add_include_dirs(join('src', 'npymath')) config.add_include_dirs(join('src', 'multiarray')) config.add_include_dirs(join('src', 'umath')) - config.add_include_dirs(join('src', 'sorting')) + config.add_include_dirs(join('src', 'npysort')) config.numpy_include_dirs.extend(config.paths('include')) @@ -669,7 +669,7 @@ def configuration(parent_package='',top_path=None): config.add_data_dir('include/numpy/fenv') config.add_extension('_sort', - sources=[join('src','sorting','sortmodule.c.src'), + sources=[join('src','npysort','sortmodule.c.src'), generate_config_h, generate_numpyconfig_h, generate_numpy_api, diff --git a/numpy/core/src/sorting/npy_sort_common.h b/numpy/core/src/npysort/npy_sort_common.h index d4b3a0b3e..d4b3a0b3e 100644 --- a/numpy/core/src/sorting/npy_sort_common.h +++ b/numpy/core/src/npysort/npy_sort_common.h diff --git a/numpy/core/src/sorting/sortmodule.c.src b/numpy/core/src/npysort/sortmodule.c.src index f242b3393..f242b3393 100644 --- a/numpy/core/src/sorting/sortmodule.c.src +++ b/numpy/core/src/npysort/sortmodule.c.src |