Merge pull request #22 from bashtage/dSFMT

FIX: Fix alignment to enable SSE2 for dSFMT

Author: bashtage

appveyor.yml

@@ -24,7 +24,8 @@ build_script:
 
 test_script:
   - cd ..
-  - nosetests randomstate
+  - python -c "import randomstate.prng.dsfmt as d;d.RandomState(1)"
+  - nosetests -vv randomstate
 
 on_success:
   - cd %GIT_DIR%\randomstate

randomstate/interface.pyx

@@ -11,8 +11,10 @@ except:
 import numpy as np
 cimport numpy as np
 cimport cython
-from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, int8_t, int16_t, int32_t, int64_t
+from libc.stdint cimport (uint8_t, uint16_t, uint32_t, uint64_t, int8_t,
+                          int16_t, int32_t, int64_t, intptr_t)
 from cpython cimport Py_INCREF
+from cpython.mem cimport PyMem_Malloc, PyMem_Free
 
 import randomstate
 from binomial cimport binomial_t
@@ -129,29 +131,49 @@ cdef double kahan_sum(double *darr, np.npy_intp n):
 cdef class RandomState:
     CLASS_DOCSTRING
 
+    # cdef rng_t rng
+    cdef void *rng_loc
     cdef binomial_t binomial_info
-    cdef rng_t rng
     cdef aug_state rng_state
     cdef object lock
     poisson_lam_max = POISSON_LAM_MAX
     __MAXSIZE = <uint64_t>sys.maxsize
 
     IF RNG_SEED==1:
         def __init__(self, seed=None):
-            self.rng_state.rng = &self.rng
+            IF RNG_MOD_NAME == 'dsfmt':
+                cdef int8_t *iptr
+                cdef int8_t offset = 0
+                cdef intptr_t alignment = 0
+                self.rng_loc = PyMem_Malloc(sizeof(rng_t))
+                self.rng_state.rng = <rng_t *>self.rng_loc
+                alignment  = <intptr_t>(&(self.rng_state.rng.status[0].u32[0]))
+                if (alignment % 16) != 0:
+                    iptr = <int8_t *>self.rng_state.rng
+                    offset = 16 - (alignment % 16)
+                    if offset < 0:
+                        offset += 16
+                    self.rng_state.rng = <rng_t *>(iptr + offset)
+            ELSE:
+                self.rng_loc = PyMem_Malloc(sizeof(rng_t))
+                self.rng_state.rng = <rng_t *>self.rng_loc
+
             self.rng_state.binomial = &self.binomial_info
             self._reset_state_variables()
             self.lock = Lock()
             self.seed(seed)
 
     ELSE:
         def __init__(self, seed=None, inc=None):
-            self.rng_state.rng = &self.rng
+            self.rng_state.rng = <rng_t *>PyMem_Malloc(sizeof(rng_t)) # &self.rng
             self.rng_state.binomial = &self.binomial_info
             self._reset_state_variables()
             self.lock = Lock()
             self.seed(seed, inc)
 
+    def __dealloc__(self):
+        PyMem_Free(self.rng_loc)
+
     # Pickling support:
     def __getstate__(self):
         return self.get_state()

setup.py

@@ -13,14 +13,14 @@
 mod_dir = './randomstate'
 configs = []
 
-rngs = ['RNG_MLFG_1279_861', 'RNG_PCG32', 'RNG_PCG64', 'RNG_DSFMT',
-        'RNG_MT19937', 'RNG_XORSHIFT128', 'RNG_XORSHIFT1024', 'RNG_MRG32K3A']
+rngs = ['RNG_DSFMT', 'RNG_MLFG_1279_861', 'RNG_PCG32', 'RNG_PCG64', 'RNG_MT19937',
+        'RNG_XORSHIFT128', 'RNG_XORSHIFT1024', 'RNG_MRG32K3A']
 
-compile_rngs = rngs[:]
+compile_rngs = rngs[:] # ['RNG_DSFMT'] # rngs[:]
 
 extra_defs = []
 extra_link_args = ['Advapi32.lib', 'Kernel32.lib'] if os.name == 'nt' else []
-extra_compile_args = [] if os.name == 'nt' else ['-std=c99']
+base_extra_compile_args = [] if os.name == 'nt' else ['-std=c99']
 
 
 def write_config(file_name, config):
@@ -48,6 +48,7 @@ def write_config(file_name, config):
                join(mod_dir, 'src', 'common', 'entropy.c'),
                join(mod_dir, 'distributions.c')]
     include_dirs = base_include_dirs[:]
+    extra_compile_args = base_extra_compile_args[:]
 
     if rng == 'RNG_PCG32':
         sources += [join(mod_dir, 'src', 'pcg', 'pcg32.c')]
@@ -117,15 +118,19 @@ def write_config(file_name, config):
         sources += [join(mod_dir, 'shims', 'dSFMT', 'dSFMT-shim.c')]
         # TODO: HAVE_SSE2 should only be for platforms that have SSE2
         # TODO: But how to reliable detect?
-        defs = [('DSFMT_RNG', '1'),('DSFMT_MEXP','19937')] #  ('HAVE_SSE2', '1'),
+        defs = [('DSFMT_RNG', '1'),('DSFMT_MEXP','19937')]
+        defs += [('HAVE_SSE2', '1')]
+        if os.name == 'nt':
+            extra_compile_args = base_extra_compile_args + ['/arch:SSE2']
 
         include_dirs += [join(mod_dir, 'src', 'dSFMT')]
 
     config = {'file_name': file_name,
               'sources': sources,
               'include_dirs': include_dirs,
               'defs': defs,
-              'flags': dict([(k, v) for k, v in flags.items()])
+              'flags': dict([(k, v) for k, v in flags.items()]),
+              'compile_args': extra_compile_args
               }
 
     configs.append(config)
@@ -136,7 +141,7 @@ def write_config(file_name, config):
                                  join(mod_dir, 'src', 'common', 'entropy.c')],
                         include_dirs=base_include_dirs,
                         define_macros=extra_defs,
-                        extra_compile_args=extra_compile_args,
+                        extra_compile_args=base_extra_compile_args,
                         extra_link_args=extra_link_args)]
 
 for config in configs:
@@ -157,7 +162,7 @@ def write_config(file_name, config):
                     sources=config['sources'],
                     include_dirs=config['include_dirs'],
                     define_macros=config['defs'] + extra_defs,
-                    extra_compile_args=extra_compile_args,
+                    extra_compile_args=config['compile_args'],
                     extra_link_args=extra_link_args)
     extensions.append(ext)