Skip to content

Commit b390af4

Browse files
jithunnair-amdethanwee1jagadish-amd
committed
[release/2.7] Update CentOS dockerfile for CentOS Stream 9 (#2056)
Validation: http://rocm-ci.amd.com/job/mainline-framework-pytorch-internal-ub22-py3.10-ci/212/ --------- Co-authored-by: ethanwee1 <[email protected]> Co-authored-by: Jagadish Krishnamoorthy <[email protected]>
1 parent 0ea0592 commit b390af4

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

.ci/docker/centos-rocm/Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ RUN yum install -y glibc-langpack-en
1919
# Update CentOS git version
2020
RUN yum -y remove git
2121
RUN yum -y remove git-*
22-
RUN yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo-1.9-1.x86_64.rpm && \
23-
sed -i 's/packages.endpoint/packages.endpointdev/' /etc/yum.repos.d/endpoint.repo
2422
RUN yum install -y git
2523

2624
# Install devtoolset
@@ -50,7 +48,13 @@ COPY ./common/install_conda.sh install_conda.sh
5048
COPY ./common/common_utils.sh common_utils.sh
5149
RUN bash ./install_conda.sh && rm install_conda.sh common_utils.sh /opt/conda/requirements-ci.txt
5250

53-
# (optional) Install vision packages like OpenCV
51+
# (optional) Install protobuf for ONNX
52+
ARG PROTOBUF
53+
COPY ./common/install_protobuf.sh install_protobuf.sh
54+
RUN if [ -n "${PROTOBUF}" ]; then bash ./install_protobuf.sh; fi
55+
RUN rm install_protobuf.sh
56+
ENV INSTALLED_PROTOBUF ${PROTOBUF}
57+
5458
ARG VISION
5559
COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./
5660
RUN if [ -n "${VISION}" ]; then bash ./install_vision.sh; fi

.ci/docker/common/install_base.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ install_centos() {
124124

125125
ccache_deps="asciidoc docbook-dtds docbook-style-xsl libxslt"
126126
numpy_deps="gcc-gfortran"
127-
yum install -y \
127+
# Note: protobuf-c-{compiler,devel} on CentOS are too old to be used
128+
# for Caffe2. That said, we still install them to make sure the build
129+
# system opts to build/use protoc and libprotobuf from third-party.
130+
yum install -y $ALLOW_ERASE \
128131
$ccache_deps \
129132
$numpy_deps \
130133
autoconf \
@@ -158,11 +161,14 @@ install_centos() {
158161
libsndfile-devel
159162
fi
160163

164+
<<<<<<< HEAD
161165
# CentOS7 doesnt have support for higher version of libpng,
162166
# so it is built from source.
163167
# Libpng is required for torchvision build.
164168
build_libpng
165169

170+
=======
171+
>>>>>>> 7fe67f61f48... [release/2.7] Update CentOS dockerfile for CentOS Stream 9 (#2056)
166172
# Cleanup
167173
yum clean all
168174
rm -rf /var/cache/yum

0 commit comments

Comments
 (0)