Make Clang use manylinux C++ standard library

This commit is contained in:
Charles Hofer 2025-04-11 19:18:23 +00:00
parent 16d737b088
commit 3b4a7b029b
4 changed files with 15 additions and 3 deletions

View File

@ -9,7 +9,7 @@ ARG ROCM_BUILD_NUM
# manylinux base image. However, adding this does fix an issue where Bazel isn't able
# to find them.
RUN --mount=type=cache,target=/var/cache/dnf \
dnf install -y gcc-c++-8.5.0-22.el8_10.x86_64 numactl-devel
dnf install -y numactl-devel
RUN --mount=type=cache,target=/var/cache/dnf \
--mount=type=bind,source=build/rocm/tools/get_rocm.py,target=get_rocm.py \

View File

@ -98,7 +98,14 @@ def dist_wheels(
bw_cmd.append("/jax")
cmd = ["docker", "run"]
cmd = [
"docker",
"run",
"-e",
"HIPCC_COMPILE_FLAGS_APPEND=--gcc-toolchain=/opt/rh/gcc-toolset-14/root/usr/",
"-e",
"HIPCC_LINK_FLAGS_APPEND=--gcc-toolchain=/opt/rh/gcc-toolset-14/root/usr/"
]
mounts = [
"-v",

View File

@ -105,6 +105,11 @@ def build_jaxlib_wheel(
"python",
"build/build.py",
"build",
"--bazel_options=--host_linkopt=--gcc-toolchain=/opt/rh/gcc-toolset-14/root/usr/",
"--bazel_options=--linkopt=--gcc-toolchain=/opt/rh/gcc-toolset-14/root/usr/",
"--bazel_options=--host_cxxopt=--gcc-toolchain=/opt/rh/gcc-toolset-14/root/usr/",
"--bazel_options=--cxxopt=--gcc-toolchain=/opt/rh/gcc-toolset-14/root/usr/",
#"--bazel_options=--subcommands",
"--wheels=jaxlib,jax-rocm-plugin,jax-rocm-pjrt",
"--rocm_path=%s" % rocm_path,
"--rocm_version=60",

View File

@ -87,7 +87,7 @@ def fix_wheel(path):
exclude = list(ext_libs.keys())
# call auditwheel repair with excludes
cmd = ["auditwheel", "repair", "--plat", plat, "--only-plat"]
cmd = ["auditwheel", "-v", "repair", "--plat", plat, "--only-plat"]
for ex in exclude:
cmd.append("--exclude")