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,140 +119,140 @@ 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)
 {
-	wchar_t *res;
+        wchar_t *res;
 #ifdef HAVE_BROKEN_MBSTOWCS
-	/* Some platforms have a broken implementation of
-	 * mbstowcs which does not count the characters that
-	 * would result from conversion.  Use an upper bound.
-	 */
-	size_t argsize = strlen(arg);
+        /* Some platforms have a broken implementation of
+         * mbstowcs which does not count the characters that
+         * would result from conversion.  Use an upper bound.
+         */
+        size_t argsize = strlen(arg);
 #else
-	size_t argsize = mbstowcs(NULL, arg, 0);
+        size_t argsize = mbstowcs(NULL, arg, 0);
 #endif
-	size_t count;
-	unsigned char *in;
-	wchar_t *out;
+        size_t count;
+        unsigned char *in;
+        wchar_t *out;
 #ifdef HAVE_MBRTOWC
-	mbstate_t mbs;
+        mbstate_t mbs;
 #endif
-	if (argsize != (size_t)-1) {
-		res = (wchar_t *)malloc((argsize+1)*sizeof(wchar_t));
-		if (!res)
-			goto oom;
-		count = mbstowcs(res, arg, argsize+1);
-		if (count != (size_t)-1) {
-			wchar_t *tmp;
-			/* Only use the result if it contains no
-			   surrogate characters. */
-			for (tmp = res; *tmp != 0 &&
-				     (*tmp < 0xd800 || *tmp > 0xdfff); tmp++)
-				;
-			if (*tmp == 0)
-				return res;
-		}
-		free(res);
-	}
-	/* Conversion failed. Fall back to escaping with surrogateescape. */
+        if (argsize != (size_t)-1) {
+                res = (wchar_t *)malloc((argsize+1)*sizeof(wchar_t));
+                if (!res)
+                        goto oom;
+                count = mbstowcs(res, arg, argsize+1);
+                if (count != (size_t)-1) {
+                        wchar_t *tmp;
+                        /* Only use the result if it contains no
+                           surrogate characters. */
+                        for (tmp = res; *tmp != 0 &&
+                                     (*tmp < 0xd800 || *tmp > 0xdfff); tmp++)
+                                ;
+                        if (*tmp == 0)
+                                return res;
+                }
+                free(res);
+        }
+        /* Conversion failed. Fall back to escaping with surrogateescape. */
 #ifdef HAVE_MBRTOWC
-	/* Try conversion with mbrtwoc (C99), and escape non-decodable bytes. */
+        /* Try conversion with mbrtwoc (C99), and escape non-decodable bytes. */
 
-	/* Overallocate; as multi-byte characters are in the argument, the
-	   actual output could use less memory. */
-	argsize = strlen(arg) + 1;
-	res = malloc(argsize*sizeof(wchar_t));
-	if (!res) goto oom;
-	in = (unsigned char*)arg;
-	out = res;
-	memset(&mbs, 0, sizeof mbs);
-	while (argsize) {
-		size_t converted = mbrtowc(out, (char*)in, argsize, &mbs);
-		if (converted == 0)
-			/* Reached end of string; null char stored. */
-			break;
-		if (converted == (size_t)-2) {
-			/* Incomplete character. This should never happen,
-			   since we provide everything that we have -
-			   unless there is a bug in the C library, or I
-			   misunderstood how mbrtowc works. */
-			fprintf(stderr, "unexpected mbrtowc result -2\n");
-			return NULL;
-		}
-		if (converted == (size_t)-1) {
-			/* Conversion error. Escape as UTF-8b, and start over
-			   in the initial shift state. */
-			*out++ = 0xdc00 + *in++;
-			argsize--;
-			memset(&mbs, 0, sizeof mbs);
-			continue;
-		}
-		if (*out >= 0xd800 && *out <= 0xdfff) {
-			/* Surrogate character.  Escape the original
-			   byte sequence with surrogateescape. */
-			argsize -= converted;
-			while (converted--)
-				*out++ = 0xdc00 + *in++;
-			continue;
-		}
-		/* successfully converted some bytes */
-		in += converted;
-		argsize -= converted;
-		out++;
-	}
+        /* Overallocate; as multi-byte characters are in the argument, the
+           actual output could use less memory. */
+        argsize = strlen(arg) + 1;
+        res = malloc(argsize*sizeof(wchar_t));
+        if (!res) goto oom;
+        in = (unsigned char*)arg;
+        out = res;
+        memset(&mbs, 0, sizeof mbs);
+        while (argsize) {
+                size_t converted = mbrtowc(out, (char*)in, argsize, &mbs);
+                if (converted == 0)
+                        /* Reached end of string; null char stored. */
+                        break;
+                if (converted == (size_t)-2) {
+                        /* Incomplete character. This should never happen,
+                           since we provide everything that we have -
+                           unless there is a bug in the C library, or I
+                           misunderstood how mbrtowc works. */
+                        fprintf(stderr, "unexpected mbrtowc result -2\n");
+                        return NULL;
+                }
+                if (converted == (size_t)-1) {
+                        /* Conversion error. Escape as UTF-8b, and start over
+                           in the initial shift state. */
+                        *out++ = 0xdc00 + *in++;
+                        argsize--;
+                        memset(&mbs, 0, sizeof mbs);
+                        continue;
+                }
+                if (*out >= 0xd800 && *out <= 0xdfff) {
+                        /* Surrogate character.  Escape the original
+                           byte sequence with surrogateescape. */
+                        argsize -= converted;
+                        while (converted--)
+                                *out++ = 0xdc00 + *in++;
+                        continue;
+                }
+                /* successfully converted some bytes */
+                in += converted;
+                argsize -= converted;
+                out++;
+        }
 #else
-	/* Cannot use C locale for escaping; manually escape as if charset
-	   is ASCII (i.e. escape all bytes > 128. This will still roundtrip
-	   correctly in the locale's charset, which must be an ASCII superset. */
-	res = malloc((strlen(arg)+1)*sizeof(wchar_t));
-	if (!res) goto oom;
-	in = (unsigned char*)arg;
-	out = res;
-	while(*in)
-		if(*in < 128)
-			*out++ = *in++;
-		else
-			*out++ = 0xdc00 + *in++;
-	*out = 0;
+        /* Cannot use C locale for escaping; manually escape as if charset
+           is ASCII (i.e. escape all bytes > 128. This will still roundtrip
+           correctly in the locale's charset, which must be an ASCII superset. */
+        res = malloc((strlen(arg)+1)*sizeof(wchar_t));
+        if (!res) goto oom;
+        in = (unsigned char*)arg;
+        out = res;
+        while(*in)
+                if(*in < 128)
+                        *out++ = *in++;
+                else
+                        *out++ = 0xdc00 + *in++;
+        *out = 0;
 #endif
-	return res;
+        return res;
 oom:
-	fprintf(stderr, "out of memory\n");
-	return NULL;
+        fprintf(stderr, "out of memory\n");
+        return NULL;
 }
 
 int
 main(int argc, char **argv)
 {
-	wchar_t **argv_copy = (wchar_t **)malloc(sizeof(wchar_t*)*argc);
-	/* We need a second copies, as Python might modify the first one. */
-	wchar_t **argv_copy2 = (wchar_t **)malloc(sizeof(wchar_t*)*argc);
-	int i, res;
-	char *oldloc;
-	if (!argv_copy || !argv_copy2) {
-		fprintf(stderr, "out of memory\n");
-		return 1;
-	}
-	oldloc = strdup(setlocale(LC_ALL, NULL));
-	setlocale(LC_ALL, "");
-	for (i = 0; i < argc; i++) {
-		argv_copy2[i] = argv_copy[i] = char2wchar(argv[i]);
-		if (!argv_copy[i])
-			return 1;
-	}
-	setlocale(LC_ALL, oldloc);
-	free(oldloc);
-	res = python_main(argc, argv_copy);
-	for (i = 0; i < argc; i++) {
-		free(argv_copy2[i]);
-	}
-	free(argv_copy);
-	free(argv_copy2);
-	return res;
+        wchar_t **argv_copy = (wchar_t **)malloc(sizeof(wchar_t*)*argc);
+        /* We need a second copies, as Python might modify the first one. */
+        wchar_t **argv_copy2 = (wchar_t **)malloc(sizeof(wchar_t*)*argc);
+        int i, res;
+        char *oldloc;
+        if (!argv_copy || !argv_copy2) {
+                fprintf(stderr, "out of memory\n");
+                return 1;
+        }
+        oldloc = strdup(setlocale(LC_ALL, NULL));
+        setlocale(LC_ALL, "");
+        for (i = 0; i < argc; i++) {
+                argv_copy2[i] = argv_copy[i] = char2wchar(argv[i]);
+                if (!argv_copy[i])
+                        return 1;
+        }
+        setlocale(LC_ALL, oldloc);
+        free(oldloc);
+        res = python_main(argc, argv_copy);
+        for (i = 0; i < argc; i++) {
+                free(argv_copy2[i]);
+        }
+        free(argv_copy);
+        free(argv_copy2);
+        return res;
 }
-#endif"""
+#endif""")