diff --git a/README.md b/README.md index 2bedd167cae..5c0d856997a 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ For installation using `pip`, take `CPU` and `Ubuntu-x86` build version as an ex 1. Download whl from [MindSpore download page](https://www.mindspore.cn/versions/en), and install the package. ```bash - pip install https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.1.1/MindSpore/cpu/ubuntu_x86/mindspore-1.1.1-cp37-cp37m-linux_x86_64.whl + pip install https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.1.2/MindSpore/cpu/ubuntu_x86/mindspore-1.1.2-cp37-cp37m-linux_x86_64.whl ``` 2. Run the following command to verify the install. @@ -154,8 +154,8 @@ currently the containerized build options are supported as follows: For `CPU` backend, you can directly pull and run the latest stable image using the below command: ```bash - docker pull mindspore/mindspore-cpu:1.1.1 - docker run -it mindspore/mindspore-cpu:1.1.1 /bin/bash + docker pull mindspore/mindspore-cpu:1.1.2 + docker run -it mindspore/mindspore-cpu:1.1.2 /bin/bash ``` - GPU @@ -195,8 +195,8 @@ currently the containerized build options are supported as follows: Then you can pull and run the latest stable image using the below command: ```bash - docker pull mindspore/mindspore-gpu:1.1.1 - docker run -it -v /dev/shm:/dev/shm --runtime=nvidia --privileged=true mindspore/mindspore-gpu:1.1.1 /bin/bash + docker pull mindspore/mindspore-gpu:1.1.2 + docker run -it -v /dev/shm:/dev/shm --runtime=nvidia --privileged=true mindspore/mindspore-gpu:1.1.2 /bin/bash ``` To test if the docker image works, please execute the python code below and check the output: diff --git a/README_CN.md b/README_CN.md index 96377e770c9..79ebe23d5e6 100644 --- a/README_CN.md +++ b/README_CN.md @@ -82,7 +82,7 @@ MindSpore提供跨多个后端的构建选项： 1. 请从[MindSpore下载页面](https://www.mindspore.cn/versions)下载并安装whl包。 ```bash - pip install https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.1.1/MindSpore/cpu/ubuntu_x86/mindspore-1.1.1-cp37-cp37m-linux_x86_64.whl + pip install https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.1.2/MindSpore/cpu/ubuntu_x86/mindspore-1.1.2-cp37-cp37m-linux_x86_64.whl ``` 2. 执行以下命令，验证安装结果。 @@ -151,8 +151,8 @@ MindSpore的Docker镜像托管在[Docker Hub](https://hub.docker.com/r/mindspore 对于`CPU`后端，可以直接使用以下命令获取并运行最新的稳定镜像： ```bash - docker pull mindspore/mindspore-cpu:1.1.1 - docker run -it mindspore/mindspore-cpu:1.1.1 /bin/bash + docker pull mindspore/mindspore-cpu:1.1.2 + docker run -it mindspore/mindspore-cpu:1.1.2 /bin/bash ``` - GPU @@ -192,8 +192,8 @@ MindSpore的Docker镜像托管在[Docker Hub](https://hub.docker.com/r/mindspore 使用以下命令获取并运行最新的稳定镜像： ```bash - docker pull mindspore/mindspore-gpu:1.1.1 - docker run -it -v /dev/shm:/dev/shm --runtime=nvidia --privileged=true mindspore/mindspore-gpu:1.1.1 /bin/bash + docker pull mindspore/mindspore-gpu:1.1.2 + docker run -it -v /dev/shm:/dev/shm --runtime=nvidia --privileged=true mindspore/mindspore-gpu:1.1.2 /bin/bash ``` 要测试Docker是否正常工作，请运行下面的Python代码并检查输出： diff --git a/docker/mindspore-cpu/1.1.2/Dockerfile b/docker/mindspore-cpu/1.1.2/Dockerfile new file mode 100644 index 00000000000..dcd63b7df88 --- /dev/null +++ b/docker/mindspore-cpu/1.1.2/Dockerfile @@ -0,0 +1,71 @@ +FROM ubuntu:18.04 + +MAINTAINER leonwanghui + +# Set env +ENV PYTHON_ROOT_PATH /usr/local/python-3.7.5 +ENV PATH /usr/local/bin:/root/.local/bin:$PATH + +# Install base tools +RUN apt update \ + && DEBIAN_FRONTEND=noninteractive apt install -y \ + vim \ + wget \ + curl \ + xz-utils \ + net-tools \ + openssh-client \ + git \ + ntpdate \ + tzdata \ + tcl \ + sudo \ + bash-completion + +# Install compile tools +RUN DEBIAN_FRONTEND=noninteractive apt install -y \ + gcc \ + g++ \ + zlibc \ + make \ + libgmp-dev \ + patch \ + autoconf \ + libtool \ + automake \ + flex + +# Install the rest dependent tools +RUN DEBIAN_FRONTEND=noninteractive apt install -y \ + libnuma-dev + +# Set bash +RUN echo "dash dash/sh boolean false" | debconf-set-selections +RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash + +# Install python (v3.7.5) +RUN apt install -y libffi-dev libssl-dev zlib1g-dev libbz2-dev libncurses5-dev \ + libgdbm-dev libgdbm-compat-dev liblzma-dev libreadline-dev libsqlite3-dev \ + && cd /tmp \ + && wget https://github.com/python/cpython/archive/v3.7.5.tar.gz \ + && tar -xvf v3.7.5.tar.gz \ + && cd /tmp/cpython-3.7.5 \ + && mkdir -p ${PYTHON_ROOT_PATH} \ + && ./configure --prefix=${PYTHON_ROOT_PATH} \ + && make -j4 \ + && make install -j4 \ + && rm -f /usr/local/bin/python \ + && rm -f /usr/local/bin/pip \ + && ln -s ${PYTHON_ROOT_PATH}/bin/python3.7 /usr/local/bin/python \ + && ln -s ${PYTHON_ROOT_PATH}/bin/pip3.7 /usr/local/bin/pip \ + && rm -rf /tmp/cpython-3.7.5 \ + && rm -f /tmp/v3.7.5.tar.gz + +# Set pip source +RUN mkdir -pv /root/.pip \ + && echo "[global]" > /root/.pip/pip.conf \ + && echo "trusted-host=mirrors.aliyun.com" >> /root/.pip/pip.conf \ + && echo "index-url=http://mirrors.aliyun.com/pypi/simple/" >> /root/.pip/pip.conf + +# Install MindSpore cpu whl package +RUN pip install --no-cache-dir https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.1.2/MindSpore/cpu/ubuntu_x86/mindspore-1.1.2-cp37-cp37m-linux_x86_64.whl diff --git a/docker/mindspore-gpu/1.1.2/Dockerfile b/docker/mindspore-gpu/1.1.2/Dockerfile new file mode 100644 index 00000000000..8bc84f6290e --- /dev/null +++ b/docker/mindspore-gpu/1.1.2/Dockerfile @@ -0,0 +1,85 @@ +FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04 + +MAINTAINER leonwanghui + +# 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 + +# Install base tools +RUN apt update \ + && DEBIAN_FRONTEND=noninteractive apt install -y \ + vim \ + wget \ + curl \ + xz-utils \ + net-tools \ + openssh-client \ + git \ + ntpdate \ + tzdata \ + tcl \ + sudo \ + bash-completion + +# Install compile tools +RUN DEBIAN_FRONTEND=noninteractive apt install -y \ + gcc \ + g++ \ + zlibc \ + make \ + libgmp-dev \ + patch \ + autoconf \ + libtool \ + automake \ + flex + +# Install the rest dependent tools +RUN DEBIAN_FRONTEND=noninteractive apt install -y \ + libnuma-dev + +# Set bash +RUN echo "dash dash/sh boolean false" | debconf-set-selections +RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash + +# Install python (v3.7.5) +RUN apt install -y libffi-dev libssl-dev zlib1g-dev libbz2-dev libncurses5-dev \ + libgdbm-dev libgdbm-compat-dev liblzma-dev libreadline-dev libsqlite3-dev \ + && cd /tmp \ + && wget https://github.com/python/cpython/archive/v3.7.5.tar.gz \ + && tar -xvf v3.7.5.tar.gz \ + && cd /tmp/cpython-3.7.5 \ + && mkdir -p ${PYTHON_ROOT_PATH} \ + && ./configure --prefix=${PYTHON_ROOT_PATH} \ + && make -j4 \ + && make install -j4 \ + && rm -f /usr/local/bin/python \ + && rm -f /usr/local/bin/pip \ + && ln -s ${PYTHON_ROOT_PATH}/bin/python3.7 /usr/local/bin/python \ + && ln -s ${PYTHON_ROOT_PATH}/bin/pip3.7 /usr/local/bin/pip \ + && rm -rf /tmp/cpython-3.7.5 \ + && rm -f /tmp/v3.7.5.tar.gz + +# Set pip source +RUN mkdir -pv /root/.pip \ + && echo "[global]" > /root/.pip/pip.conf \ + && 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 (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 + +# Install MindSpore cuda-10.1 whl package +RUN pip install --no-cache-dir https://ms-release.obs.cn-north-4.myhuaweicloud.com/1.1.2/MindSpore/gpu/ubuntu_x86/cuda-10.1/mindspore_gpu-1.1.2-cp37-cp37m-linux_x86_64.whl diff --git a/setup.py b/setup.py index cebd0598516..f9b51bbfb25 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ from setuptools import setup, find_packages from setuptools.command.egg_info import egg_info from setuptools.command.build_py import build_py -version = '1.1.1' +version = '1.1.2' backend_policy = os.getenv('BACKEND_POLICY') device_target = os.getenv('BACKEND_TARGET')