Merge tag '1.3.0' into to_CY50

1.3.0

.github/tools/install-intel-oneapi.sh

@@ -1,14 +1,14 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
-KEY=GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
+version=2023.2.0
+KEY=GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
 wget https://apt.repos.intel.com/intel-gpg-keys/$KEY
 sudo apt-key add $KEY
 rm $KEY
 echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
 sudo apt-get update
 sudo apt-get install \
-    intel-oneapi-compiler-fortran \
-    intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic \
-    intel-oneapi-mpi \
-    intel-oneapi-mpi-devel \
-    intel-oneapi-mkl
+    intel-oneapi-compiler-fortran-$version \
+    intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-$version \
+    intel-oneapi-mpi-devel-2021.10.0 \
+    intel-oneapi-mkl-$version

.github/tools/install-mpi.sh

@@ -62,6 +62,8 @@ case "$os" in
             openmpi)
                 brew ls --versions openmpi || brew install openmpi
                 echo "localhost slots=72" >> $(brew --prefix)/etc/openmpi-default-hostfile
+                echo "localhost slots=72" >> $(brew --prefix)/etc/prte-default-hostfile
+
                 # workaround for open-mpi/omp#7516
                 echo "setting the mca gds to hash..."
                 echo "gds = hash" >> $(brew --prefix)/etc/pmix-mca-params.conf

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
           - linux gnu-10
           - linux clang-12
           - linux nvhpc-21.9
-          - linux intel
+          - linux intel-classic
           - macos
 
         include:
@@ -73,9 +73,9 @@ jobs:
             cmake_options: -DCMAKE_CXX_FLAGS=--diag_suppress177
             caching: false
 
-          - name : linux intel
+          - name : linux intel-classic
             os: ubuntu-20.04
-            compiler: intel-oneapi
+            compiler: intel-classic
             compiler_cc: icc
             compiler_cxx: icpc
             compiler_fc: ifort
@@ -136,7 +136,7 @@ jobs:
         ${FIAT_TOOLS}/install-intel-oneapi.sh
         source /opt/intel/oneapi/setvars.sh
         printenv >> $GITHUB_ENV
-        echo "CACHE_SUFFIX=$(icc -dumpversion)" >> $GITHUB_ENV
+        echo "CACHE_SUFFIX=$CC-$($CC -dumpversion)" >> $GITHUB_ENV
 
     - name: Install MPI
       shell: bash -eux {0}

VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

src/fiat/drhook/dr_hook_init.F90

@@ -74,6 +74,7 @@ SUBROUTINE DR_HOOK_ASSERT_MPI_INITIALIZED_()
   CMPIRUN_DETECT(2) = 'ALPS_APP_PE'           ! Cray PE
   CMPIRUN_DETECT(3) = 'PMI_SIZE'              ! Intel
   CMPIRUN_DETECT(4) = 'SLURM_STEP_NUM_TASKS'  ! Slurm
+  ! When adding here, change NVARS parameter above
 
   LMPI_REQUIRED = .FALSE.
   DO IVAR=1,NVARS

src/fiat/drhook/drhook.c

@@ -4152,7 +4152,6 @@ c_drhook_print_(const int *ftnunitno,
       int nprof = 0;
       drhook_prof_t *prof = NULL;
       drhook_prof_t *p;
-      double flop_tot = 0, instr_tot = 0;
       double *flop = NULL, *instr = NULL;
 
       if (!opt_wallprof && !opt_cpuprof) return; /* no profiling info available */
@@ -4332,12 +4331,8 @@ c_drhook_print_(const int *ftnunitno,
         p = prof;
         qsort(p, nprof, sizeof(*p), prof_pc_comp_desc);
 
-        flop_tot = 0;
-        instr_tot = 0;
         max_overhead_pc = 0;
         for (t=0; t<numthreads; t++) {
-          flop_tot += flop[t];
-          instr_tot += instr[t];
           if (overhead) {
             max_overhead_pc = MAX(max_overhead_pc,overhead[t]);
 #ifdef DEBUG