diff --git a/README.md b/README.md index 6c56b0fde..8ee1e9c80 100644 --- a/README.md +++ b/README.md @@ -241,8 +241,6 @@ Running ------- No extra run-time options are needed to run the GPU enabled ecWam. Please note that this means that if ecWam is built using the `--with-loki` and `--with-acc` bundle arguments, it will necessarily be offloaded for GPU execution. -For multi-GPU runs, the number of GPUs maps to the number of MPI ranks. Thus multiple GPUs can be requested by -launching with multiple MPI ranks. The mapping of MPI ranks to GPUs assumes at most 4 GPUs per host node. Environment variables --------------------- diff --git a/src/ecwam/CMakeLists.txt b/src/ecwam/CMakeLists.txt index eaa457086..5fc40088b 100644 --- a/src/ecwam/CMakeLists.txt +++ b/src/ecwam/CMakeLists.txt @@ -269,7 +269,6 @@ list( APPEND ecwam_srcs w_mode_st.F90 w_pdf.F90 w_pmax.F90 - wam_init_gpu_mod.F90 wam_multio_mod.F90 wam_nproma.F90 wam_sorti.F90 diff --git a/src/ecwam/wam_init_gpu_mod.F90 b/src/ecwam/wam_init_gpu_mod.F90 deleted file mode 100644 index 2c16e0617..000000000 --- a/src/ecwam/wam_init_gpu_mod.F90 +++ /dev/null @@ -1,30 +0,0 @@ -! (C) Copyright 1989- ECMWF. -! -! This software is licensed under the terms of the Apache Licence Version 2.0 -! which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. -! In applying this licence, ECMWF does not waive the privileges and immunities -! granted to it by virtue of its status as an intergovernmental organisation -! nor does it submit to any jurisdiction. -! - - MODULE WAM_INIT_GPU_MOD - CONTAINS - SUBROUTINE WAM_INIT_GPU(IRANK) -#ifdef _OPENACC - USE OPENACC -#endif - USE PARKIND_WAVE, ONLY : JWIM - IMPLICIT NONE - - INTEGER(KIND=JWIM), INTENT(IN) :: IRANK - INTEGER :: DEVTYPE, DEVNUM, DEV - - -#ifdef _OPENACC - DEVTYPE = ACC_GET_DEVICE_TYPE() - DEVNUM = ACC_GET_NUM_DEVICES(DEVTYPE) - DEV = MOD(IRANK-1, DEVNUM) - CALL ACC_SET_DEVICE_NUM(DEV, DEVTYPE) -#endif - END SUBROUTINE WAM_INIT_GPU - END MODULE WAM_INIT_GPU_MOD diff --git a/src/ecwam/wvwaminit.F90 b/src/ecwam/wvwaminit.F90 index 811922e68..1b31d88b2 100644 --- a/src/ecwam/wvwaminit.F90 +++ b/src/ecwam/wvwaminit.F90 @@ -47,7 +47,6 @@ SUBROUTINE WVWAMINIT (LLCOUPLED, IULOG, LLRNL, & USE MPL_MODULE, ONLY : MPL_MYRANK, MPL_NPROC USE YOMHOOK , ONLY : LHOOK, DR_HOOK, JPHOOK - USE WAM_INIT_GPU_MOD, ONLY : WAM_INIT_GPU ! ---------------------------------------------------------------------- IMPLICIT NONE @@ -89,10 +88,6 @@ SUBROUTINE WVWAMINIT (LLCOUPLED, IULOG, LLRNL, & IRANK = MPL_MYRANK() NPROC = MPL_NPROC() -#if defined(WAM_GPU) - CALL WAM_INIT_GPU(IRANK) -#endif - ! STANDARD OUTPUT UNIT ! --------------------