diff options
| author | Developer-Ecosystem-Engineering <65677710+Developer-Ecosystem-Engineering@users.noreply.github.com> | 2023-01-04 03:23:49 -0800 |
|---|---|---|
| committer | Developer-Ecosystem-Engineering <65677710+Developer-Ecosystem-Engineering@users.noreply.github.com> | 2023-01-04 10:07:28 -0800 |
| commit | f277da49c7117c96b7085ffc2e2cae09e19fd5c4 (patch) | |
| tree | 5d1d15d09e06a4b53edffeecdfad6229ba51755c | |
| parent | 4c0e2af5d7a4150669570cb24bcdf0daf668c54f (diff) | |
| download | numpy-f277da49c7117c96b7085ffc2e2cae09e19fd5c4.tar.gz | |
Fix type conversions for gcc
| -rw-r--r-- | numpy/core/src/umath/loops_unary_fp_le.dispatch.c.src | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/numpy/core/src/umath/loops_unary_fp_le.dispatch.c.src b/numpy/core/src/umath/loops_unary_fp_le.dispatch.c.src index ff86f8ccc..c7a5bb665 100644 --- a/numpy/core/src/umath/loops_unary_fp_le.dispatch.c.src +++ b/numpy/core/src/umath/loops_unary_fp_le.dispatch.c.src @@ -78,9 +78,9 @@ NPY_FINLINE npyv_u32 npyv_isnan_f32(npyv_f32 v) { - const npyv_u32 truemask = npyv_setall_u32(1==1); - return npyv_andc_u8(npyv_reinterpret_u8_u32(truemask), - npyv_reinterpret_u8_u32(npyv_cvt_u32_b32(npyv_notnan_f32(v)))); + const npyv_u8 truemask = npyv_reinterpret_u8_u32(npyv_setall_u32(1==1)); + npyv_u8 notnan = npyv_reinterpret_u8_u32(npyv_cvt_u32_b32(npyv_notnan_f32(v))); + return npyv_reinterpret_u32_u8(npyv_andc_u8(truemask, notnan)); } NPY_FINLINE npyv_u8 npyv_pack_isnan_f32(npyv_f32 v0, npyv_f32 v1, npyv_f32 v2, npyv_f32 v3) @@ -99,9 +99,9 @@ npyv_pack_isnan_f32(npyv_f32 v0, npyv_f32 v1, npyv_f32 v2, npyv_f32 v3) NPY_FINLINE npyv_u64 npyv_isnan_f64(npyv_f64 v) { - const npyv_u64 truemask = npyv_setall_u64(1==1); - return npyv_andc_u8(npyv_reinterpret_u8_u64(truemask), - npyv_reinterpret_u8_u64(npyv_cvt_u64_b64(npyv_notnan_f64(v)))); + const npyv_u8 truemask = npyv_reinterpret_u8_u64(npyv_setall_u64(1==1)); + npyv_u8 notnan = npyv_reinterpret_u8_u64(npyv_cvt_u64_b64(npyv_notnan_f64(v))); + return npyv_reinterpret_u64_u8(npyv_andc_u8(truemask, notnan)); } NPY_FINLINE npyv_u8 npyv_pack_isnan_f64(npyv_f64 v0, npyv_f64 v1, npyv_f64 v2, npyv_f64 v3, @@ -212,9 +212,9 @@ npyv_notfinite_f32(npyv_f32 v) NPY_FINLINE npyv_u32 npyv_isfinite_f32(npyv_f32 v) { - const npyv_u32 truemask = npyv_setall_u32(1==1); - return npyv_andc_u8(npyv_reinterpret_u8_u32(truemask), - npyv_reinterpret_u8_u32(npyv_cvt_u32_b32(npyv_notfinite_f32(v)))); + const npyv_u8 truemask = npyv_reinterpret_u8_u32(npyv_setall_u32(1==1)); + npyv_u8 notfinite = npyv_reinterpret_u8_u32(npyv_cvt_u32_b32(npyv_notfinite_f32(v))); + return npyv_reinterpret_u32_u8(npyv_andc_u8(truemask, notfinite)); } NPY_FINLINE npyv_u8 npyv_pack_isfinite_f32(npyv_f32 v0, npyv_f32 v1, npyv_f32 v2, npyv_f32 v3) @@ -263,9 +263,9 @@ npyv_notfinite_f64(npyv_f64 v) NPY_FINLINE npyv_u64 npyv_isfinite_f64(npyv_f64 v) { - const npyv_u64 truemask = npyv_setall_u64(1==1); - return npyv_andc_u8(npyv_reinterpret_u8_u64(truemask), - npyv_reinterpret_u8_u64(npyv_cvt_u64_b64(npyv_notfinite_f64(v)))); + const npyv_u8 truemask = npyv_reinterpret_u8_u64(npyv_setall_u64(1==1)); + npyv_u8 notfinite = npyv_reinterpret_u8_u64(npyv_cvt_u64_b64(npyv_notfinite_f64(v))); + return npyv_reinterpret_u64_u8(npyv_andc_u8(truemask, notfinite)); } NPY_FINLINE npyv_u8 npyv_pack_isfinite_f64(npyv_f64 v0, npyv_f64 v1, npyv_f64 v2, npyv_f64 v3, @@ -345,7 +345,7 @@ npyv_pack_signbit_f32(npyv_f32 v0, npyv_f32 v1, npyv_f32 v2, npyv_f32 v3) npyv_cvt_b32_u32(npyv_signbit_f32(v2)), npyv_cvt_b32_u32(npyv_signbit_f32(v3)) ); - return signbit; + return npyv_cvt_u8_b8(signbit); #endif } #endif // NPY_SIMD_F32 @@ -386,7 +386,7 @@ npyv_pack_signbit_f64(npyv_f64 v0, npyv_f64 v1, npyv_f64 v2, npyv_f64 v3, npyv_cvt_b64_u64(npyv_signbit_f64(v6)), npyv_cvt_b64_u64(npyv_signbit_f64(v7)) ); - return signbit; + return npyv_cvt_u8_b8(signbit); #endif } #endif // NPY_SIMD_F64 |