Fix cache handling of header dependencies. (reported by Sebastian Nowozin)

pyopencl/cache.py

@@ -156,7 +156,7 @@ def get_dependencies(src, include_path):
 
     _inner(src)
 
-    result = list(result.iteritems())
+    result = list((name,) + vals for name, vals in result.iteritems())
     result.sort()
 
     return result
@@ -294,7 +294,7 @@ def _create_built_program_from_source_cached(ctx, src, options, devices, cache_d
         from tempfile import gettempdir
         import getpass
         cache_dir = join(gettempdir(),
-                "pyopencl-compiler-cache-v1-uid%s-py%s" % (
+                "pyopencl-compiler-cache-v2-uid%s-py%s" % (
                     getpass.getuser(), ".".join(str(i) for i in sys.version_info)))
 
     # {{{ ensure cache directory exists

test/test_wrapper.py

@@ -339,6 +339,17 @@ class TestCL:
 
         assert (dest == x).all()
 
+    @pytools.test.mark_test.opencl
+    def test_header_dep_handling(self, ctx_getter):
+        context = ctx_getter()
+        queue = cl.CommandQueue(context)
+
+        kernel_src = """
+        #include <empty-header.h>
+        kernel void zonk() {}
+        """
+        cl.Program(context, kernel_src).build('-I.')
+        cl.Program(context, kernel_src).build('-I.')