diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/distutils/ccompiler_opt.py | 14 | ||||
| -rw-r--r-- | numpy/distutils/command/build.py | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/numpy/distutils/ccompiler_opt.py b/numpy/distutils/ccompiler_opt.py index 834ade16c..7023db93b 100644 --- a/numpy/distutils/ccompiler_opt.py +++ b/numpy/distutils/ccompiler_opt.py @@ -296,11 +296,11 @@ class _Config: VSX3 = dict(interest=3, implies="VSX2", implies_detect=False), # IBM/Z ## VX(z13) support - VX = dict(interest=1, headers="vecintrin.h"), + VX = dict(interest=1, headers="vecintrin.h"), ## Vector-Enhancements Facility - VXE = dict(interest=2, implies="VX",implies_detect=False), + VXE = dict(interest=2, implies="VX", implies_detect=False), ## Vector-Enhancements Facility 2 - VXE2 = dict(interest=3, implies="VXE",implies_detect=False), + VXE2 = dict(interest=3, implies="VXE", implies_detect=False), # ARM NEON = dict(interest=1, headers="arm_neon.h"), NEON_FP16 = dict(interest=2, implies="NEON"), @@ -480,7 +480,6 @@ class _Config: return partial - on_zarch = self.cc_on_s390x if on_zarch: partial = dict( @@ -495,8 +494,8 @@ class _Config: ) ) if self.cc_is_clang: - partial["VX"]["flags"] = "-march=arch11 -mzvector" - partial["VXE"]["flags"] = "-march=arch12 -mzvector" + partial["VX"]["flags"] = "-march=arch11 -mzvector" + partial["VXE"]["flags"] = "-march=arch12 -mzvector" partial["VXE2"]["flags"] = "-march=arch13 -mzvector" return partial @@ -1014,7 +1013,8 @@ class _CCompiler: self.cc_is_gcc = True self.cc_march = "unknown" - for arch in ("x86", "x64", "ppc64", "ppc64le", "armhf", "aarch64", "s390x"): + for arch in ("x86", "x64", "ppc64", "ppc64le", + "armhf", "aarch64", "s390x"): if getattr(self, "cc_on_" + arch): self.cc_march = arch break diff --git a/numpy/distutils/command/build.py b/numpy/distutils/command/build.py index e5c507772..dc1ab3b9b 100644 --- a/numpy/distutils/command/build.py +++ b/numpy/distutils/command/build.py @@ -47,7 +47,8 @@ class build(old_build): - not part of dispatch-able features(--cpu-dispatch) - not supported by compiler or platform """ - self.simd_test = "BASELINE SSE2 SSE42 XOP FMA4 (FMA3 AVX2) AVX512F AVX512_SKX VSX VSX2 VSX3 NEON ASIMD VX VXE VXE2" + self.simd_test = "BASELINE SSE2 SSE42 XOP FMA4 (FMA3 AVX2) AVX512F" \ + " AVX512_SKX VSX VSX2 VSX3 NEON ASIMD VX VXE VXE2" def finalize_options(self): build_scripts = self.build_scripts |