Skip to content
Snippets Groups Projects
Commit 2eb6c64a authored by Kaushik Kulkarni's avatar Kaushik Kulkarni
Browse files

don't stringify PyOpenCLArrayContext, rather let the sub-classes implement it

parent e6602bad
No related branches found
No related tags found
No related merge requests found
...@@ -69,13 +69,6 @@ class PytestPyOpenCLArrayContextFactory: ...@@ -69,13 +69,6 @@ class PytestPyOpenCLArrayContextFactory:
def __call__(self) -> ArrayContext: def __call__(self) -> ArrayContext:
raise NotImplementedError raise NotImplementedError
def __str__(self):
return ("<%s for <pyopencl.Device '%s' on '%s'>" %
(
self.actx_class.__name__,
self.device.name.strip(),
self.device.platform.name.strip()))
class _PytestPyOpenCLArrayContextFactoryWithClass(PytestPyOpenCLArrayContextFactory): class _PytestPyOpenCLArrayContextFactoryWithClass(PytestPyOpenCLArrayContextFactory):
force_device_scalars = True force_device_scalars = True
...@@ -96,6 +89,13 @@ class _PytestPyOpenCLArrayContextFactoryWithClass(PytestPyOpenCLArrayContextFact ...@@ -96,6 +89,13 @@ class _PytestPyOpenCLArrayContextFactoryWithClass(PytestPyOpenCLArrayContextFact
queue, queue,
force_device_scalars=self.force_device_scalars) force_device_scalars=self.force_device_scalars)
def __str__(self):
return ("<%s for <pyopencl.Device '%s' on '%s'>>" %
(
self.actx_class.__name__,
self.device.name.strip(),
self.device.platform.name.strip()))
class _PytestPyOpenCLArrayContextFactoryWithClassAndHostScalars( class _PytestPyOpenCLArrayContextFactoryWithClassAndHostScalars(
_PytestPyOpenCLArrayContextFactoryWithClass): _PytestPyOpenCLArrayContextFactoryWithClass):
...@@ -117,8 +117,13 @@ class _PytestPytatoPyOpenCLArrayContextFactory( ...@@ -117,8 +117,13 @@ class _PytestPytatoPyOpenCLArrayContextFactory(
# On some implementations (notably Intel CPU), holding a reference # On some implementations (notably Intel CPU), holding a reference
# to a queue does not keep the context alive. # to a queue does not keep the context alive.
ctx, queue = self.get_command_queue() ctx, queue = self.get_command_queue()
return self.actx_class( return self.actx_class(queue)
queue)
def __str__(self):
return ("<PytatoPyOpenCLArrayContext for <pyopencl.Device '%s' on '%s'>>" %
(
self.device.name.strip(),
self.device.platform.name.strip()))
_ARRAY_CONTEXT_FACTORY_REGISTRY: \ _ARRAY_CONTEXT_FACTORY_REGISTRY: \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment