Merge pull request #1269 from edoapra/aocc60

updates for elpa & github actions

src/libext/elpa/build_elpa.sh

@@ -17,7 +17,8 @@ echo %%%%%%% debug make failures
 #set -v
 arch=`uname -m`
 #SHORTVERSION=2023.05.001
-SHORTVERSION=2025.06.002
+#SHORTVERSION=2025.06.002
+SHORTVERSION=2026.02.001
 VERSION=new_release_${SHORTVERSION}
 source ../libext_utils/getfiles_utils.sh
 get_elpa $SHORTVERSION
@@ -286,9 +287,9 @@ if [[ ! -z "${ELPA_NVIDIA}" ]]; then
     if [[ ! -z "${GPU_ARCH}" ]]; then
 	export NVCC_APPEND_FLAGS=-arch=${GPU_ARCH}
 	GPUFLAGS+=" --with-NVIDIA-GPU-compute-capability=${GPU_ARCH} "
-	if [[ "${GPU_ARCH}" == sm_80 ]]; then
-	    GPUFLAGS+=" --enable-nvidia-sm80-gpu-kernels "
-	fi
+#	if [[ "${GPU_ARCH}" == sm_80 ]]; then
+#	    GPUFLAGS+=" --enable-nvidia-sm80-gpu-kernels "
+#	fi
     fi
 #    GPUFLAGS+=" --with-default-real-kernel=nvidia_gpu "
     if [[ ! -z "${CUDA_ROOT}" ]]; then

src/libext/libext_utils/getfiles_utils.sh

@@ -6,13 +6,14 @@ get_elpa(){
 	elpa_shortv=$1
     fi
     echo "Parameter #1 is $1"
-    VERSION=new_release_${elpa_shortv}
+#    VERSION=new_release_${elpa_shortv}
+    VERSION=${elpa_shortv}
     echo ELPA VERSION is $VERSION
     if [ -f  elpa-${VERSION}.tar.gz ]; then
 	echo "using existing"  elpa-${VERSION}.tar.gz
     else
 	rm -rf elpa*
-	ELPA_URL=("https://gitlab.mpcdf.mpg.de/elpa/elpa/-/archive/${VERSION}/elpa-${VERSION}.tar.gz" \
+	ELPA_URL=("https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${VERSION}/elpa-${VERSION}.tar.gz" \
 		      "https://web.archive.org/web/20260214233634/https://gitlab.mpcdf.mpg.de/elpa/elpa/-/archive/new_release_2025.06.002/elpa-new_release_2025.06.002.tar.gz")
 	for url in  "${ELPA_URL[@]}"
 	do

src/tools/get-tools-github

@@ -203,10 +203,12 @@ GOTMINGW64=` $CC -dM -E - </dev/null 2> /dev/null |grep MINGW64|cut -c21 `
 if [[ -d $GA_DIR ]]; then
     if [[ ! -f "${GA_DIR}/patched" ]]; then
 	echo patching
-	rm -f elpa.patch
-	wget https://github.com/edoapra/ga/commit/f65bcc756198b7928371e3e283f59ac525afff7a.patch -O elpa.patch
+	rm -f elpa?.patch
+        wget https://github.com/edoapra/ga/commit/f65bcc756198b7928371e3e283f59ac525afff7a.patch -O elpa1.patch
+	wget https://github.com/GlobalArrays/ga/commit/20692fced41074ae7c87adb309fba4c4e8e6675e.patch -O elpa2.patch
 	cd ${GA_DIR}
-	patch -p1 < ../elpa.patch
+	patch -p1 < ../elpa1.patch
+	patch -p1 < ../elpa2.patch
 	cd ..
 	touch ${GA_DIR}/patched
     else

src/tools/guess-mpidefs

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 # 
 declare -a LIST_MPIFWRAP
-LIST_MPIFWRAP=( 'mpif90' 'mpifort' 'mpiifort' 'mpifc' 'mpixlf_r' 'mpixlf' 'mpif77' 'mpifrt' 'mpifrtpx' 'mpif90-mpich-mp' 'mpifort-mpich-mp' 'mpif90-openmpi-mp' 'mpifort-openmpi-mp')
+LIST_MPIFWRAP=( ${MPIFC} ${MPIF90} ${MPIF77} 'mpif90' 'mpifort' 'mpiifort' 'mpifc' 'mpixlf_r' 'mpixlf' 'mpif77' 'mpifrt' 'mpifrtpx' 'mpif90-mpich-mp' 'mpifort-mpich-mp' 'mpif90-openmpi-mp' 'mpifort-openmpi-mp')
 export LIST_MPIFWRAP
 declare -a LIST_MPICWRAP
-LIST_MPICWRAP=( 'mpicc' 'mpixlc_r' 'mpixlc' 'mpigcc' 'mpiicc' 'mpifcc' 'mpifccpx' 'mpicc-mpich-mp' 'mpicc-openmpi-mp')
+LIST_MPICWRAP=(  ${MPICC} 'mpicc' 'mpixlc_r' 'mpixlc' 'mpigcc' 'mpiicc' 'mpifcc' 'mpifccpx' 'mpicc-mpich-mp' 'mpicc-openmpi-mp')
 export LIST_MPICWRAP
 function usage()
 {

travis/build_env.sh

@@ -255,10 +255,26 @@ if [[ "$os" == "Linux" ]]; then
 	    $MYSUDO ./llvm.sh $llvm_ver
 	    $MYSUDO apt-get install -y flang-$llvm_ver
 	fi
+	if [[ "$FC" == 'aof' ]]; then
+	    aocc_major=6
+	    aocc_minor=0
+	    aocc_patch=0
+	    aocc_version=${aocc_major}.${aocc_minor}.${aocc_patch}
+	    aocc_dir=aocc-${aocc_major}-${aocc_minor}
+	    aocc_file=aocc-compiler-${aocc_version}
+	    #		curl -sS -LJO https://developer.amd.com/wordpress/media/files/${aocc_dir}.tar
+	    tries=0 ; until [ "$tries" -ge 10 ] ; do \
+			  curl -sS -LJO https://download.amd.com/developer/eula/aocc/${aocc_dir}/${aocc_file}.tar \
+			      && break ; \
+			  tries=$((tries+1)) ; echo attempt no.  $tries    ; sleep 30 ;  done
+	    tar xf ${aocc_file}.tar
+	    ./${aocc_file}/install.sh
+	    source setenv_AOCC.sh
+	fi
 	if [[ "$FC" == "amdflang" ]]; then
 	    $MYSUDO apt-get install -y wget gnupg2 coreutils dialog tzdata
 	    $MYSUDO mkdir --parents --mode=0755 /etc/apt/keyrings
-	    rocm_version=7.0.1
+	    rocm_version=7.2.4
 #	    tries=0 ; until [ "$tries" -ge 10 ] ; do \
 #	    wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | gpg --dearmor |  $MYSUDO tee /etc/apt/keyrings/rocm.gpg > /dev/null \
 #		&& break ; \
@@ -280,7 +296,7 @@ if [[ "$os" == "Linux" ]]; then
 	if [[ "$FC" == "nvfortran" ]]; then
 	    $MYSUDO apt-get -y install lmod g++ libtinfo5 libncursesw5 lua-posix lua-filesystem lua-lpeg lua-luaossl
 	    nv_major=26
-	    nv_minor=1
+	    nv_minor=3
 	    nverdot="$nv_major"."$nv_minor"
 	    nverdash="$nv_major"-"$nv_minor"
 	    arch_dpkg=`dpkg --print-architecture`