diff --git a/examples/scalar_advection/scalar_advection.py b/examples/scalar_advection/scalar_advection.py index ee713dfa1d7abf3e41501ee1118eed12a864b0ff..45610c6462490f350e31382f059e9d15c9dbe280 100644 --- a/examples/scalar_advection/scalar_advection.py +++ b/examples/scalar_advection/scalar_advection.py @@ -35,7 +35,7 @@ def run(npts=64+1, cfl=0.5): d3d=(npts,)*dim box = Box(length=(2*pi,)*dim) - # impl = Implementation.PYTHON + #impl = Implementation.PYTHON impl = Implementation.OPENCL_CODEGEN if impl is Implementation.OPENCL_CODEGEN: diff --git a/hysop/__init__.py b/hysop/__init__.py index 279e86abeb02be2bfb61b0e3665f0412e9c2564c..0d496006a739c48dd5c623e40d511b8b20d04b1f 100644 --- a/hysop/__init__.py +++ b/hysop/__init__.py @@ -16,11 +16,11 @@ __FFTW_ENABLED__ = "ON" is "ON" __SCALES_ENABLED__ = "ON" is "ON" __OPTIMIZE__ = not __debug__ -__VERBOSE__ = False +__VERBOSE__ = True __DEBUG__ = False __TRACE__ = False __TRACE_WARNINGS__ = False -__KERNEL_DEBUG__ = True +__KERNEL_DEBUG__ = False __PROFILE__ = True __ENABLE_LONG_TESTS__ = "OFF" is "ON" diff --git a/hysop/backend/device/opencl/opencl_env.py b/hysop/backend/device/opencl/opencl_env.py index d9324eb3ea15e60da463cd70872ee2a0fc96c0db..2f6e61bc9124c48632b14bf730e0bd2ed05a0c9a 100644 --- a/hysop/backend/device/opencl/opencl_env.py +++ b/hysop/backend/device/opencl/opencl_env.py @@ -102,6 +102,11 @@ class OpenClEnvironment(object): self._allocator = allocator self._mempool = mempool + try: + device_type_str = cl.device_type.to_string(device.type), + except ValueError: + device_type_str = 'UNKNOWN DEVICE TYPE {}'.format(device.type) + msg=\ ''' -- Platform -- *plat id: {} @@ -116,7 +121,7 @@ class OpenClEnvironment(object): *global mem size: {} '''.format( platform_id, platform.name, platform.version, -device_id, device.name, cl.device_type.to_string(device.type), +device_id, device.name, device_type_str, device.opencl_c_version, bytes2str(device.global_mem_size)) if context.properties: msg+='\n -- Context --'