From db3a7bd039d262439548b870472832ca922a5dcb Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 16 Jul 2013 15:02:08 -0400
Subject: [PATCH] More flags fixes

---
 loopy/compiled.py        | 3 ++-
 loopy/kernel/__init__.py | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/loopy/compiled.py b/loopy/compiled.py
index 02db5b9ac..852793032 100644
--- a/loopy/compiled.py
+++ b/loopy/compiled.py
@@ -635,7 +635,6 @@ class CompiledKernel:
         """
 
         self.context = context
-        self.kernel = kernel
         self.codegen_kwargs = codegen_kwargs
         self.options = list(options)
 
@@ -655,6 +654,8 @@ class CompiledKernel:
 
         self.flags = my_flags
 
+        self.kernel = kernel.copy(flags=my_flags)
+
         self.packing_controller = SeparateArrayPackingController(kernel)
 
         self.output_names = tuple(arg.name for arg in self.kernel.args
diff --git a/loopy/kernel/__init__.py b/loopy/kernel/__init__.py
index b5ef85468..04ec45757 100644
--- a/loopy/kernel/__init__.py
+++ b/loopy/kernel/__init__.py
@@ -965,17 +965,17 @@ class LoopKernel(Record):
     # {{{ direct execution
 
     @memoize_method
-    def get_compiled_kernel(self, ctx, options, iflags):
+    def get_compiled_kernel(self, ctx, options, flags):
         from loopy.compiled import CompiledKernel
-        return CompiledKernel(ctx, self, options=options, iflags=iflags)
+        return CompiledKernel(ctx, self, options=options, flags=flags)
 
     def __call__(self, queue, **kwargs):
-        iflags = kwargs.pop("iflags", None)
+        flags = kwargs.pop("flags", None)
         options = kwargs.pop("options", ())
 
         assert isinstance(options, tuple)
 
-        return self.get_compiled_kernel(queue.context, options, iflags)(
+        return self.get_compiled_kernel(queue.context, options, flags)(
                 queue, **kwargs)
 
     # }}}
-- 
GitLab