review feedback, make lint happy

1 files changed, 17 insertions, 20 deletions

diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index 483e62a34..768d01084 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -173,6 +173,16 @@ def check_math_capabilities(config, ext, moredefs, mathlibs):
         else:
             return 1
 
+    # GH-14787: Work around GCC<8.4 bug when compiling with AVX512
+    # support on Windows-based platforms
+    def check_gh14787(fn):
+        if fn == 'attribute_target_avx512f':
+            if (sys.platform in ('win32', 'cygwin') and
+                    config.check_compiler_gcc() and
+                    not config.check_gcc_version_at_least(8, 4)):
+                ext.extra_compile_args.extend(
+                        ['-ffixed-xmm%s' % n for n in range(16, 32)])
+
     #use_msvc = config.check_decl("_MSC_VER")
     if not check_funcs_once(MANDATORY_FUNCS, add_to_moredefs=False):
         raise SystemError("One of the required function to build numpy is not"
@@ -223,31 +233,18 @@ def check_math_capabilities(config, ext, moredefs, mathlibs):
     for dec, fn in OPTIONAL_FUNCTION_ATTRIBUTES:
         if config.check_gcc_function_attribute(dec, fn):
             moredefs.append((fname2def(fn), 1))
-            if fn == 'attribute_target_avx512f':
-                # GH-14787: Work around GCC<8.4 bug when compiling with AVX512
-                # support on Windows-based platforms
-                if (sys.platform in ('win32', 'cygwin') and
-                        config.check_compiler_gcc() and
-                        not config.check_gcc_version_at_least(8, 4)):
-                    ext.extra_compile_args.extend(
-                            ['-ffixed-xmm%s' % n for n in range(16, 32)])
+            check_gh14787(fn)
 
     platform = sysconfig.get_platform()
-    if("x86_64" in platform):
+    if ("x86_64" in platform):
         for dec, fn in OPTIONAL_FUNCTION_ATTRIBUTES_AVX:
             if config.check_gcc_function_attribute(dec, fn):
                 moredefs.append((fname2def(fn), 1))
-                if fn == 'attribute_target_avx512f':
-                    # GH-14787: Work around GCC<8.4 bug when compiling with AVX512
-                    # support on Windows-based platforms
-                    if (sys.platform in ('win32', 'cygwin') and
-                            config.check_compiler_gcc() and
-                            not config.check_gcc_version_at_least(8, 4)):
-                        ext.extra_compile_args.extend(
-                                ['-ffixed-xmm%s' % n for n in range(16, 32)])
-        for dec, fn, code, header in OPTIONAL_FUNCTION_ATTRIBUTES_WITH_INTRINSICS_AVX:
-            if config.check_gcc_function_attribute_with_intrinsics(dec, fn, code,
-                                                                   header):
+                check_gh14787(fn)
+        for dec, fn, code, header in (
+        OPTIONAL_FUNCTION_ATTRIBUTES_WITH_INTRINSICS_AVX):
+            if config.check_gcc_function_attribute_with_intrinsics(
+                    dec, fn, code, header):
                 moredefs.append((fname2def(fn), 1))
 
     for fn in OPTIONAL_VARIABLE_ATTRIBUTES: