Fix eager mode pipeline (#10802)

It was still using python 3.6
This commit is contained in:
Changming Sun 2022-03-08 09:26:20 -08:00 committed by GitHub
parent a9d9c6b486
commit 6260733533
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 7 deletions

View file

@ -1,9 +1,7 @@
FROM quay.io/pypa/manylinux2014_x86_64:latest
ENV PATH /usr/local/gradle/bin:/opt/rh/devtoolset-10/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ADD scripts /tmp/scripts
RUN yum remove -y devtoolset\* && yum install -y devtoolset-10-binutils devtoolset-10-gcc devtoolset-10-gcc-c++ devtoolset-10-gcc-gfortran && cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps_eager.sh && rm -rf /tmp/scripts
RUN cd /tmp/scripts && /tmp/scripts/manylinux/install_centos.sh && /tmp/scripts/manylinux/install_deps_eager.sh && rm -rf /tmp/scripts
ARG BUILD_UID=1001
ARG BUILD_USER=onnxruntimedev

View file

@ -40,7 +40,7 @@ function GetFile {
}
if [ ! -d "/opt/conda/bin" ]; then
PYTHON_EXES=("/opt/python/cp36-cp36m/bin/python3.6" "/opt/python/cp37-cp37m/bin/python3.7" "/opt/python/cp38-cp38/bin/python3.8" "/opt/python/cp39-cp39/bin/python3.9")
PYTHON_EXES=("/opt/python/cp37-cp37m/bin/python3.7" "/opt/python/cp38-cp38/bin/python3.8" "/opt/python/cp39-cp39/bin/python3.9")
else
PYTHON_EXES=("/opt/conda/bin/python")
fi
@ -81,11 +81,10 @@ tar --strip 1 -xf /tmp/src/node-v12.16.3-linux-x64.tar.gz -C /usr
cd /tmp/src
GetFile https://downloads.gradle-dn.com/distributions/gradle-6.3-bin.zip /tmp/src/gradle-6.3-bin.zip
unzip /tmp/src/gradle-6.3-bin.zip
# rm -rf /usr/local/gradle/*
mv /tmp/src/gradle-6.3 /usr/local/gradle
if ! [ -x "$(command -v protoc)" ]; then
source ${0/%install_deps_eager.sh/..\/install_protobuf.sh}
source ${0/%install_deps_eager\.sh/..\/install_protobuf.sh}
fi
export ONNX_ML=1
@ -94,7 +93,7 @@ export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
for PYTHON_EXE in "${PYTHON_EXES[@]}"
do
${PYTHON_EXE} -m pip install -r ${0/%install_deps_eager\.sh/requirements\.txt}
${PYTHON_EXE} -m pip install -r ${0/%install_deps_eager\.sh/..\/training\/ortmodule\/stage1\/requirements_torch_eager_cpu.txt}
${PYTHON_EXE} -m pip install -r ${0/%install_deps_eager\.sh/..\/training\/ortmodule\/stage1\/torch_eager_cpu\/requirements.txt}
done
cd /tmp/src