Changeset 10895 for NEMO

Timestamp:

2019-04-25T14:51:34+02:00 (5 years ago)

Author:

wayne_gaudin

Message:

Fixed the GPU=1 compile option to not use managed memory

File:

• NEMO/branches/UKMO/BPC_miniapp/Master/Makefile (modified) (5 diffs)

NEMO/branches/UKMO/BPC_miniapp/Master/Makefile

@@ -2 +2 @@
 # Make several versions, plus extract individual versions
 # make clean; make
-# Make and scalar CPU version
-# make clean; make CPU=1
-# ./bpc.exe
+# Make and scalar GPU version
+# make clean GPU=1 ; make GPU=1
+# ./bpc_gpu.exe
 #
 # Make and run mananged memory version for GPU
@@ -22 +22 @@
 # Default flags are the GPU with managed memory
 MANAGED=1
-TARGET=gpu
+TARGET=managed
 FMACPU=
+
 ifdef MANAGED
   MANAGE=,managed -DMANAGED
+  TARGET=managed
+endif
+
+ifdef GPU 
+  TARGET=gpu
+  MANAGE=
 endif
 
@@ -31 +38 @@
 TARGET=*
 endif
-
 
 FLAGS = -gopt -Mpreprocess -fast -acc -Minfo=acc -ta=tesla,cc70$(MANAGE)
@@ -40 +46 @@
   LFLAGS= -gopt -Mpreprocess -fast -mp=nonuma -Minfo=mp $(FMACPU)
   TARGET=cpu
+  MANAGE=
 endif
 
@@ -46 +53 @@
   FLAGS= -gopt -Mpreprocess -fast -acc -Minfo=acc -ta=multicore
   TARGET=multi
+  MANAGE=
 endif