Context: optional cache_dir param:

If not None it will be default one for all context's programs
inducer · Nov 16, 2015 · 06b2088 · 06b2088
1 parent e58fd6c
commit 06b2088
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pyopencl/__init__.py b/pyopencl/__init__.py
@@ -347,6 +347,9 @@ def build(self, options=[], devices=None, cache_dir=None):
         elif isinstance(options, six.text_type):
             options = [options.encode("utf8")]
 
+        if cache_dir is None:
+            cache_dir = self._context.cache_dir
+
         options = (options
                 + _DEFAULT_BUILD_OPTIONS
                 + _DEFAULT_INCLUDE_OPTIONS
@@ -1208,7 +1211,7 @@ def gl_object_get_gl_object(self):
 
 # {{{ convenience
 
-def create_some_context(interactive=None, answers=None):
+def create_some_context(interactive=None, answers=None, cache_dir=None):
     import os
     if answers is None:
         if "PYOPENCL_CTX" in os.environ:
@@ -1219,7 +1222,7 @@ def create_some_context(interactive=None, answers=None):
             from pyopencl.tools import get_test_platforms_and_devices
             for plat, devs in get_test_platforms_and_devices():
                 for dev in devs:
-                    return Context([dev])
+                    return Context([dev], cache_dir=cache_dir)
 
     if answers is not None:
         pre_provided_answers = answers
@@ -1334,7 +1337,7 @@ def parse_device(choice):
         raise RuntimeError("not all provided choices were used by "
                 "create_some_context. (left over: '%s')" % ":".join(answers))
 
-    return Context(devices)
+    return Context(devices, cache_dir=cache_dir)
 
 _csc = create_some_context
 

diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py
@@ -641,7 +641,7 @@ def _parse_context_properties(properties):
 class Context(_Common):
     _id = 'context'
 
-    def __init__(self, devices=None, properties=None, dev_type=None):
+    def __init__(self, devices=None, properties=None, dev_type=None, cache_dir=None):
         c_props = _parse_context_properties(properties)
         status_code = _ffi.new('cl_int*')
 
@@ -665,6 +665,7 @@ def __init__(self, devices=None, properties=None, dev_type=None):
                                                         dev_type))
 
         self.ptr = _ctx[0]
+        self.cache_dir = cache_dir
 
 # }}}