From 09da09f2168ca6cc2281cb3c0ee27d7922794edf Mon Sep 17 00:00:00 2001
From: yanghaoran <yanghaoran2@huawei.com>
Date: Wed, 27 Apr 2022 19:02:55 +0800
Subject: [PATCH] fix gpu docker environment paths

---
 scripts/docker/mindspore-gpu/1.7.0/cuda10.1/Dockerfile | 5 +++--
 scripts/docker/mindspore-gpu/1.7.0/cuda11.1/Dockerfile | 5 +++--
 scripts/docker/mindspore-gpu/devel/Dockerfile          | 5 +++--
 scripts/docker/mindspore-gpu/runtime/Dockerfile        | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/docker/mindspore-gpu/1.7.0/cuda10.1/Dockerfile b/scripts/docker/mindspore-gpu/1.7.0/cuda10.1/Dockerfile
index 4e00df3b007..91ee70cdfe7 100644
--- a/scripts/docker/mindspore-gpu/1.7.0/cuda10.1/Dockerfile
+++ b/scripts/docker/mindspore-gpu/1.7.0/cuda10.1/Dockerfile
@@ -5,8 +5,9 @@ MAINTAINER MindSpore Authors
 # Set env
 ENV PYTHON_ROOT_PATH /usr/local/python-3.7.5
 ENV OMPI_ROOT_PATH /usr/local/openmpi-4.0.3
-ENV PATH ${PYTHON_ROOT_PATH}/bin:${OMPI_ROOT_PATH}/bin:/usr/local/bin:$PATH
-ENV LD_LIBRARY_PATH ${OMPI_ROOT_PATH}/lib:$LD_LIBRARY_PATH
+ENV CUDA_PATH /usr/local/cuda
+ENV PATH ${PYTHON_ROOT_PATH}/bin:${OMPI_ROOT_PATH}/bin:${CUDA_PATH}/bin:/usr/local/bin:$PATH
+ENV LD_LIBRARY_PATH ${OMPI_ROOT_PATH}/lib:${CUDA_PATH}/lib64:$LD_LIBRARY_PATH
 
 # Install base tools
 RUN apt update \
diff --git a/scripts/docker/mindspore-gpu/1.7.0/cuda11.1/Dockerfile b/scripts/docker/mindspore-gpu/1.7.0/cuda11.1/Dockerfile
index e378f66ea84..72aef84dad2 100644
--- a/scripts/docker/mindspore-gpu/1.7.0/cuda11.1/Dockerfile
+++ b/scripts/docker/mindspore-gpu/1.7.0/cuda11.1/Dockerfile
@@ -5,8 +5,9 @@ MAINTAINER MindSpore Authors
 # Set env
 ENV PYTHON_ROOT_PATH /usr/local/python-3.7.5
 ENV OMPI_ROOT_PATH /usr/local/openmpi-4.0.3
-ENV PATH ${PYTHON_ROOT_PATH}/bin:${OMPI_ROOT_PATH}/bin:/usr/local/bin:$PATH
-ENV LD_LIBRARY_PATH ${OMPI_ROOT_PATH}/lib:$LD_LIBRARY_PATH
+ENV CUDA_PATH /usr/local/cuda
+ENV PATH ${PYTHON_ROOT_PATH}/bin:${OMPI_ROOT_PATH}/bin:${CUDA_PATH}/bin:/usr/local/bin:$PATH
+ENV LD_LIBRARY_PATH ${OMPI_ROOT_PATH}/lib:${CUDA_PATH}/lib64:$LD_LIBRARY_PATH
 
 # Install base tools
 RUN apt update \
diff --git a/scripts/docker/mindspore-gpu/devel/Dockerfile b/scripts/docker/mindspore-gpu/devel/Dockerfile
index a376134ed76..2d8ec08779f 100644
--- a/scripts/docker/mindspore-gpu/devel/Dockerfile
+++ b/scripts/docker/mindspore-gpu/devel/Dockerfile
@@ -6,8 +6,9 @@ MAINTAINER MindSpore Authors
 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 ${OMPI_ROOT_PATH}/bin:${PYTHON_ROOT_PATH}/bin:${CMAKE_ROOT_PATH}/bin:/usr/local/bin:$PATH
-ENV LD_LIBRARY_PATH ${OMPI_ROOT_PATH}/lib::${PYTHON_ROOT_PATH}/lib
+ENV CUDA_PATH /usr/local/cuda
+ENV PATH ${PYTHON_ROOT_PATH}/bin:${OMPI_ROOT_PATH}/bin:${CMAKE_ROOT_PATH}/bin:${CUDA_PATH}/bin:/usr/local/bin:$PATH
+ENV LD_LIBRARY_PATH ${OMPI_ROOT_PATH}/lib:${PYTHON_ROOT_PATH}:${CUDA_PATH}/lib64:$LD_LIBRARY_PATH
 
 # Install base tools
 RUN apt update \
diff --git a/scripts/docker/mindspore-gpu/runtime/Dockerfile b/scripts/docker/mindspore-gpu/runtime/Dockerfile
index 41f08945f05..55104ec8db6 100644
--- a/scripts/docker/mindspore-gpu/runtime/Dockerfile
+++ b/scripts/docker/mindspore-gpu/runtime/Dockerfile
@@ -5,8 +5,9 @@ MAINTAINER MindSpore Authors
 # Set env
 ENV PYTHON_ROOT_PATH /usr/local/python-3.7.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
+ENV CUDA_PATH /usr/local/cuda
+ENV PATH ${PYTHON_ROOT_PATH}/bin:${OMPI_ROOT_PATH}/bin:${CUDA_PATH}/bin:/usr/local/bin:$PATH
+ENV LD_LIBRARY_PATH ${OMPI_ROOT_PATH}/lib:${CUDA_PATH}/lib64:$LD_LIBRARY_PATH
 
 # Install base tools
 RUN apt update \