Merge pull request #502 from phaustin/python3

Python3

Demos/Makefile

@@ -5,8 +5,10 @@ test:	all
 	python run_primes.py 20
 	python run_numeric_demo.py
 	python run_spam.py
+	python integrate_timing.py
 	cd callback; $(MAKE) test
 
+	cd embed; $(MAKE) test
 clean:
 	@echo Cleaning Demos
 	@rm -f *.c *.o *.so *~ core

Demos/Readme_demos.rst

+* To run demos do::
+
+    cd Demos
+    make test
+
+  which runs run_primes.py, run_numeric_demo.py, run_spam.py,
+  integrate_timing.py, callback/runcheese.py and embed/embedded
+
+* For other demos::
+
+    cd libraries
+    python setup.py build_ext --inplace
+    python -c 'import call_mymath;print(call_mymath.call_sinc(1))'
+
+  To run one of the benchmarks for 10 iterations to compare cython and python timings::
+
+    cd benchmarks
+    python setup.py build_ext --inplace
+    python nqueens.py -n 10
+    python -c 'import nqueens;print(nqueens.test_n_queens(10))'
+
+  To demo cython/bin/cython_freeze::
+
+    make
+    ./nCr 10 5
+    ./python
+    
+* Build notes
+
+  * benchmarks/chaos.py requires cython 0.24 or newer
+
+  * embed and freeze work for python2, require cython 0.24 or higher
+    for python 3.5
+    
+

Demos/benchmarks/setup.py

@@ -9,5 +9,5 @@ setup(
   name = 'benchmarks',
   ext_modules = cythonize("*.py", language_level=3, annotate=True,
                           compiler_directives=directives,
-                          exclude="setup.py"),
+                          exclude=["setup.py"]),
 )

Demos/callback/cheese.pyx

@@ -10,4 +10,5 @@ def find(f):
     find_cheeses(callback, <void*>f)
     
 cdef void callback(char *name, void *f):
-    (<object>f)(name)
+    (<object>f)(name.decode('utf-8'))
+    

Demos/callback/run_cheese.py

@@ -5,3 +5,4 @@ def report_cheese(name):
 
 cheese.find(report_cheese)
 
+

Demos/freeze/Makefile

@@ -6,12 +6,16 @@ RST2HTML = rst2html
 
 PY_LDFLAGS = $(shell $(PYTHON) -c 'from distutils.sysconfig import get_config_var as g; import sys; sys.stdout.write(" ".join([g("LINKFORSHARED"), "-L"+g("LIBPL")]) + "\n")')
 PY_CPPFLAGS = $(shell $(PYTHON) -c 'from distutils.sysconfig import *; import sys; sys.stdout.write("-I"+get_python_inc() + "\n")')
-PY_LDLIBS = $(shell $(PYTHON) -c 'from distutils.sysconfig import get_config_var as g; import sys; sys.stdout.write(" ".join(["-lpython"+g("VERSION"), g("SYSLIBS"), g("LIBS"), g("LOCALMODLIBS")]) + "\n")')
+LIBDIR1 := $(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBDIR'))")
+LIBDIR2 := $(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBPL'))")
+PYLIB := $(shell $(PYTHON) -c "from distutils import sysconfig; print(sysconfig.get_config_var('LIBRARY')[3:-2])")
+LIBS := $(shell $(PYTHON) -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'))")
 
 CFLAGS = -fPIC -fno-strict-aliasing -g -O2 -Wall -Wextra
 CPPFLAGS = $(PY_CPPFLAGS)
 LDFLAGS = $(PY_LDFLAGS)
-LDLIBS = $(PY_LDLIBS)
+LDLIBS = -L$(LIBDIR1) -L$(LIBDIR2) -l$(PYLIB)
+
 
 
 # Name of executable

Demos/integrate_timing.py

@@ -8,7 +8,7 @@ number = 10
 py_time = None
 for m in ('integrate0', 'integrate1', 'integrate2'):
     print(m)
-    t = min(timeit.repeat("integrate_f(0.0, 10.0, 10000000)", "from %s import integrate_f" % m, number=number))
+    t = min(timeit.repeat("integrate_f(0.0, 10.0, 100000)", "from %s import integrate_f" % m, number=number))
     if py_time is None:
         py_time = t
     print("    ", t / number, "s")

Demos/run_numeric_demo.py

-import Numeric
-import numeric_demo
+import numpy
+import numpy_demo
 
-a = Numeric.array([[1.0, 3.5, 8.4], [2.3, 6.6, 4.1]], "f")
-numeric_demo.print_2d_array(a)
+a = numpy.array([1.0, 3.5, 8.4, 2.3, 6.6, 4.1], "d")
+numpy_demo.sum_of_squares(a)

bin/cython_freeze

@@ -5,6 +5,7 @@ Requires Cython 0.11.2 (or perhaps newer).
 
 See Demos/freeze/README.txt for more details.
 """
+from __future__ import print_function
 
 import optparse
 from os.path import splitext, basename
@@ -30,7 +31,7 @@ if options.output:
 
 modules = [basename(splitext(x)[0]).replace('.', '_') for x in args]
 
-print """\
+print("""\
 #include <Python.h>
 #include <locale.h>
 #include <stdio.h>
@@ -45,25 +46,25 @@ print """\
 #else
 # define MODINIT(name)  PyInit_ ## name
 #endif
-"""
+""")
 
 for name in modules:
-    print "PyMODINIT_FUNC MODINIT(%s) (void);" % name
+    print("PyMODINIT_FUNC MODINIT(%s) (void);" % name)
 
-print """
-static struct _inittab inittab[] = {"""
+print("""
+static struct _inittab inittab[] = {""")
 
 for name in modules:
-    print '    {"%(name)s", MODINIT(%(name)s)},' % {'name' : name}
+    print('    {"%(name)s", MODINIT(%(name)s)},' % {'name' : name})
 
-print """    {NULL, NULL}
+print("""    {NULL, NULL}
 };
-""",
+""", end=' ')
 
 if not options.pymain:
-    print "\nextern int __pyx_module_is_main_%s;" % modules[0]
+    print("\nextern int __pyx_module_is_main_%s;" % modules[0])
 
-print """
+print("""
 #if PY_MAJOR_VERSION < 3
 int main(int argc, char** argv) {
 #elif defined(WIN32) || defined(MS_WINDOWS)
@@ -71,13 +72,13 @@ int wmain(int argc, wchar_t **argv) {
 #else
 static int python_main(int argc, wchar_t **argv) {
 #endif
-""",
+""", end=' ')
 if not options.pymain:
-    print """\
+    print("""\
     PyObject *m = NULL;
     int r = 0;
-""",
-print """\
+""", end=' ')
+print("""\
     /* 754 requires that FP exceptions run in "no stop" mode by default,
      * and until C vendors implement C99's ways to control FP exceptions,
      * Python requires non-stop mode.  Alas, some platforms enable FP
@@ -93,14 +94,14 @@ print """\
         fprintf(stderr, "No memory\\n");
         exit(1);
     }
-""",
+""", end=' ')
 if options.pymain:
-    print """\
+    print("""\
     return Py_Main(argc, argv);
 }
-"""
+""")
 else:
-    print """\
+    print("""\
     Py_SetProgramName(argv[0]);
     Py_Initialize();
     PySys_SetArgv(argc, argv);
@@ -118,9 +119,9 @@ else:
     Py_Finalize();
     return r;
 }
-""" % {'main' : modules[0]},
+""" % {'main' : modules[0]}, end=' ')
 
-print r"""
+print(r"""
 #if PY_MAJOR_VERSION >= 3 && !defined(WIN32) && !defined(MS_WINDOWS)
 static wchar_t*
 char2wchar(char* arg)
@@ -254,4 +255,4 @@ main(int argc, char **argv)
         free(argv_copy2);
         return res;
 }
-#endif"""
+#endif""")