Skip to content

Commit

Permalink
add slurm support for err_exit (#69)
Browse files Browse the repository at this point in the history
* add slurm support for err_exit
* use Intel Fortran 2023.2.1 for the Intel CI test
---------
Co-authored-by: Rahul Mahajan <aerorahul@users.noreply.github.com>
  • Loading branch information
guoqing-noaa authored Dec 11, 2023
1 parent 7ed3e7a commit d1db177
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
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-dev-utilities intel-oneapi-mpi-devel intel-oneapi-openmp intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic
sudo apt-get install intel-oneapi-dev-utilities intel-oneapi-mpi-devel intel-oneapi-openmp intel-oneapi-compiler-fortran-2023.2.1 intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2023.2.1
echo "source /opt/intel/oneapi/setvars.sh" >> ~/.bash_profile
- name: cache-bacio
Expand Down
12 changes: 8 additions & 4 deletions ush/err_exit
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,12 @@ if [ "$SENDECF" = "YES" ]; then
fi

# KILL THE JOB:
if [ -z $PBS_JOBID ]; then
ecflow_client --kill=${ECF_NAME:?}
else
qdel $PBS_JOBID
if [ "$SENDECF" = "YES" ]; then
ecflow_client --kill=${ECF_NAME:?}
fi

if [ ! -z $PBS_JOBID ]; then
qdel $PBS_JOBID
elif [ ! -z $SLURM_JOB_ID ]; then
scancel $SLURM_JOB_ID
fi

0 comments on commit d1db177

Please # to comment.