experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'ganand1/master_icx_launch' of https://github.com/Intel-tensorflow/tensorflow into ganand1/master_icx_launch

Browse Source
This commit is contained in:
ganand1 2020-11-24 09:22:34 -08:00
commit 1e3889340f
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/tools/ci_build/linux/mkl/Dockerfile.devel-mkl
View File

@ -84,7 +84,7 @@ RUN if [ "${ENABLE_HOROVOD}" = "yes" ]; then \
rm -rf install_openmpi_horovod.sh; \ rm -rf install_openmpi_horovod.sh; \
fi fi
# Remove crypto python packages due to SWLC # Remove crypto python packages for software compliance check.
RUN if [ "${RELEASE_CONTAINER}" = "yes" ]; then \ RUN if [ "${RELEASE_CONTAINER}" = "yes" ]; then \
${PIP} uninstall --yes cryptography && \ ${PIP} uninstall --yes cryptography && \
rm -rf /usr/lib/python3/dist-packages/pycrypto-2.6.1.egg-info; \ rm -rf /usr/lib/python3/dist-packages/pycrypto-2.6.1.egg-info; \

8
tensorflow/tools/ci_build/linux/mkl/build-dev-container.sh
View File

@ -169,13 +169,9 @@ function build_container()
fi fi
# Add build arg GCC8 install # Add build arg GCC8 install
if [[ ${ENABLE_GCC8} == "yes" ]]; then TF_DOCKER_BUILD_ARGS+=("--build-arg ENABLE_GCC8=${ENABLE_GCC8}")
TF_DOCKER_BUILD_ARGS+=("--build-arg ENABLE_GCC8=${ENABLE_GCC8}")
fi
if [[ ${RELEASE_CONTAINER} == "yes" ]]; then TF_DOCKER_BUILD_ARGS+=("--build-arg RELEASE_CONTAINER=${RELEASE_CONTAINER}")
TF_DOCKER_BUILD_ARGS+=("--build-arg RELEASE_CONTAINER=${RELEASE_CONTAINER}")
fi
# Perform docker build # Perform docker build
debug "Building docker image with image name and tag: ${TEMP_IMAGE_NAME}" debug "Building docker image with image name and tag: ${TEMP_IMAGE_NAME}"

16
tensorflow/tools/ci_build/linux/mkl/install_openmpi_horovod.sh
View File

@ -25,6 +25,7 @@ OPENMPI_DOWNLOAD_URL=${OPENMPI_DOWNLOAD_URL:-https://www.open-mpi.org/software/o
INSTALL_HOROVOD_FROM_COMMIT=${INSTALL_HOROVOD_FROM_COMMIT:-no} INSTALL_HOROVOD_FROM_COMMIT=${INSTALL_HOROVOD_FROM_COMMIT:-no}
BUILD_SSH=${BUILD_SSH:-no} BUILD_SSH=${BUILD_SSH:-no}
HOROVOD_VERSION=${HOROVOD_VERSION:-0.19.1} HOROVOD_VERSION=${HOROVOD_VERSION:-0.19.1}
SSH_CONFIG_PATH=/etc/ssh/ssh_config
# Install Open MPI # Install Open MPI
echo "Installing OpenMPI version ${OPENMPI_VERSION} ..." echo "Installing OpenMPI version ${OPENMPI_VERSION} ..."
@ -69,11 +70,8 @@ if [[ ${BUILD_SSH} == "yes" ]]; then
make install make install
apt-get clean && apt-get update && \ apt-get clean && apt-get update && \
apt-get install -y --no-install-recommends --fix-missing \ apt-get install -y --no-install-recommends --fix-missing \
libnuma-dev cmake libnuma-dev cmake
grep -v StrictHostKeyChecking /usr/local/etc/ssh_config > /usr/local/etc/ssh_config.new SSH_CONFIG_PATH=/usr/loca/etc/ssh_config
# Allow OpenSSH to talk to containers without asking for confirmation
echo " StrictHostKeyChecking no" >> /usr/local/etc/ssh_config.new
mv /usr/local/etc/ssh_config.new /usr/local/etc/ssh_config
else else
apt-get clean && apt-get update && \ apt-get clean && apt-get update && \
apt-get install -y --no-install-recommends --fix-missing \ apt-get install -y --no-install-recommends --fix-missing \
@ -90,12 +88,12 @@ else
echo "Unsupported Linux distribution. Aborting!" && exit 1 echo "Unsupported Linux distribution. Aborting!" && exit 1
fi fi
fi fi
grep -v StrictHostKeyChecking /etc/ssh/ssh_config > /etc/ssh/ssh_config.new
# Allow OpenSSH to talk to containers without asking for confirmation
echo " StrictHostKeyChecking no" >> /etc/ssh/ssh_config.new
mv /etc/ssh/ssh_config.new /etc/ssh/ssh_config
fi fi
mkdir -p /var/run/sshd mkdir -p /var/run/sshd
grep -v StrictHostKeyChecking ${SSH_CONFIG_PATH} > /etc/ssh/ssh_config.new
# Allow OpenSSH to talk to containers without asking for confirmation
echo " StrictHostKeyChecking no" >> /etc/ssh/ssh_config.new
mv /etc/ssh/ssh_config.new ${SSH_CONFIG_PATH}
# Install Horovod # Install Horovod
if [[ ${INSTALL_HOROVOD_FROM_COMMIT} == "yes" ]]; then if [[ ${INSTALL_HOROVOD_FROM_COMMIT} == "yes" ]]; then