msvc compatibility

Author: davidcaron

setup.py

@@ -25,6 +25,7 @@
     sys.exit('Sorry, Python < 2.7 is not supported')
 
 import os
+import platform
 
 from setuptools import setup
 from setuptools.extension import Extension
@@ -39,28 +40,36 @@
 # Definitions
 #########################################################
 
-extra_compile_args_math_optimized    = ['-fopenmp', '-march=native', '-O2', '-msse', '-msse2', '-mfma', '-mfpmath=sse']
-extra_compile_args_math_debug        = ['-fopenmp', '-march=native', '-O0', '-g']
+system = platform.system()
 
-extra_compile_args_nonmath_optimized = ['-O2']
-extra_compile_args_nonmath_debug     = ['-O0', '-g']
+if system == "Windows":
+    my_extra_compile_args_math = ["/openmp"]
+    my_extra_compile_args_nonmath = []
+    my_extra_link_args = []
+    debug = False
+else:
+    extra_compile_args_math_optimized    = ['-fopenmp', '-march=native', '-O2', '-msse', '-msse2', '-mfma', '-mfpmath=sse']
+    extra_compile_args_math_debug        = ['-fopenmp', '-march=native', '-O0', '-g']
 
-extra_link_args_optimized    = ['-fopenmp']
-extra_link_args_debug        = ['-fopenmp']
+    extra_compile_args_nonmath_optimized = ['-O2']
+    extra_compile_args_nonmath_debug     = ['-O0', '-g']
 
+    extra_link_args_optimized    = ['-fopenmp']
+    extra_link_args_debug        = ['-fopenmp']
 
-if build_type == 'optimized':
-    my_extra_compile_args_math    = extra_compile_args_math_optimized
-    my_extra_compile_args_nonmath = extra_compile_args_nonmath_optimized
-    my_extra_link_args            = extra_link_args_optimized
-    debug = False
-    print( "build configuration selected: optimized" )
-else: # build_type == 'debug':
-    my_extra_compile_args_math    = extra_compile_args_math_debug
-    my_extra_compile_args_nonmath = extra_compile_args_nonmath_debug
-    my_extra_link_args            = extra_link_args_debug
-    debug = True
-    print( "build configuration selected: debug" )
+
+    if build_type == 'optimized':
+        my_extra_compile_args_math    = extra_compile_args_math_optimized
+        my_extra_compile_args_nonmath = extra_compile_args_nonmath_optimized
+        my_extra_link_args            = extra_link_args_optimized
+        debug = False
+        print( "build configuration selected: optimized" )
+    else: # build_type == 'debug':
+        my_extra_compile_args_math    = extra_compile_args_math_debug
+        my_extra_compile_args_nonmath = extra_compile_args_nonmath_debug
+        my_extra_link_args            = extra_link_args_debug
+        debug = True
+        print( "build configuration selected: debug" )
 
 
 #########################################################
@@ -95,12 +104,16 @@ def ext(extName):
                       extra_compile_args=my_extra_compile_args_nonmath
                     )
 def ext_math(extName):
+    if system == "Windows":
+        libraries = []
+    else:
+        libraries = ["m"]  # "m" links libm, the math library on unix-likes; see http://docs.cython.org/src/tutorial/external.html
     extPath = extName.replace(".", os.path.sep)+".pyx"
     return Extension( extName,
                       [extPath],
                       extra_compile_args=my_extra_compile_args_math,
                       extra_link_args=my_extra_link_args,
-                      libraries=["m"]  # "m" links libm, the math library on unix-likes; see http://docs.cython.org/src/tutorial/external.html
+                      libraries=libraries
                     )
 
 # http://stackoverflow.com/questions/13628979/setuptools-how-to-make-package-contain-extra-data-folder-and-all-folders-inside

wlsqm/fitter/expert.pyx

@@ -223,7 +223,8 @@ host             : in, ExpertSolver instance to use as host for guest mode. (Def
 
         # Create the Cases, adding them to the manager.
         #
-        cdef double nan = 0./0.  # FIXME: IEEE-754 abuse
+        cdef double zero = 0
+        cdef double nan = zero/zero  # FIXME: IEEE-754 abuse
         cdef double xi=nan, yi=nan, zi=nan  # pass invalid coordinates for now, we'll fill them in later
 
         if host is None:  # usual mode of operation (create geometry data locally)
@@ -849,7 +850,9 @@ cdef void expert_interpolate_nearest( int dimension, xi_tree, infra.CaseManager*
     #
     # https://docs.scipy.org/doc/scipy/reference/generated/scipy.spatial.cKDTree.query.html#scipy.spatial.cKDTree.query
     # "Missing neighbors are indicated with self.n."
-    cdef double nan = 0./0. # FIXME: IEEE-754 abuse
+
+    cdef double zero = 0
+    cdef double nan = zero/zero  # FIXME: IEEE-754 abuse
     if (np.asanyarray(I) == manager.ncases).any():
         for j in range(nx):
             out[j] = nan

wlsqm/fitter/impl.pyx

@@ -733,7 +733,8 @@ cdef void preprocess_A( infra.Case* case, int debug ) nogil:
 #
 cdef void solve( infra.Case* case, double[::view.generic] fk, double[::view.generic,::view.contiguous] sens, int do_sens, int taskid ) nogil:
 
-    cdef double nan = 0./0.  # FIXME: a better way to get NaN than to abuse IEEE-754 specification?
+    cdef double zero = 0
+    cdef double nan = zero/zero  # FIXME: a better way to get NaN than to abuse IEEE-754 specification?
 
     cdef int no            = case.no
     cdef int nr            = case.nr
@@ -862,7 +863,8 @@ cdef void solve( infra.Case* case, double[::view.generic] fk, double[::view.gene
 #
 cdef void solve_contig( infra.Case* case, double* fk, double* fi, double[::view.generic,::view.contiguous] sens, int do_sens, int taskid ) nogil:
 
-    cdef double nan = 0./0.  # FIXME: a better way to get NaN than to abuse IEEE-754 specification?
+    cdef double zero = 0
+    cdef double nan = zero/zero  # FIXME: a better way to get NaN than to abuse IEEE-754 specification?
 
     cdef int no            = case.no
     cdef int nr            = case.nr

wlsqm/fitter/infra.pyx

@@ -46,8 +46,9 @@ cimport wlsqm.fitter.defs as defs  # C constants
 #   http://stackoverflow.com/questions/109023/how-to-count-the-number-of-set-bits-in-a-32-bit-integer (algorithms, suggestions)
 #   https://gist.github.com/craffel/e470421958cad33df550 (Cython defs; on popcounting a NumPy array)
 #
-cdef extern int __builtin_popcount(unsigned int) nogil
-cdef extern int __builtin_popcountll(unsigned long long) nogil
+cdef extern from "popcount.h":
+    int __builtin_popcount(unsigned int) nogil
+    int __builtin_popcountll(unsigned long long) nogil
 
 #####################################
 # Helper functions
@@ -541,7 +542,8 @@ cdef Case* Case_new( int dimension, int order, double xi, double yi, double zi,
             raise MemoryError("Out of memory trying to allocate a Case object")
 
     # tag unused components as NaN
-    cdef double nan = 0./0.  # NaN as per IEEE-754
+    cdef double zero = 0
+    cdef double nan = zero/zero  # NaN as per IEEE-754
     self.xi = xi
     self.yi = yi  if dimension >= 2  else  nan
     self.zi = zi  if dimension == 3  else  nan

wlsqm/fitter/interp.pyx

@@ -104,7 +104,8 @@ Return value : rank-1 array, function value at each x.
 
     cdef double[::1] out = np.empty( (nx,), dtype=np.float64 )
 
-    cdef double nan = 0./0.
+    cdef double zero = 0
+    cdef double nan = zero/zero
     cdef double x0, y0, z0
     if dimension >= 2:
         x0     = xi[0]

wlsqm/fitter/popcount.h

@@ -0,0 +1,7 @@
+
+
+#ifdef _MSC_VER
+#include <intrin.h>
+#define __builtin_popcount __popcnt
+#define __builtin_popcountll __popcnt64
+#endif