Skip to content
Snippets Groups Projects
Commit 4f1d2c94 authored by Michael Kuron's avatar Michael Kuron :mortar_board:
Browse files

Remove pystencils.GPU_DEVICE

parent 7a7d351c
Branches
Tags v5.0dev
1 merge request!146Remove pystencils.GPU_DEVICE
Pipeline #54183 failed with stages
in 35 minutes and 4 seconds
...@@ -26,7 +26,6 @@ Examples: ...@@ -26,7 +26,6 @@ Examples:
import warnings import warnings
import numpy as np import numpy as np
import pystencils
# Optional packages cpuinfo, cupy and psutil for hardware queries # Optional packages cpuinfo, cupy and psutil for hardware queries
try: try:
...@@ -36,19 +35,8 @@ except ImportError: ...@@ -36,19 +35,8 @@ except ImportError:
try: try:
import cupy import cupy
device = cupy.cuda.Device(pystencils.GPU_DEVICE)
except ImportError: except ImportError:
cupy = None cupy = None
device = None
if cupy:
try:
device = cupy.cuda.Device(pystencils.GPU_DEVICE)
except AttributeError:
warnings.warn("You are using an old pystencils version. Consider updating it")
device = cupy.cuda.Device(0)
else:
device = None
try: try:
from psutil import virtual_memory from psutil import virtual_memory
...@@ -125,9 +113,11 @@ def memory_sizes_of_current_machine(): ...@@ -125,9 +113,11 @@ def memory_sizes_of_current_machine():
if 'l3_cache_size' in cpu_info: if 'l3_cache_size' in cpu_info:
result['L3'] = cpu_info['l3_cache_size'] result['L3'] = cpu_info['l3_cache_size']
if device: if cupy:
size = device.mem_info[1] / (1024 * 1024) for i in range(cupy.cuda.runtime.getDeviceCount()):
result['GPU'] = "{0:.0f} MB".format(size) device = cupy.cuda.Device(i)
size = device.mem_info[1] / (1024 * 1024)
result[f'GPU{i}'] = "{0:.0f} MB".format(size)
if virtual_memory: if virtual_memory:
mem = virtual_memory() mem = virtual_memory()
......
...@@ -17,5 +17,5 @@ def test_gpu_block_size_limiting(): ...@@ -17,5 +17,5 @@ def test_gpu_block_size_limiting():
kernel = ast.compile() kernel = ast.compile()
assert all(b < too_large for b in limited_block_size['block']) assert all(b < too_large for b in limited_block_size['block'])
bs = [too_large, too_large, too_large] bs = [too_large, too_large, too_large]
ast.indexing.limit_block_size_by_register_restriction(bs, kernel.num_regs) bs = ast.indexing.limit_block_size_by_register_restriction(bs, kernel.num_regs)
assert all(b < too_large for b in bs) assert all(b < too_large for b in bs)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment