Merge 123448e into f3963a2

cupy/__init__.py

@@ -61,18 +61,47 @@ def is_available():
 
 # import class and function
 from cupy.core import ndarray  # NOQA
+from cupy.core import ufunc  # NOQA
+
+
+# =============================================================================
+# Constants (borrowed from NumPy)
+# =============================================================================
+from numpy import newaxis  # == None  # NOQA
 
-# dtype short cuts
+# =============================================================================
+# Data types (borrowed from NumPy)
+#
+# The order of these declarations are borrowed from the NumPy document:
+# https://docs.scipy.org/doc/numpy/reference/arrays.scalars.html
+# =============================================================================
+
+# -----------------------------------------------------------------------------
+# Generic types
+# -----------------------------------------------------------------------------
+from numpy import complexfloating  # NOQA
 from numpy import floating  # NOQA
+from numpy import generic  # NOQA
 from numpy import inexact  # NOQA
 from numpy import integer  # NOQA
 from numpy import number  # NOQA
 from numpy import signedinteger  # NOQA
 from numpy import unsignedinteger  # NOQA
 
+# Not supported by CuPy:
+# from numpy import flexible
+# from numpy import character
 
+# -----------------------------------------------------------------------------
+# Booleans
+# -----------------------------------------------------------------------------
 from numpy import bool_  # NOQA
 
+from numpy import bool8  # NOQA
+
+# -----------------------------------------------------------------------------
+# Integers
+# -----------------------------------------------------------------------------
 from numpy import byte  # NOQA
 
 from numpy import short  # NOQA
@@ -83,33 +112,30 @@ def is_available():
 
 from numpy import longlong  # NOQA
 
-from numpy import ubyte  # NOQA
-
-from numpy import ushort  # NOQA
-
-from numpy import uintc  # NOQA
-
-from numpy import uint  # NOQA
-
-from numpy import ulonglong  # NOQA
+from numpy import intp  # NOQA
 
+from numpy import int8  # NOQA
 
-from numpy import half  # NOQA
+from numpy import int16  # NOQA
 
-from numpy import single  # NOQA
+from numpy import int32  # NOQA
 
-from numpy import float_  # NOQA
+from numpy import int64  # NOQA
 
-from numpy import longfloat  # NOQA
+# -----------------------------------------------------------------------------
+# Unsigned integers
+# -----------------------------------------------------------------------------
+from numpy import ubyte  # NOQA
 
+from numpy import ushort  # NOQA
 
-from numpy import int8  # NOQA
+from numpy import uintc  # NOQA
 
-from numpy import int16  # NOQA
+from numpy import uint  # NOQA
 
-from numpy import int32  # NOQA
+from numpy import ulonglong  # NOQA
 
-from numpy import int64  # NOQA
+from numpy import uintp  # NOQA
 
 from numpy import uint8  # NOQA
 
@@ -119,29 +145,72 @@ def is_available():
 
 from numpy import uint64  # NOQA
 
+# -----------------------------------------------------------------------------
+# Floating-point numbers
+# -----------------------------------------------------------------------------
+from numpy import half  # NOQA
+
+from numpy import single  # NOQA
+
+from numpy import double  # NOQA
+
+from numpy import float_  # NOQA
+
+from numpy import longfloat  # NOQA
 
 from numpy import float16  # NOQA
 
 from numpy import float32  # NOQA
 
 from numpy import float64  # NOQA
 
+# Not supported by CuPy:
+# from numpy import float96
+# from numpy import float128
+
+# -----------------------------------------------------------------------------
+# Complex floating-point numbers
+# -----------------------------------------------------------------------------
+from numpy import csingle  # NOQA
 
 from numpy import complex_  # NOQA
 
+from numpy import clongfloat  # NOQA
+
 from numpy import complex64  # NOQA
 
 from numpy import complex128  # NOQA
 
-from numpy import csingle  # NOQA
+# Not supported by CuPy:
+# from numpy import complex192
+# from numpy import complex256
 
-from numpy import clongfloat  # NOQA
+# -----------------------------------------------------------------------------
+# Any Python object
+# -----------------------------------------------------------------------------
 
+# Not supported by CuPy:
+# from numpy import object_
+# from numpy import bytes_
+# from numpy import unicode_
+# from numpy import void
 
-from cupy.core import ufunc  # NOQA
+# -----------------------------------------------------------------------------
+# Built-in Python types
+# -----------------------------------------------------------------------------
 
-from numpy import newaxis  # == None  # NOQA
+from numpy import int  # NOQA
+
+from numpy import bool  # NOQA
+
+from numpy import float  # NOQA
+
+from numpy import complex  # NOQA
 
+# Not supported by CuPy:
+# from numpy import object
+# from numpy import unicode
+# from numpy import str
 
 # =============================================================================
 # Routines