diff --git a/README b/README index 0cbd7eb1bebe83b055e5e214490c9ff2226e0583..f0d27fa445df1345fbb023788313786650936110 100644 --- a/README +++ b/README @@ -46,7 +46,7 @@ AUTHOR VERSION - 0.4.9 + 0.5.0 LAST UPDATED diff --git a/definition-files/us/ucsd/sdsc/comet/pytorch/pytorch-gpu.def b/definition-files/us/ucsd/sdsc/comet/pytorch/pytorch-gpu.def index b3f2b78f018e725c277868ba0688eefda76e6384..f11efb20ab5b47d32f3313ee2b17d5e5ebe45936 100644 --- a/definition-files/us/ucsd/sdsc/comet/pytorch/pytorch-gpu.def +++ b/definition-files/us/ucsd/sdsc/comet/pytorch/pytorch-gpu.def @@ -5,7 +5,7 @@ OSVersion: xenial %labels APPLICATION_NAME pytorch - APPLICATION_VERSION 0.4.1 + APPLICATION_VERSION 1.0.0rc1 APPLICATION_URL http://pytorch.org/ SYSTEM_NAME comet @@ -17,7 +17,7 @@ OSVersion: xenial AUTHOR_NAME Marty Kandes AUTHOR_EMAIL mkandes@sdsc.edu - LAST_UPDATED 20181019 + LAST_UPDATED 20181105 %setup @@ -28,6 +28,8 @@ OSVersion: xenial export PATH="/usr/local/cuda-9.2/bin${PATH:+:${PATH}}" export LD_LIBRARY_PATH="/usr/local/cuda-9.2/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/cuda/extras/CUPTI/lib64" + export PATH="/opt/openmpi-1.8.4/bin:${PATH}" + export LD_LIBRARY_PATH="/opt/openmpi-1.8.4/lib:${LD_LIBRARY_PATH}" %post -c /bin/bash @@ -296,10 +298,24 @@ OSVersion: xenial apt-get -y install libnl-route-3-dev apt-get -y install libnl-utils + # Install OpenMPI dependencies + apt-get -y install zlib1g-dev + + # Download, build, and install OpenMPI + wget https://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.4.tar.gz + tar -xzvf openmpi-1.8.4.tar.gz + cd openmpi-1.8.4 + ./configure --prefix=/opt/openmpi-1.8.4 + make all install + + # Set paths to OpenMPI binaries and libraries + export PATH="/opt/openmpi-1.8.4/bin:${PATH}" + export LD_LIBRARY_PATH="/opt/openmpi-1.8.4/lib:${LD_LIBRARY_PATH}" + # Install PyTorch dependencies for python(2) export PATH="/opt/miniconda2/bin:${PATH}" export CMAKE_PREFIX_PATH="$(dirname $(which conda))/../" - conda install -y numpy + conda install -y numpy=1.15.2 conda install -y pyyaml conda install -y mkl conda install -y mkl-include @@ -315,22 +331,24 @@ OSVersion: xenial cd /opt # Download, build, and install PyTorch for python2 - export PYTORCH_BUILD_VERSION='0.4.1' - export PYTORCH_BUILD_NUMBER='1' - export CFLAGS='-march=haswell -mmmx -mno-3dnow -msse -msse2 -msse3 -mssse3 -mno-sse4a -mcx16 -msahf -mmovbe -maes -mno-sha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mbmi2 -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mno-rdseed -mno-prfchw -mno-adx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 -mtune=haswell' - export USE_OPENMP='ON' - export USE_NNPACK='ON' + #export PYTORCH_BUILD_VERSION='1.0.0' + #export PYTORCH_BUILD_NUMBER='1' + #export CFLAGS='-march=haswell -mmmx -mno-3dnow -msse -msse2 -msse3 -mssse3 -mno-sse4a -mcx16 -msahf -mmovbe -maes -mno-sha -mpclmul -mpopcnt -mabm -mno-lwp -mfma -mno-fma4 -mno-xop -mbmi -mbmi2 -mno-tbm -mavx -mavx2 -msse4.2 -msse4.1 -mlzcnt -mno-rtm -mno-hle -mrdrnd -mf16c -mfsgsbase -mno-rdseed -mno-prfchw -mno-adx -mfxsr -mxsave -mxsaveopt -mno-avx512f -mno-avx512er -mno-avx512cd -mno-avx512pf -mno-prefetchwt1 -mtune=haswell' + #export USE_OPENMP='ON' + #export USE_NNPACK='ON' export USE_MKLDNN='ON' - export USE_DISTRIBUTED='ON' - export USE_GLOO='ON' + #export USE_DISTRIBUTED='ON' + #export USE_GLOO='ON' export USE_GLOO_IBVERBS='ON' - export USE_CUDA='ON' - export USE_CUDNN='ON' - export USE_NCCL='ON' + #export USE_CUDA='ON' + #export USE_CUDNN='ON' + #export USE_NCCL='ON' + #export USE_SYSTEM_NCCL='ON' + export TORCH_CUDA_ARCH_LIST="3.7;6.0" git clone --recursive https://github.com/pytorch/pytorch cd /opt/pytorch - git checkout "v${PYTORCH_BUILD_VERSION}" - git submodule update --init + #git checkout v1.0rc1 + #git submodule update --init python setup.py install # Download and install PyTorch Vision package for python2 @@ -356,7 +374,7 @@ OSVersion: xenial export PATH="$(echo "${PATH}" | sed s+'/opt/miniconda2/bin'+'/opt/miniconda3/bin'+)" export CMAKE_PREFIX_PATH="$(dirname $(which conda))/../" conda install -y python=3.5 - conda install -y numpy + conda install -y numpy=1.15.2 conda install -y pyyaml conda install -y mkl conda install -y mkl-include