diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-07-29 18:26:55 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-07-29 18:26:55 -0600 |
| commit | b307a8a5729e5e18fa8a7ff56892947fc2d2eb79 (patch) | |
| tree | cf1bb60e0b31b8a1b01b93af112056473503341b /doc/swig/test/Array.i | |
| parent | 32206dd79cafdce87cfb0db91903084c2fe2e473 (diff) | |
| parent | f70632f74f7b0feb9d78aff62eb9eebbb6a502ba (diff) | |
| download | numpy-b307a8a5729e5e18fa8a7ff56892947fc2d2eb79.tar.gz | |
Merge branch 'numpy-swig' into gh-3451
* numpy-swig:
Added more mentions of the SuperTensor tests and corrected the number of typemaps and tests (currently 1427 unit tests passed with 'make test': 372+324+324+324+40+19+24)
Added mention of the SuperTensor tests in the README file
Removed 'static' keyword from pyfragments.swg altoghether. I've had the following errors In function ‘SWIG_AsVal_long’: error: initialiser element is not constant In function ‘SWIG_AsVal_unsigned_SS_long’: error: initialiser element is not constant, BOTH in Windows/MinGW and Linux when compiling with gcc
Added tests for 4D tensors. Now using a consistant cubes,slices,rows,columns index order everywhere.
cleaned-up loop indexes in Tensor.cxx
cosmetic changes to numpy.i
Fixed the capsule / cobject memory destructor. Added types to deal with lists of arrays and lists of tensors as input and inplace types.
removed the note about testResize1 failing in testArray.py
fixed the testResize1 test in testArray.py -- Changed order of the resize arguments in Array2.h and replaced len(XXXnumpyarray) with XXXnumpyarray.size
Minor adjustments to numpy.i
Updated numpy.i testing documentation
Updated the numpy.i documentation
Initialize all DATA_TYPE* data_temp variables to NULL
Added Egor's ARGOUTVIEWM_ARRAY3 typemaps
Re-instated a Python 3 fix
Removed doc from list of sub-directories
Upgrade numpy.i
Got rid of a unit test
Conflicts:
doc/sphinxext
doc/swig/test/testFortran.py
Diffstat (limited to 'doc/swig/test/Array.i')
| -rw-r--r-- | doc/swig/test/Array.i | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/doc/swig/test/Array.i b/doc/swig/test/Array.i index d56dd2d1c..6a8605eb6 100644 --- a/doc/swig/test/Array.i +++ b/doc/swig/test/Array.i @@ -50,11 +50,6 @@ {(int nrows, int ncols, long* data )}; %apply (int* DIM1 , int* DIM2 , long** ARGOUTVIEW_ARRAY2) {(int* nrows, int* ncols, long** data )}; -// Note: the %apply for INPLACE_ARRAY2 above gets successfully applied -// to the constructor Array2(int nrows, int ncols, long* data), but -// does not get applied to the method Array2::resize(int nrows, int -// ncols, long* data). I have no idea why. For this reason the test -// for Apply2.resize(numpy.ndarray) in testArray.py is commented out. // Array1 support %include "Array1.h" |