Update the OpenCL kernel benchmark tool

HySoP/hysop/gpu/kernel_benchmark.py

@@ -4,8 +4,7 @@
 Package for benchmarking OpenCL kernels.
 """
 from parmepy.gpu import cl
-from parmepy.gpu.tools import get_opencl_environment
-from parmepy.constant import np, PARMES_REAL
+from parmepy.constants import np, PARMES_REAL
 import pickle
 
 
@@ -240,7 +239,8 @@ def find_min(filename, kernel=None, version=None, config=None, size=None):
 class Benchmark:
     """Benchmark management"""
 
-    def __init__(self, kernel_file, kernel_name, sizes, config, setupFunction,
+    def __init__(self, cl_env, kernel_file, kernel_name, sizes,
+                 config, setupFunction,
                  nb_run=20, inputs=None, precision=PARMES_REAL):
         """
         Creates a benchmark for a given source kernel_file, kernel for
@@ -257,7 +257,7 @@ class Benchmark:
         @param inputs : input data
         @param precision : Floating point precision for kernels
         """
-        self.cl_env = get_opencl_environment(0, 0, 'gpu', precision, sizes[0])
+        self.cl_env = cl_env
         self.platform = self.cl_env.platform
         self.device = self.cl_env.device
         self.ctx = self.cl_env.ctx