From f6985106dc330522df6312bc8a932914d2c92d26 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Wed, 24 Feb 2016 01:34:40 -0600 Subject: [PATCH] Don't import pyopencl at the top level in pyopencl target --- loopy/target/pyopencl.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/loopy/target/pyopencl.py b/loopy/target/pyopencl.py index 3c9e8aac7..2947fdc6c 100644 --- a/loopy/target/pyopencl.py +++ b/loopy/target/pyopencl.py @@ -31,12 +31,6 @@ import numpy as np from loopy.target.opencl import OpenCLTarget -import pyopencl as cl -import pyopencl.characterize as cl_char - -# This ensures the dtype registry is populated. -import pyopencl.tools # noqa - import logging logger = logging.getLogger(__name__) @@ -44,6 +38,9 @@ logger = logging.getLogger(__name__) # {{{ temp storage adjust for bank conflict def adjust_local_temp_var_storage(kernel, device): + import pyopencl as cl + import pyopencl.characterize as cl_char + logger.debug("%s: adjust temp var storage" % kernel.name) new_temp_vars = {} @@ -256,6 +253,9 @@ class PyOpenCLTarget(OpenCLTarget): """ def __init__(self, device=None): + # This ensures the dtype registry is populated. + import pyopencl.tools # noqa + super(PyOpenCLTarget, self).__init__() self.device = device -- GitLab