compiler updates

This commit is contained in:
edoapra 2023-02-17 10:26:14 -08:00
parent c0a37c8dd2
commit 0ae094fab1
No known key found for this signature in database
GPG key ID: 48E12DA1EDE9E1B0
2 changed files with 8 additions and 8 deletions

View file

@ -182,7 +182,7 @@ if [[ "$os" == "Linux" ]]; then
fi
if [[ "$FC" == "flang" ]]; then
if [[ "USE_AOMP" == "Y" ]]; then
aomp_major=14
aomp_major=16
aomp_minor=0-3
wget -nv https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_"$aomp_major"."$aomp_minor"/aomp_Ubuntu2004_"$aomp_major"."$aomp_minor"_amd64.deb
sudo dpkg -i aomp_Ubuntu2004_"$aomp_major"."$aomp_minor"_amd64.deb
@ -203,7 +203,7 @@ if [[ "$os" == "Linux" ]]; then
fi
if [[ "$FC" == "amdflang" ]]; then
sudo apt-get install -y wget gnupg2 coreutils dialog tzdata
rocm_version=5.4.1
rocm_version=5.4.3
wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | sudo apt-key add -
echo 'deb [arch=amd64] https://repo.radeon.com/rocm/apt/'$rocm_version'/ ubuntu main' | sudo tee /etc/apt/sources.list.d/rocm.list
sudo apt-get update -y && sudo apt-get -y install rocm-llvm openmp-extras
@ -214,8 +214,8 @@ if [[ "$os" == "Linux" ]]; then
fi
if [[ "$FC" == "nvfortran" ]]; then
sudo apt-get -y install lmod g++ libtinfo5 libncursesw5 lua-posix lua-filesystem lua-lpeg lua-luaossl
nv_major=22
nv_minor=11
nv_major=23
nv_minor=1
nverdot="$nv_major"."$nv_minor"
nverdash="$nv_major"-"$nv_minor"
arch_dpkg=`dpkg --print-architecture`

View file

@ -25,8 +25,8 @@ echo NWCHEM_TOP is $NWCHEM_TOP
export USE_MPI=y
if [[ "$FC" == "flang" ]]; then
if [[ "USE_AOMP" == "Y" ]]; then
aomp_major=15
aomp_minor=0-2
aomp_major=16
aomp_minor=0-3
export PATH=/usr/lib/aomp_"$aomp_major"."$aomp_minor"/bin/:$PATH
export LD_LIBRARY_PATH=/usr/lib/aomp_"$aomp_major"."$aomp_minor"/lib:$LD_LIBRARY_PATH
else
@ -41,8 +41,8 @@ if [[ "$FC" == "amdflang" ]]; then
fi
if [[ "$FC" == "nvfortran" ]]; then
nv_major=22
nv_minor=11
nv_major=23
nv_minor=1
nverdot="$nv_major"."$nv_minor"
export PATH=/opt/nvidia/hpc_sdk/Linux_"$arch"/"$nverdot"/compilers/bin:$PATH
export LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_"$arch"/"$nverdot"/compilers/lib:$LD_LIBRARY_PATH