diff --git a/pyopencl/__init__.py b/pyopencl/__init__.py index d7e346289dc7e3f7c1f7c3cc07ca397b01380f89..bc4175c25158a1072575c0e8bb445ab323c8dd02 100644 --- a/pyopencl/__init__.py +++ b/pyopencl/__init__.py @@ -38,7 +38,7 @@ except ImportError: # _ccl = _cl # import cffi_cl # _cl = cffi_cl -import np +import numpy as np #from pyopencl._cl import * # noqa from pyopencl.cffi_cl import * import inspect as _inspect diff --git a/pyopencl/algorithm.py b/pyopencl/algorithm.py index 153c341f504c83e36327d05a0986484fc31199b2..23d336e6a354ef1947f8179b22870d1386b50bda 100644 --- a/pyopencl/algorithm.py +++ b/pyopencl/algorithm.py @@ -27,7 +27,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ -import pyopencl.np as np +import numpy as np import pyopencl as cl import pyopencl.array # noqa from pyopencl.scan import ScanTemplate diff --git a/pyopencl/array.py b/pyopencl/array.py index 7622f370539476d895e5d7a215c8e088272248f7..88770736ed7271a16edce7bd416810afe76dc8ad 100644 --- a/pyopencl/array.py +++ b/pyopencl/array.py @@ -28,7 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE. """ -import pyopencl.np as np +import numpy as np import pyopencl.elementwise as elementwise import pyopencl as cl from pytools import memoize_method diff --git a/pyopencl/capture_call.py b/pyopencl/capture_call.py index ecc006d59a9f6259add02ffe373be58f65b11f14..cc4539b224075d969662e856030268e8f1560c67 100644 --- a/pyopencl/capture_call.py +++ b/pyopencl/capture_call.py @@ -24,7 +24,7 @@ THE SOFTWARE. import pyopencl as cl -import pyopencl.np as np +import numpy as np from pytools.py_codegen import PythonCodeGenerator, Indentation @@ -41,7 +41,7 @@ def capture_kernel_call(kernel, filename, queue, g_size, l_size, *args, **kwargs cg("# generated by pyopencl.capture_call") cg("") - cg("import pyopencl.np as np") + cg("import numpy as np") cg("import pyopencl as cl") cg("from base64 import b64decode") cg("from zlib import decompress") diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py index 2ec26ae60c2ecac1da3b8fce53a9c579e23bba09..19a847241774fe995d9f7fdf3ac6498bb7ea1656 100644 --- a/pyopencl/cffi_cl.py +++ b/pyopencl/cffi_cl.py @@ -27,7 +27,7 @@ THE SOFTWARE. import warnings -import np +import numpy as np import sys # TODO: can we do without ctypes? diff --git a/pyopencl/characterize/performance.py b/pyopencl/characterize/performance.py index 2b843877492b06cf44042b1974b23b48c92a384d..e498582e8dd26d2ddb496038780b144adf9482cd 100644 --- a/pyopencl/characterize/performance.py +++ b/pyopencl/characterize/performance.py @@ -23,7 +23,7 @@ THE SOFTWARE. """ import pyopencl as cl -import pyopencl.np as np +import numpy as np diff --git a/pyopencl/clrandom.py b/pyopencl/clrandom.py index 635369671c1a563f8abfd7a6991f3a1488e4b97c..5636039421e8c7a368145800b9046840f68d792f 100644 --- a/pyopencl/clrandom.py +++ b/pyopencl/clrandom.py @@ -57,7 +57,7 @@ import pyopencl.array as cl_array from pyopencl.tools import first_arg_dependent_memoize from pytools import memoize_method -import pyopencl.np as np +import numpy as np class RanluxGenerator(object): diff --git a/pyopencl/elementwise.py b/pyopencl/elementwise.py index 36d127fdac65ff526608d973c8a686ab00ee3da3..5878b89cf9b557c2c65bb2b9e061b5cd29813f74 100644 --- a/pyopencl/elementwise.py +++ b/pyopencl/elementwise.py @@ -29,7 +29,7 @@ OTHER DEALINGS IN THE SOFTWARE. from pyopencl.tools import context_dependent_memoize -import pyopencl.np as np +import numpy as np import pyopencl as cl from pytools import memoize_method from pyopencl.tools import (dtype_to_ctype, VectorArg, ScalarArg, diff --git a/pyopencl/np.py b/pyopencl/np.py deleted file mode 100644 index 1c35453e0a1707c893801aa85389f06491200150..0000000000000000000000000000000000000000 --- a/pyopencl/np.py +++ /dev/null @@ -1,4 +0,0 @@ -try: - from numpypy import * -except ImportError: - from numpy import * diff --git a/pyopencl/reduction.py b/pyopencl/reduction.py index 1606e28ea9eeb2cdc655f1650ba0cbfa1ebc0564..489be1105b2d126fbc2ee0865417c51e25bcf15f 100644 --- a/pyopencl/reduction.py +++ b/pyopencl/reduction.py @@ -36,7 +36,7 @@ from pyopencl.tools import ( context_dependent_memoize, dtype_to_ctype, KernelTemplateBase, _process_code_for_macro) -import pyopencl.np as np +import numpy as np # {{{ kernel source diff --git a/pyopencl/scan.py b/pyopencl/scan.py index 1b80960ae8a6eeb0c60674ac3dbbdd78e60cfac2..23c3277740a2f4f5953cbe80575fce61d52175b1 100644 --- a/pyopencl/scan.py +++ b/pyopencl/scan.py @@ -28,7 +28,7 @@ within the Thrust project, https://code.google.com/p/thrust/ # Direct link to thrust source: # https://code.google.com/p/thrust/source/browse/thrust/detail/backend/cuda/detail/fast_scan.inl # noqa -import pyopencl.np as np +import numpy as np import pyopencl as cl import pyopencl.array # noqa diff --git a/pyopencl/tools.py b/pyopencl/tools.py index b335dee32821819df35be0f6cf2f275d3896466f..b270bd09820d6757deceaa9409210fd0615a1f7d 100644 --- a/pyopencl/tools.py +++ b/pyopencl/tools.py @@ -28,7 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE. """ -import pyopencl.np as np +import numpy as np from decorator import decorator import pyopencl as cl from pytools import memoize, memoize_method @@ -510,7 +510,7 @@ def match_dtype_to_c_struct(device, name, dtype, context=None): This example explains the use of this function:: - >>> import pyopencl.np as np + >>> import numpy as np >>> import pyopencl as cl >>> import pyopencl.tools >>> ctx = cl.create_some_context()