/[escript]/trunk/escriptcore/src/WrappedArray.cpp
ViewVC logotype

Diff of /trunk/escriptcore/src/WrappedArray.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 6143 by jfenwick, Thu Mar 31 09:40:10 2016 UTC revision 6144 by caltinay, Wed Apr 6 05:25:13 2016 UTC
# Line 18  Line 18 
18  #include "WrappedArray.h"  #include "WrappedArray.h"
19  #include "DataException.h"  #include "DataException.h"
20    
21  #if HAVE_NUMPY_H  #if ESYS_HAVE_NUMPY_H
22  #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION  #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
23  #include <numpy/ndarrayobject.h>  #include <numpy/ndarrayobject.h>
24  #endif  #endif
# Line 207  WrappedArray::WrappedArray(const boost:: Line 207  WrappedArray::WrappedArray(const boost::
207      rank=shape.size();      rank=shape.size();
208      iscomplex=checkForComplex(obj_in);      iscomplex=checkForComplex(obj_in);
209    
210  #if HAVE_NUMPY_H  #if ESYS_HAVE_NUMPY_H
211      // if obj is a numpy array it is much faster to copy the array through the      // if obj is a numpy array it is much faster to copy the array through the
212      // __array_struct__ interface instead of extracting single values from the      // __array_struct__ interface instead of extracting single values from the
213      // components via getElt(). For this to work we check below that      // components via getElt(). For this to work we check below that

Legend:
Removed from v.6143  
changed lines
  Added in v.6144

  ViewVC Help
Powered by ViewVC 1.1.26