diff options
| author | Matti Picus <matti.picus@gmail.com> | 2020-07-14 13:06:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 13:06:25 +0300 |
| commit | 0c1301f4d49411e23b24ddeca6384b695b7caa25 (patch) | |
| tree | 80de9886063e2caea32c68af2bc9337c3f8481de | |
| parent | f31f12afa6fcbc852dfc57b34dd701d7b4145203 (diff) | |
| parent | 6f55bbf049db3fd50994a97ec66665f5685ec5be (diff) | |
| download | numpy-0c1301f4d49411e23b24ddeca6384b695b7caa25.tar.gz | |
Merge pull request #16857 from mattip/fix-16605
MAINT: fix new compiler warnings on clang
| -rw-r--r-- | numpy/core/src/umath/matmul.c.src | 2 | ||||
| -rw-r--r-- | numpy/core/src/umath/simd.inc.src | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/numpy/core/src/umath/matmul.c.src b/numpy/core/src/umath/matmul.c.src index 5cbb6e94d..0e47d1ab5 100644 --- a/numpy/core/src/umath/matmul.c.src +++ b/numpy/core/src/umath/matmul.c.src @@ -27,6 +27,7 @@ ***************************************************************************** */ +#if defined(HAVE_CBLAS) /* * -1 to be conservative, in case blas internally uses a for loop with an * inclusive upper bound @@ -61,7 +62,6 @@ is_blasable2d(npy_intp byte_stride1, npy_intp byte_stride2, return NPY_FALSE; } -#if defined(HAVE_CBLAS) static const npy_cdouble oneD = {1.0, 0.0}, zeroD = {0.0, 0.0}; static const npy_cfloat oneF = {1.0, 0.0}, zeroF = {0.0, 0.0}; diff --git a/numpy/core/src/umath/simd.inc.src b/numpy/core/src/umath/simd.inc.src index 2df1b7225..7866f8143 100644 --- a/numpy/core/src/umath/simd.inc.src +++ b/numpy/core/src/umath/simd.inc.src @@ -114,16 +114,16 @@ nomemoverlap(char *ip, * should have no overlap in memory. */ #define IS_BINARY_SMALL_STEPS_AND_NOMEMOVERLAP \ - ((abs(steps[0]) < MAX_STEP_SIZE) && \ - (abs(steps[1]) < MAX_STEP_SIZE) && \ - (abs(steps[2]) < MAX_STEP_SIZE) && \ + ((labs(steps[0]) < MAX_STEP_SIZE) && \ + (labs(steps[1]) < MAX_STEP_SIZE) && \ + (labs(steps[2]) < MAX_STEP_SIZE) && \ (nomemoverlap(args[0], steps[0] * dimensions[0], args[2], steps[2] * dimensions[0])) && \ (nomemoverlap(args[1], steps[1] * dimensions[0], args[2], steps[2] * dimensions[0]))) #define IS_UNARY_TWO_OUT_SMALL_STEPS_AND_NOMEMOVERLAP \ - ((abs(steps[0]) < MAX_STEP_SIZE) && \ - (abs(steps[1]) < MAX_STEP_SIZE) && \ - (abs(steps[2]) < MAX_STEP_SIZE) && \ + ((labs(steps[0]) < MAX_STEP_SIZE) && \ + (labs(steps[1]) < MAX_STEP_SIZE) && \ + (labs(steps[2]) < MAX_STEP_SIZE) && \ (nomemoverlap(args[0], steps[0] * dimensions[0], args[2], steps[2] * dimensions[0])) && \ (nomemoverlap(args[0], steps[0] * dimensions[0], args[1], steps[1] * dimensions[0]))) @@ -134,7 +134,7 @@ nomemoverlap(char *ip, */ #define IS_OUTPUT_BLOCKABLE_UNARY(esizein, esizeout, vsize) \ ((steps[0] & (esizein-1)) == 0 && \ - steps[1] == (esizeout) && abs(steps[0]) < MAX_STEP_SIZE && \ + steps[1] == (esizeout) && labs(steps[0]) < MAX_STEP_SIZE && \ (nomemoverlap(args[1], steps[1] * dimensions[0], args[0], steps[0] * dimensions[0]))) #define IS_BLOCKABLE_REDUCE(esize, vsize) \ @@ -489,7 +489,7 @@ run_unary_avx512f_log_DOUBLE(char **args, npy_intp const *dimensions, npy_intp c { #if defined HAVE_ATTRIBUTE_TARGET_AVX512F_WITH_INTRINSICS && defined NPY_HAVE_SSE2_INTRINSICS #if !(defined(__clang__) && (__clang_major__ < 10 || (__clang_major__ == 10 && __clang_minor__ < 1))) - if (IS_OUTPUT_BLOCKABLE_UNARY(sizeof(npy_double), 64)) { + if (IS_OUTPUT_BLOCKABLE_UNARY(sizeof(npy_double), sizeof(npy_double), 64)) { AVX512F_log_DOUBLE((npy_double*)args[1], (npy_double*)args[0], dimensions[0], steps[0]); return 1; } |