Permalink
Browse files

REF No need for separate 32 and 64 bit C files.

  • Loading branch information...
1 parent 4c62f7d commit aeb5daa60945ce932e53fdd33e544cd2ca343c1c @kwgoodman committed Apr 25, 2013
Showing with 62,834 additions and 625,972 deletions.
  1. +6 −8 Makefile
  2. 0 bottleneck/src/{move/64bit → func}/.gitignore
  3. +0 −1 bottleneck/src/func/32bit/.gitignore
  4. +0 −1 bottleneck/src/func/64bit/.gitignore
  5. +0 −332,082 bottleneck/src/func/64bit/func.c
  6. +37,771 −37,771 bottleneck/src/func/{32bit → }/func.c
  7. +1 −10 bottleneck/src/func/setup.py
  8. +2 −4 bottleneck/src/makepyx.py
  9. 0 bottleneck/src/move/{32bit → }/.gitignore
  10. +0 −231,022 bottleneck/src/move/64bit/move.c
  11. +25,009 −25,009 bottleneck/src/move/{32bit → }/move.c
  12. +1 −9 bottleneck/src/move/setup.py
  13. +1 −1 bottleneck/src/template/func/allnan.py
  14. +1 −1 bottleneck/src/template/func/anynan.py
  15. +1 −1 bottleneck/src/template/func/argpartsort.py
  16. +3 −3 bottleneck/src/template/func/func.py
  17. +1 −1 bottleneck/src/template/func/median.py
  18. +1 −1 bottleneck/src/template/func/nanargmax.py
  19. +1 −1 bottleneck/src/template/func/nanargmin.py
  20. +1 −1 bottleneck/src/template/func/nanmax.py
  21. +1 −1 bottleneck/src/template/func/nanmean.py
  22. +1 −1 bottleneck/src/template/func/nanmedian.py
  23. +1 −1 bottleneck/src/template/func/nanmin.py
  24. +1 −1 bottleneck/src/template/func/nanrankdata.py
  25. +1 −1 bottleneck/src/template/func/nanstd.py
  26. +1 −1 bottleneck/src/template/func/nansum.py
  27. +1 −1 bottleneck/src/template/func/nanvar.py
  28. +1 −1 bottleneck/src/template/func/nn.py
  29. +1 −1 bottleneck/src/template/func/partsort.py
  30. +1 −1 bottleneck/src/template/func/rankdata.py
  31. +1 −1 bottleneck/src/template/func/replace.py
  32. +1 −1 bottleneck/src/template/func/ss.py
  33. +3 −3 bottleneck/src/template/move/move.py
  34. +1 −1 bottleneck/src/template/move/move_max.py
  35. +1 −1 bottleneck/src/template/move/move_mean.py
  36. +2 −2 bottleneck/src/template/move/move_median.py
  37. +1 −1 bottleneck/src/template/move/move_min.py
  38. +1 −1 bottleneck/src/template/move/move_nanmax.py
  39. +1 −1 bottleneck/src/template/move/move_nanmean.py
  40. +1 −1 bottleneck/src/template/move/move_nanmin.py
  41. +1 −1 bottleneck/src/template/move/move_nanstd.py
  42. +1 −1 bottleneck/src/template/move/move_nansum.py
  43. +1 −1 bottleneck/src/template/move/move_std.py
  44. +1 −1 bottleneck/src/template/move/move_sum.py
  45. +5 −7 bottleneck/src/template/template.py
  46. +2 −11 setup.py
View
@@ -23,10 +23,8 @@ pyx:
${PYTHON} -c "from bottleneck.src.makepyx import makepyx; makepyx()"
cfiles:
- cython ${srcdir}/func/32bit/func.pyx
- cython ${srcdir}/func/64bit/func.pyx
- cython ${srcdir}/move/32bit/move.pyx
- cython ${srcdir}/move/64bit/move.pyx
+ cython ${srcdir}/func/func.pyx
+ cython ${srcdir}/move/move.pyx
build: funcs moves
@@ -58,7 +56,7 @@ sdist: pyx
.PHONY: clean
clean:
rm -rf ${srcdir}/*~ ${srcdir}/*.so ${srcdir}/*.c ${srcdir}/*.o ${srcdir}/*.html ${srcdir}/build ${srcdir}/../*.so
- rm -rf ${srcdir}/func/32bit/*.c ${srcdir}/func/64bit/*.c
- rm -rf ${srcdir}/move/32bit/*.c ${srcdir}/move/64bit/*.c
- rm -rf ${srcdir}/func/32bit/*.pyx ${srcdir}/func/64bit/*.pyx
- rm -rf ${srcdir}/move/32bit/*.pyx ${srcdir}/move/64bit/*.pyx
+ rm -rf ${srcdir}/func/*.c
+ rm -rf ${srcdir}/move/*.c
+ rm -rf ${srcdir}/func/*.pyx
+ rm -rf ${srcdir}/move/*.pyx
@@ -1 +0,0 @@
-*.pyx
@@ -1 +0,0 @@
-*.pyx
Oops, something went wrong.

0 comments on commit aeb5daa

Please sign in to comment.