Skip to content

Commit

Permalink
try fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] committed Dec 20, 2023
1 parent f576c30 commit 07b5ca2
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 14 deletions.
3 changes: 0 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ http_archive(
http_archive(
name = "hkv",
build_file = "//build_deps/toolchains/hkv:hkv.BUILD",
patch_cmds = [
"sed -i.bak 's/if (total_value_size % sizeof(byte16) == 0) {/if (total_value_size % sizeof byte16 == 0) {/' include/merlin/core_kernels/upsert.cuh",
],
sha256 = "3839f91b703b401fd6d2449c034662b6f8d6563e5b9b71b4c25b217cf1cd63fd",
strip_prefix = "HierarchicalKV-0.1.0-beta.8",
url = "https://github.com/NVIDIA-Merlin/HierarchicalKV/archive/refs/tags/v0.1.0-beta.8.tar.gz",
Expand Down
10 changes: 5 additions & 5 deletions tools/docker/build_wheel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ RUN mv /usr/bin/lsb_release2 /usr/bin/lsb_release
ARG PY_VERSION
RUN ln -sf /usr/local/bin/python$PY_VERSION /usr/bin/python

ENV PATH=/dt7/usr/bin:${PATH}
ENV PATH=/dt8/usr/bin:${PATH}
ENV LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}
ENV LD_LIBRARY_PATH=/dt7/user/lib64:${LD_LIBRARY_PATH}
ENV LD_LIBRARY_PATH=/dt7/user/lib:${LD_LIBRARY_PATH}
ENV MANPATH=/dt7/user/share/man:${LD_LIBRARY_PATH}
ENV INFOPATH=/dt7/user/share/info
ENV LD_LIBRARY_PATH=/dt8/user/lib64:${LD_LIBRARY_PATH}
ENV LD_LIBRARY_PATH=/dt8/user/lib:${LD_LIBRARY_PATH}
ENV MANPATH=/dt8/user/share/man:${LD_LIBRARY_PATH}
ENV INFOPATH=/dt8/user/share/info

ARG TF_VERSION
ARG TF_NAME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# --tag "tfra/nosla-cuda11.2.1-cudnn8-ubuntu20.04-manylinux2014-python3.9"
# $ docker push tfra/nosla-cuda11.2.1-cudnn8-ubuntu20.04-manylinux2014-python3.9

FROM nvidia/cuda:11.2.1-cudnn8-devel-ubuntu20.04 as devtoolset
FROM nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04 as devtoolset

RUN chmod 777 /tmp/
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -39,13 +39,11 @@ ADD devtoolset/build_devtoolset.sh build_devtoolset.sh
ADD devtoolset/rpm-patch.sh rpm-patch.sh

# Set up a sysroot for glibc 2.12 / libstdc++ 4.4 / devtoolset-7 in /dt7.
RUN /build_devtoolset.sh devtoolset-7 /dt7
# Set up a sysroot for glibc 2.12 / libstdc++ 4.4 / devtoolset-8 in /dt8.
RUN /build_devtoolset.sh devtoolset-8 /dt8

# TODO(klimek): Split up into two different docker images.
FROM nvidia/cuda:11.2.1-cudnn8-devel-ubuntu20.04
COPY --from=devtoolset /dt7 /dt7
FROM nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04
COPY --from=devtoolset /dt8 /dt8

# Install TensorRT.
Expand Down Expand Up @@ -96,8 +94,8 @@ RUN /install/build_and_install_python.sh "3.9.7"
COPY install/install_pip_packages_by_version.sh /install/
RUN /install/install_pip_packages_by_version.sh "/usr/local/bin/pip3.9"

COPY install/use_devtoolset_7.sh /install/
RUN /install/use_devtoolset_7.sh
COPY install/use_devtoolset_8.sh /install/
RUN /install/use_devtoolset_8.sh

COPY install/install_openmpi.sh /install/
RUN /install/install_openmpi.sh "4.1.1"
Expand Down
26 changes: 26 additions & 0 deletions tools/docker/install/use_devtoolset_8.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env bash
# Copyright 2022 The TensorFlow Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ==============================================================================

# Use devtoolset-8 as tool chain
rm -r /usr/bin/gcc*
export PATH=/dt8/usr/bin:${PATH}
export PATH=/usr/bin/:/usr/local/bin/:${PATH}
export LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/:${LD_LIBRARY_PATH}
ln -sf /dt8/usr/bin/cc /usr/bin/gcc
ln -sf /dt8/usr/bin/gcc /usr/bin/gcc
ln -sf /dt8/usr/bin/g++ /usr/bin/g++

0 comments on commit 07b5ca2

Please sign in to comment.