Skip to content
Snippets Groups Projects
Commit 1c7d2b84 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge haamster:src-deb/pyopencl

parents 3eea8b77 c37d7822
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
pyopencl/characterize.py
+ 4
− 4
View file @ 1c7d2b84
...@@ -97,13 +97,13 @@ def simultaneous_work_items_on_local_access(dev): ...@@ -97,13 +97,13 @@ def simultaneous_work_items_on_local_access(dev):
return 32 return 32
if dev.device_type == cl.device_type.GPU: if dev.type == cl.device_type.GPU:
from warnings import warn from warnings import warn
warn("wildly guessing conflicting local access size on '%s'" warn("wildly guessing conflicting local access size on '%s'"
% dev, % dev,
CLCharacterizationWarning) CLCharacterizationWarning)
return 16 return 16
elif dev.device_type == cl.device_type.CPU: elif dev.type == cl.device_type.CPU:
return 1 return 1
else: else:
from warnings import warn from warnings import warn
...@@ -140,13 +140,13 @@ def local_memory_bank_count(dev): ...@@ -140,13 +140,13 @@ def local_memory_bank_count(dev):
return 32 return 32
if dev.device_type == cl.device_type.GPU: if dev.type == cl.device_type.GPU:
from warnings import warn from warnings import warn
warn("wildly guessing conflicting local access size on '%s'" warn("wildly guessing conflicting local access size on '%s'"
% dev, % dev,
CLCharacterizationWarning) CLCharacterizationWarning)
return 16 return 16
elif dev.device_type == cl.device_type.CPU: elif dev.type == cl.device_type.CPU:
return dev.local_mem_size / local_memory_access_granularity(dev) return dev.local_mem_size / local_memory_access_granularity(dev)
else: else:
from warnings import warn from warnings import warn
......
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