From c891570f3fd1164b620bfe3e299d4fe450e2d621 Mon Sep 17 00:00:00 2001
From: wuweikang <wuweikang@huawei.com>
Date: Thu, 17 Dec 2020 11:23:07 +0800
Subject: [PATCH] modify dockerfile for ompi-4.0.3

---
 docker/mindspore-gpu/1.1.0/Dockerfile | 14 +++++++-------
 docker/mindspore-gpu/devel/Dockerfile | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/docker/mindspore-gpu/1.1.0/Dockerfile b/docker/mindspore-gpu/1.1.0/Dockerfile
index a74a41cf09a..9121a0bcb62 100644
--- a/docker/mindspore-gpu/1.1.0/Dockerfile
+++ b/docker/mindspore-gpu/1.1.0/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER leonwanghui <leon.wanghui@huawei.com>
 
 # Set env
 ENV PYTHON_ROOT_PATH /usr/local/python-3.7.5
-ENV OMPI_ROOT_PATH /usr/local/openmpi-3.1.5
+ENV OMPI_ROOT_PATH /usr/local/openmpi-4.0.3
 ENV PATH ${OMPI_ROOT_PATH}/bin:/usr/local/bin:$PATH
 ENV LD_LIBRARY_PATH ${OMPI_ROOT_PATH}/lib:$LD_LIBRARY_PATH
 
@@ -69,17 +69,17 @@ RUN mkdir -pv /root/.pip \
     && echo "trusted-host=mirrors.aliyun.com" >> /root/.pip/pip.conf \
     && echo "index-url=http://mirrors.aliyun.com/pypi/simple/" >> /root/.pip/pip.conf
 
-# Install openmpi (v3.1.5)
+# Install openmpi (v4.0.3)
 RUN cd /tmp \
-    && wget https://download.open-mpi.org/release/open-mpi/v3.1/openmpi-3.1.5.tar.gz \
-    && tar -xvf openmpi-3.1.5.tar.gz \
-    && cd /tmp/openmpi-3.1.5 \
+    && wget https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.3.tar.gz \
+    && tar -xvf openmpi-4.0.3.tar.gz \
+    && cd /tmp/openmpi-4.0.3 \
     && mkdir -p ${OMPI_ROOT_PATH} \
     && ./configure --prefix=${OMPI_ROOT_PATH} \
     && make -j4 \
     && make install -j4 \
-    && rm -rf /tmp/openmpi-3.1.5 \
-    && rm -f /tmp/openmpi-3.1.5.tar.gz
+    && rm -rf /tmp/openmpi-4.0.3 \
+    && rm -f /tmp/openmpi-4.0.3.tar.gz
 
 # Install MindSpore cuda-10.1 whl package
 RUN pip install --no-cache-dir https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.1.0/MindSpore/gpu/ubuntu_x86/cuda-10.1/mindspore_gpu-1.1.0-cp37-cp37m-linux_x86_64.whl
diff --git a/docker/mindspore-gpu/devel/Dockerfile b/docker/mindspore-gpu/devel/Dockerfile
index a4ab628364f..800454ae784 100644
--- a/docker/mindspore-gpu/devel/Dockerfile
+++ b/docker/mindspore-gpu/devel/Dockerfile
@@ -5,8 +5,9 @@ MAINTAINER leonwanghui <leon.wanghui@huawei.com>
 # Set env
 ENV PYTHON_ROOT_PATH /usr/local/python-3.7.5
 ENV CMAKE_ROOT_PATH /usr/local/cmake-3.14.1
+ENV OMPI_ROOT_PATH /usr/local/openmpi-4.0.3
 ENV PATH ${CMAKE_ROOT_PATH}/bin:/usr/local/bin:$PATH
-ENV LD_LIBRARY_PATH ${PYTHON_ROOT_PATH}/lib
+ENV LD_LIBRARY_PATH ${OMPI_ROOT_PATH}:${PYTHON_ROOT_PATH}/lib
 
 # Install base tools
 RUN apt update \
@@ -79,3 +80,15 @@ RUN cd /tmp \
     && mkdir -p ${CMAKE_ROOT_PATH} \
     && bash ./cmake-3.14.1-Linux-x86_64.sh --prefix=${CMAKE_ROOT_PATH} --exclude-subdir --skip-license \
     && rm -f /tmp/cmake-3.14.1-Linux-x86_64.sh
+
+# Install openmpi (v4.0.3)
+RUN cd /tmp \
+    && wget https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.3.tar.gz \
+    && tar -xvf openmpi-4.0.3.tar.gz \
+    && cd /tmp/openmpi-4.0.3 \
+    && mkdir -p ${OMPI_ROOT_PATH} \
+    && ./configure --prefix=${OMPI_ROOT_PATH} \
+    && make -j4 \
+    && make install -j4 \
+    && rm -rf /tmp/openmpi-4.0.3 \
+    && rm -f /tmp/openmpi-4.0.3.tar.gz
\ No newline at end of file