refactor PlanNd so cimport of numpy is not required.

revert changes to the CI scripts
cupy · Dec 18, 2018 · 63cd05f · 63cd05f
1 parent d505423
commit 63cd05f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ python:
 
 install:
   - pip install -U pip wheel
-  - pip install cython numpy
+  - pip install cython
   - READTHEDOCS=True travis_wait pip install -U -e .[travis]
 
 script:

diff --git a/appveyor.yml b/appveyor.yml
@@ -55,7 +55,7 @@ install:
 
   - "python -m pip install -U pip"
   - "pip install -U setuptools"
-  - "pip install -U Cython numpy"
+  - "pip install -U Cython"
 
 
 build_script:

diff --git a/cupy/cuda/cufft.pyx b/cupy/cuda/cufft.pyx
@@ -1,6 +1,5 @@
 cimport cython  # NOQA
 import numpy
-cimport numpy
 
 import cupy
 from cupy.cuda cimport driver
@@ -174,32 +173,32 @@ class Plan1d(object):
                     out.dtype, a.dtype))
 
 
-
 class PlanNd(object):
     def __init__(self, object shape, object inembed, int istride,
                  int idist, object onembed, int ostride, int odist,
                  int fft_type, int batch):
         cdef Handle plan
         cdef size_t work_size
-        cdef int ndim
-        cdef int* shape_ptr
+        cdef int ndim, i
+        cdef int[:] shape_arr = numpy.asarray(shape, dtype=numpy.intc)
+        cdef int[:] inembed_arr
+        cdef int[:] onembed_arr
+        cdef int* shape_ptr = &shape_arr[0]
         cdef int* inembed_ptr
         cdef int* onembed_ptr
-        shape = numpy.asarray(shape, dtype=numpy.intc)
         ndim = len(shape)
-        shape_ptr = <int *>numpy.PyArray_DATA(shape)
 
         if inembed is None:
             inembed_ptr = NULL  # ignore istride and use default strides
         else:
-            inembed = numpy.asarray(inembed, dtype=numpy.intc)
-            inembed_ptr = <int *>numpy.PyArray_DATA(inembed)
+            inembed_arr = numpy.asarray(inembed, dtype=numpy.intc)
+            inembed_ptr = &inembed_arr[0]
 
         if onembed is None:
             onembed_ptr = NULL  # ignore ostride and use default strides
         else:
-            onembed = numpy.asarray(onembed, dtype=numpy.intc)
-            onembed_ptr = <int *>numpy.PyArray_DATA(onembed)
+            onembed_arr = numpy.asarray(onembed, dtype=numpy.intc)
+            onembed_ptr = &onembed_arr[0]
 
         stream = stream_module.get_current_stream_ptr()
         with nogil:
@@ -224,7 +223,6 @@ class PlanNd(object):
                                            onembed_ptr, ostride, odist,
                                            <Type>fft_type, batch,
                                            &work_size)
-
         check_result(result)
 
         # TODO: for CUDA>=9.2 could also allow setting a work area policy