summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #6734 from saimn/ma-mask-memoryCharles Harris2015-12-012-7/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | ENH: Avoid memory peak when creating a MaskedArray with mask=True/False.
| * | | | | | | | Add some tests for mask creation with mask=True or False.Simon Conseil2015-12-011-0/+9
| | | | | | | | |
| * | | | | | | | Test that the mask dtype if MaskType before using np.zeros/onesSimon Conseil2015-12-011-2/+2
| | | | | | | | |
| * | | | | | | | ENH: Avoid memory peak when creating a MaskedArray with mask=True/False (#6732).Simon Conseil2015-11-261-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `mask` parameter is set to True or False, create directly a `ndarray` of boolean instead of going inside `np.resize` which was causing of memory peak of ~15 times the size of the mask.
* | | | | | | | | Merge pull request #6748 from saimn/ma-repr-memoryCharles Harris2015-12-011-3/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | ENH: Avoid memory peak and useless computations when printing a MaskedArray.
| * | | | | | | | | Use integer division to avoid casting to int.Simon Conseil2015-12-021-1/+1
| | | | | | | | | |
| * | | | | | | | | Allow to change the maximum width with a class variable.Simon Conseil2015-12-011-4/+6
| | | | | | | | | |
| * | | | | | | | | ENH: Avoid memory peak and useless computations when printing a MaskedArray.Simon Conseil2015-11-281-3/+14
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref #3544. When printing a `MaskedArray`, the whole array is converted to the object dtype, whereas only a few values are printed to screen. So the approach here is to cut the array and keep only a subset that it used for the string conversion. This way the output should not change.
* | | | | | | | | Merge pull request #6733 from gerritholl/structured_multidim_masked_array_strrepCharles Harris2015-12-012-1/+13
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | BUG/TST: Fix for #6729
| * | | | | | | | BUG/TST: Fix for #6729Gerrit Holl2015-12-012-1/+13
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix representation of a structured masked array with dimension zero. The effect of representing a masked array with dimension zero is now similar to respresenting an mvoid. This commit fixes #6729.
* | | | | | | | Merge pull request #6726 from ↵Charles Harris2015-11-262-6/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | charris/fix-bugs-exposed-by-relaxed-stride-rollback Fix bugs exposed by relaxed stride rollback
| * | | | | | | TST: Fix travis-ci test for numpy wheels.Charles Harris2015-11-251-1/+1
| | | | | | | |
| * | | | | | | MAINT: Localize variables only used with relaxed stride checking.Charles Harris2015-11-251-5/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The varibles in question lead to unused variable warnings when not compiling with NPY_RELAXED_STRIDE_CHECKING=1 resulting in failing travis tests.
* | | | | | | Merge pull request #6627 from ordirules/masterCharles Harris2015-11-251-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | added extra line in the tile help doc to outline a general repeat, co…
| * | | | | | | added more textJulien Lhermitte2015-11-051-0/+4
| | | | | | | |
| * | | | | | | added extra line in the tile help doc to outline a general repeat, commonly usedJulien Lhermitte2015-11-041-0/+6
| | | | | | | |
* | | | | | | | Merge pull request #6717 from charris/fix-gh-6675Julian Taylor2015-11-251-1/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | BUG: Readd fallback CBLAS detection on linux.
| * | | | | | | | BUG: Readd fallback CBLAS detection on linux.Charles Harris2015-11-251-1/+29
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fallback CBLAS detection was removed in gh-6183 because it led to problems on windows when mingw was used with python compiled with msvc but msvc was not installed. As a result of that fix, CBLAS detection failed for some Linux installations. The solution here is to add back the fallback detection but make it specific to non-windows platforms. Closes #6675.
* | | | | | | | Merge pull request #6721 from gerritholl/circumvent-cython-problem-locallyCharles Harris2015-11-251-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | BUG: Fix for #6719
| * | | | | | | | BUG: Fix for #6719Gerrit Holl2015-11-251-1/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numpy/random/mtrand/mtrand.pyx contains a line where cython fails to compile, complaining “Pythonic division not allowed without gil”. By running this code segment under cdivision(True), this problem is avoided.
* | | | | | | | Merge pull request #6302 from juliantaylor/werrvlaJulian Taylor2015-11-241-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | MAINT: enable Werror=vla in travis
| * | | | | | | MAINT: enable Werror=vla in travisJulian Taylor2015-11-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoids issues with stone age compilers like MSVC
* | | | | | | | Merge pull request #6702 from ahaldane/fix_getfield_p_arithCharles Harris2015-11-241-11/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | BUG: fix pointer arithmetic in _get_field_view
| * | | | | | | MAINT: fix casting warnings in mapping.cAllan Haldane2015-11-231-10/+13
| | | | | | | |
| * | | | | | | BUG: fix pointer arithmetic in _get_field_viewAllan Haldane2015-11-211-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should have used PyArray_BYTES, not PyArray_DATA Fixes #6701
* | | | | | | Merge pull request #6662 from Iceman9/simicgCharles Harris2015-11-202-7/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Changed lines for successfull MSVC 14.0 compiling
| * | | | | | | BLD: Enabled building with MSVC 14.0Iceman92015-11-182-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reallocated free functions in mem_overlap.c Cosmetics. Final indent. Added tests if pointer==NULL Fixed indent Fixed position of goto label. Fixed ISO C90 violation. Made simpler checks and removed redundant lines.
* | | | | | | | Merge pull request #6698 from matthew-brett/test-rint-bugNathaniel J. Smith2015-11-181-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | TST: test np.rint bug for large integers
| * | | | | | | | TST: test np.rint bug for large integersMatthew Brett2015-11-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test for https://github.com/numpy/numpy/issues/6685 Add test to remind packagers that they may need to fix or workaround this bug on some systems.
* | | | | | | | | Merge pull request #6697 from congma/fix_pyarray_from_ot_macro_semicolonJulian Taylor2015-11-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | MAINT: fix spurious semicolon in macro definition of PyArray_FROM_OT
| * | | | | | | | | MAINT: fix spurious semicolon in macro definition of PyArray_FROM_OTCong Ma2015-11-181-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a spurious semicolon (;) character at the end of the macro definition of PyArray_FROM_OT, in the header file ndarrayobject.h. This prevents the macro from being used like a function, e.g. one can't write like if ( !(arr = PyArray_FROM_OT( ... )) ) ... ... After removing the semicolon, the macro can be used like a C function.
* | | | | | | | | Merge pull request #6695 from juliantaylor/tmpdir-leakCharles Harris2015-11-171-17/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | BUG: fix removing tempdirs created during build
| * | | | | | | | | BUG: fix removing tempdirs created during buildJulian Taylor2015-11-171-17/+18
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old code used the thread local storage wrong and also only deleted the directories created for the last parallel build section as the exit handler only knows about one of the directories. Fix by storing all created tempdirs to delete at exit.
* | | | | | | | | Merge pull request #6690 from lzkelley/hist_check_range_finiteJaime2015-11-172-3/+27
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | BUG, MAINT: check that histogram range parameters are finite.
| * | | | | | | | BUG, MAINT: check that histogram range parameters are finite, add tests to ↵lzkelley2015-11-172-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assure this. Improved some error-types.
* | | | | | | | | Merge pull request #6688 from ev-br/knownfCharles Harris2015-11-1613-59/+72
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | expose KnownFailure and SkipTest exceptions in numpy.testing
| * | | | | | | | | ENH: testing: add SkipTest and KnownFailureExceptionEvgeni Burovski2015-11-1613-59/+72
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * use SkipTest in numpy tests instead of importing it from nose * add a KnownFailureException as an alias for KnownFailureTest (the former is preferred, but the latter is kept for backcompat) * rename the KnownFailure nose plugin into KnownFailurePlugin, and keep the old name for backcompat
* | | | | | | | | Merge pull request #6666 from juliantaylor/prefetch-sumCharles Harris2015-11-163-0/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | ENH: use prefetching for summation
| * | | | | | | | ENH: use prefetching for summationJulian Taylor2015-11-163-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems the small blocksizes (128) messes up the hardware prefetcher which would usually be able to work fine on this iteration pattern. Fix this by using software prefetching. Improves performance for large sums by 15%-30%. Tested on core2duo, xeon E5-4620, i5-3470 and AMD phenom II X4. Prefers __builtin_prefetch as that, unlike SSE2 _mm_prefetch, also works on capable non-x86 cpus.
* | | | | | | | | Merge pull request #6681 from griffin-h/polyfit/weight_doc_updateCharles Harris2015-11-151-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | add clarification of weights to documentation for polyfit
| * | | | | | | | | add clarification of weights to documentationGriffin Hosseinzadeh2015-11-131-1/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6679 from pv/may-share-memory-fixJulian Taylor2015-11-155-59/+141
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve may_share_memory performance + fix non-ndarray inputs
| * | | | | | | | | BUG: don't use PyArray_Converter in may_share_memoryPauli Virtanen2015-11-122-4/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The converter function has NPY_ARRAY_CARRAY enabled, which can cause false negatives for non-ndarray inputs. Fixes gh-5604
| * | | | | | | | | ENH: reimplement may_share_memory in C to improve its performancePauli Virtanen2015-11-124-55/+85
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6686 from pv/assert-fixCharles Harris2015-11-142-6/+24
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | BUG: testing: fix a bug in assert_string_equal
| * | | | | | | | | BUG: testing: fix a bug in assert_string_equalPauli Virtanen2015-11-142-6/+24
|/ / / / / / / / /
* | | | | | | | | Merge pull request #6676 from ev-br/assert_raisesCharles Harris2015-11-121-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | DOC: document that assert_raises can be used as a context manager
| * | | | | | | | DOC: document that assert_raises can be used as a context managerEvgeni Burovski2015-11-121-0/+12
|/ / / / / / / /
* | | | | | | | Merge pull request #6668 from charris/fix-make_maskCharles Harris2015-11-123-4/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | BUG: ma.make_mask should always return nomask for nomask argument.
| * | | | | | | | DOC: Update 1.10.2-notes.Charles Harris2015-11-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document fix to ma.make_mask.