Merge pull request #34 from jithinjosepkl/master

Image updates
Azure · Nov 5, 2020 · 9cedf44 · 9cedf44
2 parents adf9eae + 3686c7b
commit 9cedf44
Show file tree

Hide file tree

Showing 24 changed files with 251 additions and 329 deletions.
diff --git a/centos/centos-7.x/centos-7.6-hpc/install_amd_libs.sh b/centos/centos-7.x/centos-7.6-hpc/install_amd_libs.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
 
-../../common/install_amd_libs.sh
-
+$COMMON_DIR/../centos/centos-7.x/common/install_amd_libs.sh
diff --git a/centos/centos-7.x/centos-7.6-hpc/install_mellanoxofed.sh b/centos/centos-7.x/centos-7.6-hpc/install_mellanoxofed.sh
@@ -1,14 +1,17 @@
 #!/bin/bash
 set -ex
 
-MLNX_OFED_DOWNLOAD_URL=http://content.mellanox.com/ofed/MLNX_OFED-5.1-0.6.6.0/MLNX_OFED_LINUX-5.1-0.6.6.0-rhel7.6-x86_64.tgz
-$COMMON_DIR/download_and_verify.sh $MLNX_OFED_DOWNLOAD_URL "a6366c43a51dc4e43e672c5c72ed732506f7aa68790103fbc40286a7a39623aa"
-tar zxvf MLNX_OFED_LINUX-5.1-0.6.6.0-rhel7.6-x86_64.tgz
+MLNX_OFED_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/MLNX_OFED_LINUX-5.1-2.4.6.0-rhel7.6-x86_64.tgz
+TARBALL=$(basename ${MLNX_OFED_DOWNLOAD_URL})
+MOFED_FOLDER=$(basename ${MLNX_OFED_DOWNLOAD_URL} .tgz)
+
+$COMMON_DIR/download_and_verify.sh $MLNX_OFED_DOWNLOAD_URL "6966b086332f65b76efa41f5604588ba43321f09b634b6c59104423406f11f1e"
+tar zxvf ${TARBALL}
 
 KERNEL=( $(rpm -q kernel | sed 's/kernel\-//g') )
 KERNEL=${KERNEL[-1]}
 # Uncomment the lines below if you are running this on a VM
 #RELEASE=( $(cat /etc/centos-release | awk '{print $4}') )
 #yum -y install http://olcentgbl.trafficmanager.net/centos/${RELEASE}/updates/x86_64/kernel-devel-${KERNEL}.rpm
 yum install -y kernel-devel-${KERNEL}
-./MLNX_OFED_LINUX-5.1-0.6.6.0-rhel7.6-x86_64/mlnxofedinstall --kernel $KERNEL --kernel-sources /usr/src/kernels/${KERNEL} --add-kernel-support --skip-repo
+./${MOFED_FOLDER}/mlnxofedinstall --kernel $KERNEL --kernel-sources /usr/src/kernels/${KERNEL} --add-kernel-support --skip-repo
diff --git a/centos/centos-7.x/centos-7.6-hpc/install_mpis.sh b/centos/centos-7.x/centos-7.6-hpc/install_mpis.sh
@@ -11,13 +11,16 @@ set GCC=/opt/${GCC_VERSION}/bin/gcc
 
 INSTALL_PREFIX=/opt
 
-# HPC-X v2.7.0
-HPCX_VERSION="v2.7.0"
-HPCX_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/hpcx-v2.7.0-gcc9.2.0-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat7.6-x86_64.tbz
-$COMMON_DIR/download_and_verify.sh $HPCX_DOWNLOAD_URL "18d4be252d11b80d1e00cda814861d24fe9defcd800e5b1892c23148bbb460cf"
-tar -xvf hpcx-${HPCX_VERSION}-gcc9.2.0-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat7.6-x86_64.tbz
-mv hpcx-${HPCX_VERSION}-gcc-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat7.6-x86_64 ${INSTALL_PREFIX}
-HPCX_PATH=${INSTALL_PREFIX}/hpcx-${HPCX_VERSION}-gcc-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat7.6-x86_64
+# HPC-X v2.7.2
+HPCX_VERSION="v2.7.2"
+HPCX_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/hpcx-v2.7.2-gcc-MLNX_OFED_LINUX-5.1-2.4.6.0-redhat7.6-x86_64.tbz
+TARBALL=$(basename ${HPCX_DOWNLOAD_URL})
+HPCX_FOLDER=$(basename ${HPCX_DOWNLOAD_URL} .tbz)
+
+$COMMON_DIR/download_and_verify.sh $HPCX_DOWNLOAD_URL "520b1d8f30f55da954fb2af3766b770ebdbd3f07c154ec6621adda656c44692c"
+tar -xvf ${TARBALL}
+mv ${HPCX_FOLDER} ${INSTALL_PREFIX}
+HPCX_PATH=${INSTALL_PREFIX}/${HPCX_FOLDER}
 
 # Setup module files for MPIs
 mkdir -p /usr/share/Modules/modulefiles/mpi/

diff --git a/centos/centos-7.x/centos-7.7-hpc/install_amd_libs.sh b/centos/centos-7.x/centos-7.7-hpc/install_amd_libs.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
 
-../../common/install_amd_libs.sh
-
+$COMMON_DIR/../centos/centos-7.x/common/install_amd_libs.sh
diff --git a/centos/centos-7.x/centos-7.7-hpc/install_mellanoxofed.sh b/centos/centos-7.x/centos-7.7-hpc/install_mellanoxofed.sh
@@ -1,15 +1,18 @@
 #!/bin/bash
 set -ex
 
-MLNX_OFED_DOWNLOAD_URL=http://content.mellanox.com/ofed/MLNX_OFED-5.1-0.6.6.0/MLNX_OFED_LINUX-5.1-0.6.6.0-rhel7.7-x86_64.tgz
-$COMMON_DIR/download_and_verify.sh $MLNX_OFED_DOWNLOAD_URL "22ef65aa07ba4d5e2af57465053440fad18a71528e3040d94b4fec5a38803fe8"
-tar zxvf MLNX_OFED_LINUX-5.1-0.6.6.0-rhel7.7-x86_64.tgz
+MLNX_OFED_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/MLNX_OFED_LINUX-5.1-2.4.6.0-rhel7.7-x86_64.tgz
+TARBALL=$(basename ${MLNX_OFED_DOWNLOAD_URL})
+MOFED_FOLDER=$(basename ${MLNX_OFED_DOWNLOAD_URL} .tgz)
+
+$COMMON_DIR/download_and_verify.sh $MLNX_OFED_DOWNLOAD_URL "777fe2be20f4ea7fc2e665f490a8371957b2ac3877cc72019d2e09448dc775f1"
+tar zxvf ${TARBALL}
 
 KERNEL=( $(rpm -q kernel | sed 's/kernel\-//g') )
 KERNEL=${KERNEL[-1]}
 # Uncomment the lines below if you are running this on a VM
 #RELEASE=( $(cat /etc/centos-release | awk '{print $4}') )
 #yum -y install http://olcentgbl.trafficmanager.net/centos/${RELEASE}/updates/x86_64/kernel-devel-${KERNEL}.rpm
 yum install -y kernel-devel-${KERNEL}
-./MLNX_OFED_LINUX-5.1-0.6.6.0-rhel7.7-x86_64/mlnxofedinstall --kernel $KERNEL --kernel-sources /usr/src/kernels/${KERNEL} --add-kernel-support --skip-repo
+./${MOFED_FOLDER}/mlnxofedinstall --kernel $KERNEL --kernel-sources /usr/src/kernels/${KERNEL} --add-kernel-support --skip-repo
 
diff --git a/centos/centos-7.x/centos-7.7-hpc/install_mpis.sh b/centos/centos-7.x/centos-7.7-hpc/install_mpis.sh
@@ -11,13 +11,16 @@ set GCC=/opt/${GCC_VERSION}/bin/gcc
 
 INSTALL_PREFIX=/opt
 
-# HPC-X v2.7.0
-HPCX_VERSION="v2.7.0"
-HPCX_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/hpcx-v2.7.0-gcc9.2.0-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat7.7-x86_64.tbz
-$COMMON_DIR/download_and_verify.sh $HPCX_DOWNLOAD_URL "f910433576c76025d40829a8a5baee928b9cda8a2400353c1d5696f1d494ee41"
-tar -xvf hpcx-${HPCX_VERSION}-gcc9.2.0-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat7.7-x86_64.tbz
-mv hpcx-${HPCX_VERSION}-gcc-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat7.7-x86_64 ${INSTALL_PREFIX}
-HPCX_PATH=${INSTALL_PREFIX}/hpcx-${HPCX_VERSION}-gcc-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat7.7-x86_64
+# HPC-X v2.7.2
+HPCX_VERSION="v2.7.2"
+HPCX_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/hpcx-v2.7.2-gcc-MLNX_OFED_LINUX-5.1-2.4.6.0-redhat7.7-x86_64.tbz
+TARBALL=$(basename ${HPCX_DOWNLOAD_URL})
+HPCX_FOLDER=$(basename ${HPCX_DOWNLOAD_URL} .tbz)
+
+$COMMON_DIR/download_and_verify.sh $HPCX_DOWNLOAD_URL "e038a037b1a42e0386f4f99987680f60b931c1ddaceeb168f0b20b31ce4b8554"
+tar -xvf ${TARBALL}
+mv ${HPCX_FOLDER} ${INSTALL_PREFIX}
+HPCX_PATH=${INSTALL_PREFIX}/${HPCX_FOLDER}
 
 # Setup module files for MPIs
 mkdir -p /usr/share/Modules/modulefiles/mpi/

diff --git a/centos/centos-7.x/centos-7.8-hpc/install_amd_libs.sh b/centos/centos-7.x/centos-7.8-hpc/install_amd_libs.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
 
-../../common/install_amd_libs.sh
-
+$COMMON_DIR/../centos/centos-7.x/common/install_amd_libs.sh
diff --git a/centos/centos-7.x/centos-7.8-hpc/install_mellanoxofed.sh b/centos/centos-7.x/centos-7.8-hpc/install_mellanoxofed.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 set -ex
 
-MLNX_OFED_DOWNLOAD_URL=http://content.mellanox.com/ofed/MLNX_OFED-5.1-2.3.7.1/MLNX_OFED_LINUX-5.1-2.3.7.1-rhel7.8-x86_64.tgz
+MLNX_OFED_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/MLNX_OFED_LINUX-5.1-2.4.6.0-rhel7.8-x86_64.tgz
 TARBALL=$(basename ${MLNX_OFED_DOWNLOAD_URL})
 MOFED_FOLDER=$(basename ${MLNX_OFED_DOWNLOAD_URL} .tgz)
 
-$COMMON_DIR/download_and_verify.sh $MLNX_OFED_DOWNLOAD_URL "9d3b8ed5c16f91622552960ea5b28e56aaed6a523174edf4979001c7dc307ac9"
+$COMMON_DIR/download_and_verify.sh $MLNX_OFED_DOWNLOAD_URL "86aa6256ff828db0fa31c06c1ed76831e335ad7fe9a04f7c178029177497ee6a"
 tar zxvf ${TARBALL}
 
 KERNEL=( $(rpm -q kernel | sed 's/kernel\-//g') )

diff --git a/centos/centos-7.x/centos-7.8-hpc/install_mpis.sh b/centos/centos-7.x/centos-7.8-hpc/install_mpis.sh
@@ -11,14 +11,14 @@ set GCC=/opt/${GCC_VERSION}/bin/gcc
 
 INSTALL_PREFIX=/opt
 
-# HPC-X v2.7.0
-HPCX_VERSION="v2.7.0"
-HPCX_DOWNLOAD_URL=http://content.mellanox.com/hpc/hpc-x/v2.7/hpcx-v2.7.0-gcc-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat7.8-x86_64.tbz
-HPCX_TARBALL=$(basename ${HPCX_DOWNLOAD_URL})
+# HPC-X v2.7.2
+HPCX_VERSION="v2.7.2"
+HPCX_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/hpcx-v2.7.2-gcc-MLNX_OFED_LINUX-5.1-2.4.6.0-redhat7.8-x86_64.tbz
+TARBALL=$(basename ${HPCX_DOWNLOAD_URL})
 HPCX_FOLDER=$(basename ${HPCX_DOWNLOAD_URL} .tbz)
 
-$COMMON_DIR/download_and_verify.sh $HPCX_DOWNLOAD_URL "07f5dfb8f3e85371b4f6ca0da8be35f5f6002def748266a54493ce0d96a766e3"
-tar -xvf ${HPCX_TARBALL}
+$COMMON_DIR/download_and_verify.sh $HPCX_DOWNLOAD_URL "9dba1dd103e004dadf9e6784468926a47650af2f8b80a2893b0f49c5328cd507"
+tar -xvf ${TARBALL}
 mv ${HPCX_FOLDER} ${INSTALL_PREFIX}
 HPCX_PATH=${INSTALL_PREFIX}/${HPCX_FOLDER}
 

diff --git a/centos/centos-7.x/common/install_amd_libs.sh b/centos/centos-7.x/common/install_amd_libs.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -ex
+
+INSTALL_PREFIX=/opt/amd
+mkdir -p ${INSTALL_PREFIX}
+
+AOCL_VERSION="2.2-4"
+AOCL_DOWNLOAD_URL="https://azhpcstor.blob.core.windows.net/azhpc-images-store/aocl-linux-aocc-2.2-4_centos7.tar.gz"
+$COMMON_DIR/download_and_verify.sh $AOCL_DOWNLOAD_URL "4bdc5caec0233066ded3e2bfedb1e03bdeec82725361764d8860075f64ff4031"
+
+TARBALL=$(basename ${AOCL_DOWNLOAD_URL})
+tar -xvf ${TARBALL}
+cd aocl-linux-aocc-${AOCL_VERSION}
+
+./install.sh -t amd -l blis fftw libflame
+cp -r amd/2.2/* ${INSTALL_PREFIX}
+cd .. && rm -rf aocl-linux-aocc-${AOCL_VERSION}
+
+# Setup module files for AMD Libraries
+mkdir -p /usr/share/Modules/modulefiles/amd/
+
+# fftw
+cat << EOF >> /usr/share/Modules/modulefiles/amd/aocl-${AOCL_VERSION}
+#%Module 1.0
+#
+#  AOCL
+#
+prepend-path    LD_LIBRARY_PATH   ${INSTALL_PREFIX}/lib
+setenv          AMD_FFTW_INCLUDE  ${INSTALL_PREFIX}/include
+EOF
+
+# Create symlinks for modulefiles
+ln -s /usr/share/Modules/modulefiles/amd/aocl-${AOCL_VERSION} /usr/share/Modules/modulefiles/amd/aocl
diff --git a/centos/centos-8.x/centos-8.1-hpc/install_amd_libs.sh b/centos/centos-8.x/centos-8.1-hpc/install_amd_libs.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
 
-../../common/install_amd_libs.sh
-
+$COMMON_DIR/../centos/centos-8.x/common/install_amd_libs.sh
diff --git a/centos/centos-8.x/centos-8.1-hpc/install_mellanoxofed.sh b/centos/centos-8.x/centos-8.1-hpc/install_mellanoxofed.sh
@@ -1,14 +1,18 @@
 #!/bin/bash
 set -ex
 
-MLNX_OFED_DOWNLOAD_URL=http://content.mellanox.com/ofed/MLNX_OFED-5.1-0.6.6.0/MLNX_OFED_LINUX-5.1-0.6.6.0-rhel8.1-x86_64.tgz
-$COMMON_DIR/download_and_verify.sh $MLNX_OFED_DOWNLOAD_URL "9d5ca5a32270c0c577582abab7c5f441b439c9b69229b2c2e91fdee6be018f61"
-tar zxvf MLNX_OFED_LINUX-5.1-0.6.6.0-rhel8.1-x86_64.tgz
+MLNX_OFED_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/MLNX_OFED_LINUX-5.1-2.4.6.0-rhel8.1-x86_64.tgz
+TARBALL=$(basename ${MLNX_OFED_DOWNLOAD_URL})
+MOFED_FOLDER=$(basename ${MLNX_OFED_DOWNLOAD_URL} .tgz)
+
+$COMMON_DIR/download_and_verify.sh $MLNX_OFED_DOWNLOAD_URL "7a92e363f5a6aeb9cd6c2290c0ca1dc7334003dd614faa782d164057742b118e"
+tar zxvf ${TARBALL}
 
 KERNEL=( $(rpm -q kernel | sed 's/kernel\-//g') )
 KERNEL=${KERNEL[-1]}
 # Uncomment the lines below if you are running this on a VM
 #RELEASE=( $(cat /etc/centos-release | awk '{print $4}') )
 #yum install -y http://olcentwus.cloudapp.net/centos/${RELEASE}/BaseOS/x86_64/os/kernel-devel-${KERNEL}.rpm
 yum install -y kernel-devel-${KERNEL}
-./MLNX_OFED_LINUX-5.1-0.6.6.0-rhel8.1-x86_64/mlnxofedinstall --kernel $KERNEL --kernel-sources /usr/src/kernels/${KERNEL} --add-kernel-support --skip-repo
+./${MOFED_FOLDER}/mlnxofedinstall --kernel $KERNEL --kernel-sources /usr/src/kernels/${KERNEL} --add-kernel-support --skip-repo
+
diff --git a/centos/centos-8.x/centos-8.1-hpc/install_mpis.sh b/centos/centos-8.x/centos-8.1-hpc/install_mpis.sh
@@ -11,13 +11,16 @@ set GCC=/opt/${GCC_VERSION}/bin/gcc
 
 INSTALL_PREFIX=/opt
 
-# HPC-X v2.7.0
-HPCX_VERSION="v2.7.0"
-HPCX_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/hpcx-v2.7.0-gcc9.2.0-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat8.1-x86_64.tbz
-$COMMON_DIR/download_and_verify.sh $HPCX_DOWNLOAD_URL "0861622335f67b9f84556bc6a7d8758aa373943d69b49175526b99c53c576732"
-tar -xvf hpcx-${HPCX_VERSION}-gcc9.2.0-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat8.1-x86_64.tbz
-mv hpcx-${HPCX_VERSION}-gcc-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat8.1-x86_64 ${INSTALL_PREFIX}
-HPCX_PATH=${INSTALL_PREFIX}/hpcx-${HPCX_VERSION}-gcc-MLNX_OFED_LINUX-5.1-0.6.6.0-redhat8.1-x86_64
+# HPC-X v2.7.2
+HPCX_VERSION="v2.7.2"
+HPCX_DOWNLOAD_URL=https://azhpcstor.blob.core.windows.net/azhpc-images-store/hpcx-v2.7.2-gcc-MLNX_OFED_LINUX-5.1-2.4.6.0-redhat8.1-x86_64.tbz
+TARBALL=$(basename ${HPCX_DOWNLOAD_URL})
+HPCX_FOLDER=$(basename ${HPCX_DOWNLOAD_URL} .tbz)
+
+$COMMON_DIR/download_and_verify.sh $HPCX_DOWNLOAD_URL "6b0893ccd72c554396ef7827a3bef7cd6fcb15f288303d61dab5f2f78b029b57"
+tar -xvf ${TARBALL}
+mv ${HPCX_FOLDER} ${INSTALL_PREFIX}
+HPCX_PATH=${INSTALL_PREFIX}/${HPCX_FOLDER}
 
 # Setup module files for MPIs
 mkdir -p /usr/share/Modules/modulefiles/mpi/

diff --git a/centos/centos-8.x/common/install_amd_libs.sh b/centos/centos-8.x/common/install_amd_libs.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -ex
+
+INSTALL_PREFIX=/opt/amd
+mkdir -p ${INSTALL_PREFIX}
+
+AOCL_VERSION="2.2.1"
+AOCL_DOWNLOAD_URL="https://azhpcstor.blob.core.windows.net/azhpc-images-store/aocl-linux-aocc-2.2.1_centos8.tar.gz"
+$COMMON_DIR/download_and_verify.sh $AOCL_DOWNLOAD_URL "cbe5afbdc241047a9d8814b5557be429aa0d9d2b83408eca8244e1ab9c8e2c87"
+
+TARBALL=$(basename ${AOCL_DOWNLOAD_URL})
+tar -xvf ${TARBALL}
+cd aocl-linux-aocc-${AOCL_VERSION}_centos8
+
+./install.sh -t amd -l blis fftw libflame
+cp -r amd/${AOCL_VERSION}_centos8/* ${INSTALL_PREFIX}
+cd .. && rm -rf aocl-linux-aocc-${AOCL_VERSION}_centos8
+
+# Setup module files for AMD Libraries
+mkdir -p /usr/share/Modules/modulefiles/amd/
+
+# fftw
+cat << EOF >> /usr/share/Modules/modulefiles/amd/aocl-${AOCL_VERSION}
+#%Module 1.0
+#
+#  AOCL
+#
+prepend-path    LD_LIBRARY_PATH   ${INSTALL_PREFIX}/lib
+setenv          AMD_FFTW_INCLUDE  ${INSTALL_PREFIX}/include
+EOF
+
+# Create symlinks for modulefiles
+ln -s /usr/share/Modules/modulefiles/amd/aocl-${AOCL_VERSION} /usr/share/Modules/modulefiles/amd/aocl
diff --git a/centos/common/hpc-tuning.sh b/centos/common/hpc-tuning.sh
@@ -18,7 +18,11 @@ echo "vm.zone_reclaim_mode = 1" >> /etc/sysctl.conf
 sysctl -p
 
 # Configure WALinuxAgent
-sed -i -e 's/# OS.EnableRDMA=y/OS.EnableRDMA=y/g' /etc/waagent.conf
-# sed -i -e 's/CGroups.EnforceLimits=n/CGroups.EnforceLimits=y/g' /etc/waagent.conf
-systemctl enable waagent
-
+sudo sed -i -e 's/# OS.EnableRDMA=y/OS.EnableRDMA=y/g' /etc/waagent.conf
+echo "Extensions.GoalStatePeriod=300" | sudo tee -a /etc/waagent.conf
+echo "OS.EnableFirewallPeriod=300" | sudo tee -a /etc/waagent.conf
+echo "OS.RemovePersistentNetRulesPeriod=300" | sudo tee -a /etc/waagent.conf
+echo "OS.RootDeviceScsiTimeoutPeriod=300" | sudo tee -a /etc/waagent.conf
+echo "OS.MonitorDhcpClientRestartPeriod=60" | sudo tee -a /etc/waagent.conf
+echo "Provisioning.MonitorHostNamePeriod=60" | sudo tee -a /etc/waagent.conf
+sudo systemctl restart waagent
diff --git a/centos/common/install_amd_libs.sh b/centos/common/install_amd_libs.sh