Merge remote-tracking branch 'origin/master' into energy_helpers

Author: benvanwerkhoven

kernel_tuner/cupy.py

@@ -55,7 +55,7 @@ def __init__(self, device=0, iterations=7, compiler_options=None, observers=None
         self.texrefs = []
         if not cp:
             raise ImportError("Error: cupy not installed, please install e.g. " +
-                            "using 'pip install cupy-cuda111', please check https://github.com/cupy/cupy.")
+                            "using 'pip install cupy', please check https://github.com/cupy/cupy.")
 
         #select device
         self.dev = dev = cp.cuda.Device(device)