misc: Change name of new parameter

Author: JDBetteridge

devito/__init__.py

@@ -112,13 +112,6 @@ def reinit_compiler(val):
 # optimisations.
 configuration.add('safe-math', 0, [0, 1], preprocessor=bool, callback=reinit_compiler)
 
-# Use any GPU present on the node to set parameters such as the autopadding value.
-# This can be disabled by setting this parameter to `0`, but should not be toggled.
-# By setting the value to zero the user is promising that they will not try to use
-# the GPU at any point during the running of their script, this is useful when
-# iGPUs, APUs or disabled GPUs are present on a node.
-configuration.add('gpu', 1, [0, 1], preprocessor=bool)
-
 
 # Enable/disable automatic padding for allocated data
 def _preprocess_autopadding(v):
@@ -135,6 +128,13 @@ def _preprocess_autopadding(v):
                   [False, True, 0, 1, np.float16, np.float32, np.float64],
                   preprocessor=_preprocess_autopadding)
 
+# Use any GPU present on the node to set parameters such as the autopadding
+# value. This can be disabled by setting this parameter to , but should not be
+# toggled. By setting the value to 'cpu-only' the user is promising that they
+# will not try to use the GPU at any point during the running of their script,
+# this is useful when iGPUs, APUs or disabled GPUs are present on a node.
+configuration.add('autopadding-mode', None, [None, 'cpu-only'])
+
 # Select target device
 configuration.add('deviceid', -1, preprocessor=int, impacts_jit=False)
 

devito/arch/archinfo.py

@@ -1246,7 +1246,7 @@ def node_max_mem_trans_nbytes(platform):
 
     if isinstance(platform, Cpu64):
         gpu_info = get_gpu_info()
-        if not configuration['gpu'] or not gpu_info:
+        if configuration['autopadding-mode'] == 'cpu-only' or not gpu_info:
             # This node may simply not have a GPU
             return mmtb0
 

devito/parameters.py

@@ -141,11 +141,11 @@ def _signature_items(self):
 
 env_vars_mapper = {
     'DEVITO_ARCH': 'compiler',
+    'DEVITO_AUTOPADDING_MODE': 'autopadding-mode',
     'DEVITO_AUTOTUNING': 'autotuning',
     'DEVITO_DEVELOP': 'develop-mode',
     'DEVITO_DEVICEID': 'deviceid',
     'DEVITO_FIRST_TOUCH': 'first-touch',
-    'DEVITO_GPU': 'gpu',
     'DEVITO_IGNORE_UNKNOWN_PARAMS': 'ignore-unknowns',
     'DEVITO_JIT_BACKDOOR': 'jit-backdoor',
     'DEVITO_LANGUAGE': 'language',

tests/test_data.py

@@ -364,7 +364,7 @@ def test_w_halo_wo_padding(self):
 
     # Platform is used to fix the pad value
     # GPU is disabled to prevent GPU pad value from being used
-    @switchconfig(gpu=0, autopadding=True, platform='bdw')
+    @switchconfig(autopadding_mode='cpu-only', autopadding=True, platform='bdw')
     def test_w_halo_w_autopadding(self):
         grid = Grid(shape=(4, 4, 4))
         u0 = Function(name='u0', grid=grid, space_order=0)