Allow passing build options with IPython Magic

pyopencl/__init__.py

@@ -174,8 +174,8 @@ class Program(object):
     # {{{ build
 
     def build(self, options=[], devices=None, cache_dir=None):
-        if isinstance(options, str):
-            options = [options]
+        if isinstance(options, basestring):
+            options = [str(options)]
 
         options = (options
                 + _DEFAULT_BUILD_OPTIONS

pyopencl/ipython_ext.py

@@ -23,11 +23,14 @@ class PyOpenCLMagics(Magics):
             except KeyError:
                 ctx = None
 
+        if not isinstance(ctx, cl.Context):
+            ctx = None
+
         if ctx is None:
             raise RuntimeError("unable to locate cl context, which must be "
                     "present in namespace as 'cl_ctx' or 'ctx'")
 
-        prg = cl.Program(ctx, cell.encode("utf8")).build()
+        prg = cl.Program(ctx, cell.encode("utf8")).build(options=line)
 
         for knl in prg.all_kernels():
             self.shell.user_ns[knl.function_name] = knl