diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2019-12-16 15:03:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-16 15:03:14 -0600 |
| commit | 8a0858f3903e488495a56b4a6d19bbefabc97dca (patch) | |
| tree | cebe025c67845055c87de07d16d4be20a571d870 | |
| parent | 66bfedd28d5a24d1febe97bbd43d824f865349ea (diff) | |
| parent | 28848d79f665ec2dd83e84de14542a6e0ed645a5 (diff) | |
| download | numpy-8a0858f3903e488495a56b4a6d19bbefabc97dca.tar.gz | |
Merge pull request #15120 from mattip/build-warnings
MAINT,CI: fix signed-unsigned comparison warning
| -rw-r--r-- | numpy/core/src/umath/simd.inc.src | 6 | ||||
| -rwxr-xr-x | tools/travis-test.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/src/umath/simd.inc.src b/numpy/core/src/umath/simd.inc.src index 74f52cc9d..1f29526be 100644 --- a/numpy/core/src/umath/simd.inc.src +++ b/numpy/core/src/umath/simd.inc.src @@ -280,11 +280,11 @@ run_binary_simd_@kind@_@TYPE@(char **args, npy_intp *dimensions, npy_intp *steps @type@ * op = (@type@ *)args[2]; npy_intp n = dimensions[0]; #if defined __AVX512F__ - const npy_intp vector_size_bytes = 64; + const npy_uintp vector_size_bytes = 64; #elif defined __AVX2__ - const npy_intp vector_size_bytes = 32; + const npy_uintp vector_size_bytes = 32; #else - const npy_intp vector_size_bytes = 32; + const npy_uintp vector_size_bytes = 32; #endif /* argument one scalar */ if (IS_BLOCKABLE_BINARY_SCALAR1(sizeof(@type@), vector_size_bytes)) { diff --git a/tools/travis-test.sh b/tools/travis-test.sh index 241b9d913..da9195d4d 100755 --- a/tools/travis-test.sh +++ b/tools/travis-test.sh @@ -155,7 +155,7 @@ if [ -n "$USE_WHEEL" ] && [ $# -eq 0 ]; then export F90='gfortran --coverage' export LDFLAGS='--coverage' fi - $PYTHON setup.py build build_src --verbose-cfg bdist_wheel + $PYTHON setup.py build --warn-error build_src --verbose-cfg bdist_wheel # Make another virtualenv to install into virtualenv --python=`which $PYTHON` venv-for-wheel . venv-for-wheel/bin/activate |