Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI Remove remaining windows 32 references #24657

Merged
merged 7 commits into from Oct 20, 2022
Merged

CI Remove remaining windows 32 references #24657

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f5fb36b
MNT Remove remaining windows 32 references
thomasjpfan Oct 13, 2022
79ed3f4
CI [cd build gh]
thomasjpfan Oct 13, 2022
b089f7f
Merge remote-tracking branch 'upstream/main' into clean_up_windows_32
thomasjpfan Oct 15, 2022
ff489b9
CI [cd build gh]
thomasjpfan Oct 15, 2022
df4623d
Merge branch 'main' into clean_up_windows_32
jjerphan Oct 20, 2022
cb4ab0c
Trigger CD for GitHub actions only [cd build gh]
jjerphan Oct 20, 2022
d565c10
Merge branch 'main' into clean_up_windows_32
ogrisel Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 0 additions & 41 deletions build_tools/github/vendor.py
View file
Open in desktop
Expand Up @@ -20,47 +20,6 @@
MSVCP140_SRC_PATH = "C:\\Windows\\System32\\msvcp140.dll"


def make_distributor_init_32_bits(
distributor_init, vcomp140_dll_filename, vcruntime140_dll_filename
):
"""Create a _distributor_init.py file for 32-bit architectures.
This file is imported first when importing the sklearn package
so as to pre-load the vendored vcomp140.dll and vcruntime140.dll.
"""
with open(distributor_init, "wt") as f:
f.write(
textwrap.dedent(
"""
'''Helper to preload vcomp140.dll and vcruntime140.dll to
prevent "not found" errors.
Once vcomp140.dll and vcruntime140.dll are preloaded, the
namespace is made available to any subsequent vcomp140.dll
and vcruntime140.dll. This is created as part of the scripts
that build the wheel.
'''
import os
import os.path as op
from ctypes import WinDLL
if os.name == "nt":
# Load vcomp140.dll and vcruntime140.dll
libs_path = op.join(op.dirname(__file__), ".libs")
vcomp140_dll_filename = op.join(libs_path, "{0}")
vcruntime140_dll_filename = op.join(libs_path, "{1}")
WinDLL(op.abspath(vcomp140_dll_filename))
WinDLL(op.abspath(vcruntime140_dll_filename))
""".format(
vcomp140_dll_filename, vcruntime140_dll_filename
)
)
)


def make_distributor_init_64_bits(
distributor_init,
vcomp140_dll_filename,
Expand Down