Python 3 compatibility: future imports, print function, xrange --> range

Technologicat · Technologicat · commit 4889b7d6cbad · 2017-04-25T14:44:08.000+03:00
diff --git a/examples/wlsqm_example.py b/examples/wlsqm_example.py
@@ -851,9 +851,9 @@ def test2d():
 #    temp_x = np.array( [ (x,y) for x,y in zip(X2lin,Y2lin) ] )
 #    out = wlsqm.interpolate_fit( xi, fi, dimension=2, order=fit_order, x=temp_x )
 #    out = np.reshape( out, shp )
-#    print
-#    print "difference between Python and C API model interpolation:"
-#    print out - W2  # should be close to zero
+#    print()
+#    print( "difference between Python and C API model interpolation:" )
+#    print( out - W2 )  # should be close to zero
 
     print()
     print( "function values at neighbor points:" )
diff --git a/wlsqm/__init__.py b/wlsqm/__init__.py
@@ -18,7 +18,8 @@
 JJ 2017-02-22
 """
 
-from __future__ import absolute_import  # https://www.python.org/dev/peps/pep-0328/
+# absolute_import: https://www.python.org/dev/peps/pep-0328/
+from __future__ import division, print_function, absolute_import
 
 __version__ = '0.1.4'
 
diff --git a/wlsqm/fitter/defs.pxd b/wlsqm/fitter/defs.pxd
@@ -11,6 +11,8 @@
 #
 # JJ 2016-11-30
 
+from __future__ import absolute_import
+
 # Algorithms for the solve step (expert mode).
 #
 cdef int ALGO_BASIC_c      # fit just once
diff --git a/wlsqm/fitter/defs.pyx b/wlsqm/fitter/defs.pyx
@@ -59,6 +59,8 @@ Examples:
 JJ 2016-11-30
 """
 
+from __future__ import division, print_function, absolute_import
+
 #################################################
 # C definitions (Cython level)
 #################################################
diff --git a/wlsqm/fitter/expert.pyx b/wlsqm/fitter/expert.pyx
@@ -17,8 +17,7 @@ This module contains the Python API for an "expert mode" in the LAPACK sense, wi
 JJ 2016-12-07
 """
 
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import division, print_function, absolute_import
 
 from libc.stdlib cimport malloc, free
 from libc.math   cimport sqrt
diff --git a/wlsqm/fitter/impl.pxd b/wlsqm/fitter/impl.pxd
@@ -16,6 +16,8 @@
 # cython: boundscheck = False
 # cython: cdivision   = True
 
+from __future__ import absolute_import
+
 from cython cimport view
 
 # See the infrasructure module for the definition of Case.
diff --git a/wlsqm/fitter/impl.pyx b/wlsqm/fitter/impl.pyx
@@ -16,15 +16,13 @@
 # cython: boundscheck = False
 # cython: cdivision   = True
 
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import division, print_function, absolute_import
 
 from libc.stdlib cimport malloc, free
 from libc.math cimport sqrt, log10
 from libc.math cimport fabs as c_abs
 
 from numpy import asanyarray
-from numpy.linalg import cond  # only needed for debug mode
 
 cimport wlsqm.utils.lapackdrivers as drivers
 
diff --git a/wlsqm/fitter/infra.pxd b/wlsqm/fitter/infra.pxd
@@ -9,6 +9,8 @@
 #
 # JJ 2016-11-30
 
+from __future__ import absolute_import
+
 #################################################
 # Helper functions
 #################################################
diff --git a/wlsqm/fitter/infra.pyx b/wlsqm/fitter/infra.pyx
@@ -33,8 +33,7 @@
 #           - max(nk_j) here too, same reason
 #      - ntasks*no*sizeof(double) bytes for fi_tmp
 
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import division, print_function, absolute_import
 
 from libc.stdlib cimport malloc, free
 from libc.math cimport sqrt
@@ -249,7 +248,7 @@ cdef Allocator* Allocator_new( int mode, int total_size_bytes ) nogil except <Al
 cdef void* Allocator_malloc( Allocator* self, int size_bytes ) nogil:
     if self.mode == ALLOC_MODE_PASSTHROUGH:
 #        with gil:
-#            print "directly allocating %d bytes" % (size_bytes)
+#            print( "directly allocating %d bytes" % (size_bytes) )  # DEBUG
         return malloc( size_bytes )
 
     # else...
@@ -262,12 +261,12 @@ cdef void* Allocator_malloc( Allocator* self, int size_bytes ) nogil:
     cdef int size_remaining = self.size_total - self.size_used
     if size_bytes > size_remaining:
 #        with gil:
-#            print "buffer full, cannot allocate %d bytes" % (size_bytes)  # DEBUG
+#            print( "buffer full, cannot allocate %d bytes" % (size_bytes) )  # DEBUG
         return <void*>0
 
     cdef void* p
     with gil:  # since we are called from Python threads only, we can use the GIL to make the operation thread-safe. (TODO/FIXME: well, not exactly, see e.g. http://www.slideshare.net/dabeaz/an-introduction-to-python-concurrency )
-#        print "reserving %d bytes from buffer of size %d; after alloc, %d bytes remaining" % (size_bytes, self.size_total, size_remaining - size_bytes)  # DEBUG
+#        print( "reserving %d bytes from buffer of size %d; after alloc, %d bytes remaining" % (size_bytes, self.size_total, size_remaining - size_bytes) )  # DEBUG
         p = self.p
         self.p = <void*>( (<char*>p) + size_bytes )
         self.size_used += size_bytes
diff --git a/wlsqm/fitter/interp.pxd b/wlsqm/fitter/interp.pxd
@@ -8,6 +8,8 @@
 #
 # JJ 2016-11-30
 
+from __future__ import absolute_import
+
 from cython cimport view
 
 cimport wlsqm.fitter.infra as infra
diff --git a/wlsqm/fitter/interp.pyx b/wlsqm/fitter/interp.pyx
@@ -17,8 +17,7 @@ Interpolation of fitted surrogate model.
 JJ 2016-11-30
 """
 
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import division, print_function, absolute_import
 
 import numpy as np  # needed by interpolate_fit() in Python API
 
@@ -140,7 +139,7 @@ Return value : rank-1 array, function value at each x.
         case.fi2       = &fi2[0]  # if interpolating a derivative, this work space is needed (if we had a Case object, the work space would have been created by Case_allocate())
         interpolate_nD( &case, xManyD, x1D, &out[0], diff )
 
-    return out
+    return np.asanyarray(out)  # memoryviewslice --> np.array
 
 
 def lambdify_fit( xi, fi, dimension, order, diff=0 ):  # Python only
diff --git a/wlsqm/fitter/polyeval.pxd b/wlsqm/fitter/polyeval.pxd
@@ -8,6 +8,8 @@
 #
 # JJ 2016-12-09
 
+from __future__ import absolute_import
+
 from cython cimport view
 
 cdef int taylor_3D( int order, double* fi, double xi, double yi, double zi, double[::view.generic,::view.contiguous] x, double* out ) nogil
diff --git a/wlsqm/fitter/polyeval.pyx b/wlsqm/fitter/polyeval.pyx
@@ -16,8 +16,7 @@
 # cython: boundscheck = False
 # cython: cdivision   = True
 
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import division, print_function, absolute_import
 
 # BUG in Cython 0.20.1post0: /usr/lib/python2.7/dist-packages/Cython/Includes/libc/math.pxd
 # defines fma(double x, double y), but it should be fma(double x, double y, double z)
diff --git a/wlsqm/fitter/simple.pxd b/wlsqm/fitter/simple.pxd
@@ -19,6 +19,8 @@
 # This module contains "driver" routines in the LAPACK sense.
 # The low-level C routines are contained in wlsqm.fitter.impl.
 
+from __future__ import absolute_import
+
 from cython cimport view  # for usage, see http://cython.readthedocs.io/en/latest/src/userguide/memoryviews.html#specifying-more-general-memory-layouts
 
 ####################################################
diff --git a/wlsqm/fitter/simple.pyx b/wlsqm/fitter/simple.pyx
@@ -26,8 +26,7 @@ JJ 2016-11-07
 # - no contiguous buffer in the prep stage to allow generating the input by slicing an array (very useful); but the generated matrices will be contiguous!
 #   --> need to read only the function value data (fk[]) non-contiguously in the solve stage
 
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import division, print_function, absolute_import
 
 from libc.stdlib cimport malloc, free
 
@@ -86,7 +85,7 @@ order  : in, order of the surrogate polynomial. Can be 0, 1, 2, 3 or 4.
 knowns : in, bitmask describing what is known about the function at the point xi.
          See the b3_* (bitmask, 3D case) constants in wlsqm.fitter.defs.
 
-debug  : in, boolean. If debug is True, print row scale and condition number information to stdout.
+debug  : in, boolean. If debug is True, compute 2-norm condition number.
 
 weighting_method : in, one of the constants WEIGHT_*. Specifies the type of weighting to use;
                    different weightings are good for different use cases of WLSQM.
@@ -267,7 +266,7 @@ order  : in, order of the surrogate polynomial. Can be 0, 1, 2, 3 or 4.
 knowns : in, bitmask describing what is known about the function at the point xi.
          See the b2_* (bitmask, 2D case) constants.
 
-debug  : in, boolean. If debug is True, print row scale and condition number information to stdout.
+debug  : in, boolean. If debug is True, compute 2-norm condition number.
 
 weighting_method : in, one of the constants WEIGHT_*. Specifies the type of weighting to use;
                    different weightings are good for different use cases of WLSQM.
@@ -455,7 +454,7 @@ order  : in, order of the surrogate polynomial. Can be 0, 1, 2, 3 or 4.
 knowns : in, bitmask describing what is known about the function at the point xi.
          See the b1_* (bitmask, 1D case) constants.
 
-debug  : in, boolean. If debug is True, print row scale and condition number information to stdout.
+debug  : in, boolean. If debug is True, compute 2-norm condition number.
 
 weighting_method : in, one of the constants WEIGHT_*. Specifies the type of weighting to use;
                    different weightings are good for different use cases of WLSQM.
diff --git a/wlsqm/utils/lapackdrivers.pxd b/wlsqm/utils/lapackdrivers.pxd
@@ -38,6 +38,8 @@
 #
 # JJ 2016-11-07
 
+from __future__ import absolute_import
+
 ##############################################################################################################
 # Helpers
 ##############################################################################################################
diff --git a/wlsqm/utils/lapackdrivers.pyx b/wlsqm/utils/lapackdrivers.pyx
@@ -55,8 +55,7 @@ See the function docstrings for details.
 JJ 2016-10-07
 """
 
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import division, print_function, absolute_import
 
 cimport cython
 cimport cython.parallel
@@ -69,7 +68,14 @@ from libc.stdlib cimport malloc, free
 
 import numpy as np
 
-from scipy.linalg.cython_lapack cimport dgtsv,    dsysv, dsytrf, dsytrs,    dgesv, dgetrf, dgetrs
+# triangular solver
+from scipy.linalg.cython_lapack cimport dgtsv
+# symmetric solver
+from scipy.linalg.cython_lapack cimport dsysv, dsytrf, dsytrs
+# general solver
+from scipy.linalg.cython_lapack cimport dgesv, dgetrf, dgetrs
+
+# other routines
 from scipy.linalg.cython_lapack cimport dgeequ, dgesvd
 
 # fast inline min/max for C code
diff --git a/wlsqm/utils/ptrwrap.pxd b/wlsqm/utils/ptrwrap.pxd
@@ -6,6 +6,8 @@
 #
 # JJ 2016-02-29
 
+from __future__ import absolute_import
+
 cdef class PointerWrapper:
     cdef void* ptr
     cdef set_ptr(self, void * input)
diff --git a/wlsqm/utils/ptrwrap.pyx b/wlsqm/utils/ptrwrap.pyx
@@ -8,6 +8,8 @@
 #
 # JJ 2016-02-29
 
+from __future__ import division, print_function, absolute_import
+
 cdef class PointerWrapper:
     cdef set_ptr(self, void * input):
         self.ptr = input

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`#`
`12`	`12`	`# JJ 2016-11-30`
`13`	`13`
	`14`	`+from __future__ import absolute_import`
	`15`	`+`
`14`	`16`	`# Algorithms for the solve step (expert mode).`
`15`	`17`	`#`
`16`	`18`	`cdef int ALGO_BASIC_c # fit just once`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`#`
`10`	`10`	`# JJ 2016-11-30`
`11`	`11`
	`12`	`+from __future__ import absolute_import`
	`13`	`+`
`12`	`14`	`#################################################`
`13`	`15`	`# Helper functions`
`14`	`16`	`#################################################`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`#`
`9`	`9`	`# JJ 2016-11-30`
`10`	`10`
	`11`	`+from __future__ import absolute_import`
	`12`	`+`
`11`	`13`	`from cython cimport view`
`12`	`14`
`13`	`15`	`cimport wlsqm.fitter.infra as infra`