diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2011-06-20 19:32:08 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-06-20 19:32:08 -0600 |
| commit | c60425a59a845d998a98d2f17a728db4563e5824 (patch) | |
| tree | 4b74c4ecee830f3251492dda10f3d6ad014302a1 /numpy | |
| parent | e4d790f005331e5ff59d54b9954ab56ec847bafc (diff) | |
| download | numpy-c60425a59a845d998a98d2f17a728db4563e5824.tar.gz | |
STY: Delete commented out lines and add some comments.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/setup.py | 6 | ||||
| -rw-r--r-- | numpy/core/src/npysort/npysort_common.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 92f96c233..f95107ae8 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -613,7 +613,7 @@ def configuration(parent_package='',top_path=None): config.add_data_dir('include/numpy/fenv') ####################################################################### - # dummy module # + # dummy module # ####################################################################### # npymath needs the config.h and numpyconfig.h files to be generated, but @@ -669,11 +669,9 @@ def configuration(parent_package='',top_path=None): # npysort library # ####################################################################### - #subst_dict = dict([("sep", os.path.sep), ("pkgname", "numpy.core")]) + # This library is created for the build but it is not installed config.add_library('npysort', sources = [join('src', 'npysort', 'sort.c.src')]) -# config.add_npy_pkg_config("npysort.ini.in", "lib/npy-pkg-config", -# subst_dict) ####################################################################### # multiarray module # diff --git a/numpy/core/src/npysort/npysort_common.h b/numpy/core/src/npysort/npysort_common.h index c785b5e71..bc1d278b0 100644 --- a/numpy/core/src/npysort/npysort_common.h +++ b/numpy/core/src/npysort/npysort_common.h @@ -34,6 +34,8 @@ #define CFLOAT_SWAP(a,b) {npy_cfloat tmp = (b); (b)=(a); (a) = tmp;} #define CDOUBLE_SWAP(a,b) {npy_cdouble tmp = (b); (b)=(a); (a) = tmp;} #define CLONGDOUBLE_SWAP(a,b) {npy_clongdouble tmp = (b); (b)=(a); (a) = tmp;} + +/* Need this for the argsort functions */ #define INTP_SWAP(a,b) {npy_intp tmp = (b); (b)=(a); (a) = tmp;} /* |