#2601 Replace -gpu=managed w/ -gpu=mem:managed

stfc · Nov 29, 2024 · 33046fa · 33046fa
1 parent be3c99b
commit 33046fa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/nemo_v5_tests.yml b/.github/workflows/nemo_v5_tests.yml
@@ -212,7 +212,7 @@ jobs:
         # We compile at -O1 to permit comparison of the results.
         cd $NEMO_DIR
         cp $PSYCLONE_NEMO_DIR/KGOs/arch-linux_spack.fcm arch/arch-linux_spack.fcm
-        export FCFLAGS="-i4 -Mr8 -O1 -Kieee -nofma -Mnovect -g -mp=gpu -gpu=managed"
+        export FCFLAGS="-i4 -Mr8 -O1 -Kieee -nofma -Mnovect -g -mp=gpu -gpu=mem:managed"
         
         # Clean up and compile
         # Without key_mpi_off it fails to compile (even without psyclone)

diff --git a/examples/gocean/eg1/Makefile b/examples/gocean/eg1/Makefile
@@ -39,7 +39,7 @@
 # openacc compilation with managed memory, use:
 #
 # export F90=nvfortran
-# export F90FLAGS="-acc=gpu -Minfo=all -gpu=managed"
+# export F90FLAGS="-acc=gpu -Minfo=all -gpu=mem:managed"
 # export LDFLAGS=""
 
 include ../../common.mk

diff --git a/examples/lfric/scripts/KGOs/nvfortran_acc.mk b/examples/lfric/scripts/KGOs/nvfortran_acc.mk
@@ -12,7 +12,7 @@
 #
 F_MOD_DESTINATION_ARG = -module$(SPACE)
 
-FFLAGS_COMPILER           = 
+FFLAGS_COMPILER           =
 FFLAGS_NO_OPTIMISATION    = -O0
 FFLAGS_SAFE_OPTIMISATION  = -O2
 FFLAGS_RISKY_OPTIMISATION = -O4
@@ -25,11 +25,11 @@ FFLAGS_FORTRAN_STANDARD   =
 # The LFRIC_OFFLOAD_DIRECTIVES env_variable is also queried in the PSyclone
 # script to generate matching directives
 ifeq ("$(LFRIC_OFFLOAD_DIRECTIVES)", "omp")
-	OPENMP_ARG = -mp=gpu -gpu=managed
-	LDFLAGS_COMPILER = -mp=gpu -gpu=managed -cuda
+	OPENMP_ARG = -mp=gpu -gpu=mem:managed
+	LDFLAGS_COMPILER = -mp=gpu -gpu=mem:managed -cuda
 else ifeq ("$(LFRIC_OFFLOAD_DIRECTIVES)", "acc")
-	OPENMP_ARG = -acc=gpu -gpu=managed -mp=multicore
-	LDFLAGS_COMPILER = -acc=gpu -gpu=managed -mp=multicore -cuda
+	OPENMP_ARG = -acc=gpu -gpu=mem:managed -mp=multicore
+	LDFLAGS_COMPILER = -acc=gpu -gpu=mem:managed -mp=multicore -cuda
 else
 	OPENMP_ARG = -mp
 	LDFLAGS_COMPILER = -mp