From bea94e766fe6ecec1dbeb10f37c2937c280ca727 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 8 Sep 2023 15:09:42 +0200
Subject: [PATCH] Philippe 08/09/2023: adapt compilation and run tests for
 Adastra (on CPU Genoa nodes)

---
 src/Rules.LXcray.mk                     |  2 +-
 src/configure                           | 14 ++---
 src/job_make_examples_HPE_adastra_genoa | 68 +++++++++++++++++++++++++
 src/job_make_mesonh_HPE_adastra_genoa   | 22 ++++++++
 4 files changed, 99 insertions(+), 7 deletions(-)
 create mode 100755 src/job_make_examples_HPE_adastra_genoa
 create mode 100755 src/job_make_mesonh_HPE_adastra_genoa

diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk
index 861de4c13..b1579f030 100644
--- a/src/Rules.LXcray.mk
+++ b/src/Rules.LXcray.mk
@@ -185,7 +185,7 @@ ifeq ($(shell test $(CFV) -ge 1402 ; echo $$?),0)
 CPPFLAGS_MNH       += -DMNH_COMPILER_CCE_1403
 endif
 CPPFLAGS_MNH       += -DMNH_EXPAND -DMNH_EXPAND_LOOP -DMNH_EXPAND_OPENACC
-CPPFLAGS_MNH       += -imacros MNH_OPENACC_NV_CR.CPP
+#CPPFLAGS_MNH       += -imacros MNH_OPENACC_NV_CR.CPP
 ifdef VER_GA
 CPPFLAGS_SURCOUCHE += -DMNH_GA
 INC                += -I${GA_ROOT}/include
diff --git a/src/configure b/src/configure
index 37676dd4b..da1adb309 100755
--- a/src/configure
+++ b/src/configure
@@ -54,22 +54,24 @@ case "$TARG" in
 'Linux login'*)
                 export ARCH=${ARCH:-LXcray}
                 export VER_MPI=${VER_MPI:-MPICRAY}
-                export OPTLEVEL=${OPTLEVEL:-OPENACC}
+#                export OPTLEVEL=${OPTLEVEL:-OPENACC}
+                export OPTLEVEL=${OPTLEVEL:-O2}
                 export MVWORK=${MVWORK:-NO}
                 export VER_CDF=${VER_CDF:-CDFAUTO}
 if [ "${VER_MPI}" == "MPICRAY" ] 
 then	
 export MNHENV=${MNHENV:-"
 module purge
-module load craype-x86-trento
+#module load craype-x86-trento
+module load craype-x86-genoa
 module load craype-network-ofi
 module load PrgEnv-cray/8.3.3
-module load cce/15.0.0
+module load cce/15.0.1
 module load craype/2.7.19
-module load cray-mpich/8.1.21
+module load cray-mpich/8.1.24
 module load libfabric/1.15.2.0
-module load craype-accel-amd-gfx90a
-module load rocm/5.2.3
+#module load craype-accel-amd-gfx90a
+module load rocm/5.3.0
 
 export CCE_ALIAS_NONE=:on
 export CCE_NO_PTR_TO_PTR_ALIAS=:on
diff --git a/src/job_make_examples_HPE_adastra_genoa b/src/job_make_examples_HPE_adastra_genoa
new file mode 100755
index 000000000..748fac3e0
--- /dev/null
+++ b/src/job_make_examples_HPE_adastra_genoa
@@ -0,0 +1,68 @@
+#!/bin/bash
+#SBATCH -J Examples
+#SBATCH -N 1            # nodes number
+#SBATCH -n 4            # CPUs number (on all nodes) 
+#SBATCH -C GENOA
+##SBATCH --exclusive           
+#SBATCH -o Examples.eo%j   #
+#SBATCH -e Examples.eo%j   #
+#SBATCH -t 01:00:00    # time limit
+#SBATCH --export=NONE
+#SBATCH -A mnh # put here you account/projet name
+
+# Echo of commands
+ulimit -c 0
+ulimit -s unlimited
+# Stop job at first error
+#set -e
+set -x
+# Machine name
+hostname 
+
+unset MAKEFLAGS
+
+. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-6-1-MPICRAY-O2
+export MONORUN="Exec srun -l -n 1 --export=ALL"
+export MPIRUN="Exec srun -l -n 4 --export=ALL"
+export POSTRUN="echo "
+
+cd $SRC_MESONH/MY_RUN/KTEST/003_KW78 
+make -k
+#
+echo "#################################################################################"
+echo "##NEXT CASE######################################################################"
+echo "#################################################################################"
+cd $SRC_MESONH/MY_RUN/KTEST/001_2Drelief 
+make -k
+#
+echo "#################################################################################"
+echo "##NEXT CASE######################################################################"
+echo "#################################################################################"
+cd $SRC_MESONH/MY_RUN/KTEST/002_3Drelief 
+make -k
+#
+echo "#################################################################################"
+echo "##NEXT CASE######################################################################"
+echo "#################################################################################"
+
+cd $SRC_MESONH/MY_RUN/KTEST/004_Reunion
+make -k << EOF 
+
+
+EOF
+#
+echo "#################################################################################"
+echo "##NEXT CASE######################################################################"
+echo "#################################################################################"
+cd $SRC_MESONH/MY_RUN/KTEST/007_16janvier
+make -k << EOF 
+
+
+EOF
+#
+echo "#################################################################################"
+echo "##NEXT CASE######################################################################"
+echo "#################################################################################"
+cd $SRC_MESONH/MY_RUN/KTEST/014_LIMA 
+make -k
+
diff --git a/src/job_make_mesonh_HPE_adastra_genoa b/src/job_make_mesonh_HPE_adastra_genoa
new file mode 100755
index 000000000..c7816c776
--- /dev/null
+++ b/src/job_make_mesonh_HPE_adastra_genoa
@@ -0,0 +1,22 @@
+#!/bin/bash
+#MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
+#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+#MNH_LIC for details. version 1.
+#SBATCH --job-name=compile_MNH
+#SBATCH -N 1 -n 1 -c 32
+#SBATCH -o Sortie_compile_MasterI.eo%j      
+#SBATCH --export=NONE
+#SBATCH -C GENOA
+#SBATCH --time 01:00:00
+#SBATCH -A mnh # put here your account/projet name
+
+set -x
+# On va lancer la compilation dans le répertoire de lancement du job
+pwd
+
+. ../conf/profile_mesonh-LXcray-R8I4-MNH-V5-6-1-MPICRAY-O2
+
+time make -j 32
+time make -j 1 installmaster
+
-- 
GitLab