Merge branch 'devel' of https://github.com/gprMax/gprMax into devel

这个提交包含在:
Craig Warren
2022-02-24 17:19:51 +00:00
当前提交 ec99871e2d
共有 2 个文件被更改,包括 2 次插入2 次删除

查看文件

@@ -259,7 +259,7 @@ class CUDAUpdates:
self.drv.init() self.drv.init()
# Create device handle and context on specific GPU device (and make it current context) # Create device handle and context on specific GPU device (and make it current context)
self.dev = self.drv.Device(config.get_model_config().cuda['gpu'].deviceID) self.dev = config.get_model_config().device['dev']
self.ctx = self.dev.make_context() self.ctx = self.dev.make_context()
# Initialise arrays on GPU, prepare kernels, and get kernel functions # Initialise arrays on GPU, prepare kernels, and get kernel functions

查看文件

@@ -428,7 +428,7 @@ def print_cuda_info(devs):
logger.debug(f'PyCUDA: {pycuda.VERSION_TEXT}') logger.debug(f'PyCUDA: {pycuda.VERSION_TEXT}')
for ID, gpu in devs.items(): for ID, gpu in devs.items():
logger.basic(f" |--->Device {ID}: {' '.join(gpu.name.split())} | " logger.basic(f" |--->Device {ID}: {' '.join(gpu.name().split())} | "
f"{human_size(gpu.total_memory(), a_kilobyte_is_1024_bytes=True)}") f"{human_size(gpu.total_memory(), a_kilobyte_is_1024_bytes=True)}")