BUG: reduce maximum alignment to 8 bytes on 32 bit

juliantaylor · juliantaylor · commit 7d106d590697 · 2014-11-26T23:30:04.000+01:00
malloc only provides 8byte alignment and is sufficient to load complex
on x86 platforms.
This fixes the f2py alignment failures with complex types on win32 or on
linux32 with -malign-double
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -764,6 +764,7 @@ def generate_multiarray_templated_sources(ext, build_dir):
             join('src', 'multiarray', 'ucsnarrow.h'),
             join('src', 'multiarray', 'usertypes.h'),
             join('src', 'multiarray', 'vdot.h'),
+            join('src', 'private', 'npy_config.h'),
             join('src', 'private', 'templ_common.h.src'),
             join('src', 'private', 'lowlevel_strided_loops.h'),
             join('include', 'numpy', 'arrayobject.h'),
diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h
@@ -3,6 +3,7 @@
 
 #include "config.h"
 #include "numpy/numpyconfig.h"
+#include "numpy/npy_cpu.h"
 
 /* Disable broken MS math functions */
 #if defined(_MSC_VER) || defined(__MINGW32_VERSION)
@@ -19,7 +20,11 @@
  * amd64 is not harmed much by the bloat as the system provides 16 byte
  * alignment by default.
  */
+#if (defined NPY_CPU_X86 || defined _WIN32)
+#define NPY_MAX_COPY_ALIGNMENT 8
+#else
 #define NPY_MAX_COPY_ALIGNMENT 16
+#endif
 
 /* Disable broken Sun Workshop Pro math functions */
 #ifdef __SUNPRO_C
