8000 MAINT Clean dead code in build helpers (#25661) · scikit-learn/scikit-learn@725569f · GitHub
[go: up one dir, main page]
Skip to content

Commit 725569f

Browse files
jeremiedbbjeremiedbb
authored
MAINT Clean dead code in build helpers (#25661)
1 parent 00f49eb commit 725569f

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def build_extensions(self):
201201
print(f"Using old NumPy C API (version 1.7) for extension {ext.name}")
202202

203203
if sklearn._OPENMP_SUPPORTED:
204-
openmp_flag = get_openmp_flag(self.compiler)
204+
openmp_flag = get_openmp_flag()
205205

206206
for e in self.extensions:
207207
e.extra_compile_args += openmp_flag

‎sklearn/_build_utils/openmp_helpers.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212
from .pre_build_helpers import compile_test_program
1313

1414

15-
def get_openmp_flag(compiler):
16-
if hasattr(compiler, "compiler"):
17-
compiler = compiler.compiler[0]
18-
else:
19-
compiler = compiler.__class__.__name__
20-
15+
def get_openmp_flag():
2116
if sys.platform == "win32":
2217
return ["/openmp"]
2318
elif sys.platform == "darwin" and "openmp" in os.getenv("CPPFLAGS", ""):
@@ -66,7 +61,7 @@ def check_openmp_support():
6661
if flag.startswith(("-L", "-Wl,-rpath", "-l", "-Wl,--sysroot=/"))
6762
]
6863

69-
extra_postargs = get_openmp_flag
64+
extra_postargs = get_openmp_flag()
7065

7166
openmp_exception = None
7267
try:

‎sklearn/_build_utils/pre_build_helpers.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,11 @@
1010
from setuptools.command.build_ext import customize_compiler, new_compiler
1111

1212

13-
def compile_test_program(code, extra_preargs=[], extra_postargs=[]):
13+
def compile_test_program(code, extra_preargs=None, extra_postargs=None):
1414
"""Check that some C code can be compiled and run"""
1515
ccompiler = new_compiler()
1616
customize_compiler(ccompiler)
1717

18-
# extra_(pre/post)args can be a callable to make it possible to get its
19-
# value from the compiler
20-
if callable(extra_preargs):
21-
extra_preargs = extra_preargs(ccompiler)
22-
if callable(extra_postargs):
23-
extra_postargs = extra_postargs(ccompiler)
24-
2518
start_dir = os.path.abspath(".")
2619

2720
with tempfile.TemporaryDirectory() as tmp_dir:

0 commit comments

Comments
 (0)
0