From 73602873c994eb1a4d2b8ff86c9dda541087385e Mon Sep 17 00:00:00 2001 From: cyy Date: Sun, 17 Nov 2024 16:12:26 +0000 Subject: [PATCH] [10/N] Fix Wextra-semi warning (#140880) Fixes #ISSUE_NUMBER Pull Request resolved: https://github.com/pytorch/pytorch/pull/140880 Approved by: https://github.com/ezyang --- .../cpu/vec/vec128/vec128_bfloat16_neon.h | 22 +++++++++---------- .../ATen/cpu/vec/vec128/vec128_float_neon.h | 4 ++-- .../ATen/cpu/vec/vec128/vec128_half_neon.h | 2 +- aten/src/ATen/native/QuantizedLinear.cpp | 4 ++-- torchgen/dest/ufunc.py | 6 ++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/aten/src/ATen/cpu/vec/vec128/vec128_bfloat16_neon.h b/aten/src/ATen/cpu/vec/vec128/vec128_bfloat16_neon.h index 94599f57aae..2f6d2d07be0 100644 --- a/aten/src/ATen/cpu/vec/vec128/vec128_bfloat16_neon.h +++ b/aten/src/ATen/cpu/vec/vec128/vec128_bfloat16_neon.h @@ -339,18 +339,18 @@ class Vectorized : public Vectorized16::name); \ } - DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD(abs); + DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD(abs) Vectorized frac() const; - DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD(neg); - DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD(trunc); - DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD(sqrt); - DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD(reciprocal); - DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator==); - DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator!=); - DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator<); - DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator<=); - DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator>); - DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator>=); + DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD(neg) + DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD(trunc) + DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD(sqrt) + DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD(reciprocal) + DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator==) + DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator!=) + DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator<) + DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator<=) + DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator>) + DEFINE_BINARY_COMPARISON_OPERATOR_VIA_FLOAT_METHOD(operator>=) #undef DEFINE_UNARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD #undef DEFINE_BINARY_ELEMENTWISE_FUNC_VIA_FLOAT_METHOD diff --git a/aten/src/ATen/cpu/vec/vec128/vec128_float_neon.h b/aten/src/ATen/cpu/vec/vec128/vec128_float_neon.h index acba921255d..a4fc93f41dc 100644 --- a/aten/src/ATen/cpu/vec/vec128/vec128_float_neon.h +++ b/aten/src/ATen/cpu/vec/vec128/vec128_float_neon.h @@ -303,8 +303,8 @@ public: Vectorized exp_u20() const { return exp(); } - DEFINE_SLEEF_COMPATIBLE_BINARY_ELEMENTWISE_FUNC_WITH_SLEEF_NAME(fmod, Sleef_fmodf4); - DEFINE_SLEEF_COMPATIBLE_BINARY_ELEMENTWISE_FUNC_WITH_SLEEF_NAME(hypot, Sleef_hypotf4_u05); + DEFINE_SLEEF_COMPATIBLE_BINARY_ELEMENTWISE_FUNC_WITH_SLEEF_NAME(fmod, Sleef_fmodf4) + DEFINE_SLEEF_COMPATIBLE_BINARY_ELEMENTWISE_FUNC_WITH_SLEEF_NAME(hypot, Sleef_hypotf4_u05) Vectorized i0() const { return map(calc_i0); } diff --git a/aten/src/ATen/cpu/vec/vec128/vec128_half_neon.h b/aten/src/ATen/cpu/vec/vec128/vec128_half_neon.h index 6822bd2f6da..146993eb559 100644 --- a/aten/src/ATen/cpu/vec/vec128/vec128_half_neon.h +++ b/aten/src/ATen/cpu/vec/vec128/vec128_half_neon.h @@ -234,7 +234,7 @@ class Vectorized : public Vectorized16) #ifdef USE_FBGEMM namespace caffe2 { // Required for cpp_custom_type_hack to work -CAFFE_KNOWN_TYPE(fbgemm::PackBMatrix); -CAFFE_KNOWN_TYPE(c10::intrusive_ptr); +CAFFE_KNOWN_TYPE(fbgemm::PackBMatrix) +CAFFE_KNOWN_TYPE(c10::intrusive_ptr) } // namespace caffe2 #endif // USE_FBGEMM diff --git a/torchgen/dest/ufunc.py b/torchgen/dest/ufunc.py index 5b2b8fd3b59..3acf098f232 100644 --- a/torchgen/dest/ufunc.py +++ b/torchgen/dest/ufunc.py @@ -313,7 +313,7 @@ AT_DISPATCH_CASE(at::ScalarType::{dtype}, {ufunctors} {stub_sig.type_defn()}; -{stub_sig.dispatch_decl()}; +{stub_sig.dispatch_decl()} {stub_sig.kernel_defn()} {{ AT_DISPATCH_SWITCH(iter.common_dtype(), "{sig.name}", @@ -386,7 +386,7 @@ def compute_ufunc_cpu(g: NativeFunctionsGroup) -> str: return f""" {stub_sig.type_defn()}; -{stub_sig.dispatch_decl()}; +{stub_sig.dispatch_decl()} {stub_sig.dispatch_defn()}; {sig.defn()} {{ @@ -546,6 +546,6 @@ namespace {{ }} // anonymous namespace {stub_sig.type_defn()}; -{stub_sig.dispatch_decl()}; +{stub_sig.dispatch_decl()} REGISTER_DISPATCH({stub_sig.name}, &{stub_sig.kernel_name}) """