[BE] Nested namespace in quantized folder (pytorch#139166)

Fixes #ISSUE_NUMBER

Pull Request resolved: pytorch#139166
Approved by: https://github.com/cyyever, https://github.com/Skylion007

Author: malfet

aten/src/ATen/native/quantized/cpu/AdaptiveAveragePooling.cpp

@@ -24,8 +24,7 @@
 
 #include <ATen/native/quantized/cpu/QnnpackUtils.h>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 DEFINE_DISPATCH(qadaptive_avg_pool2d_nhwc_stub);
 DEFINE_DISPATCH(qadaptive_avg_pool3d_ndhwc_stub);
@@ -352,5 +351,4 @@ Tensor adaptive_avg_pool3d_quantized_cpu(
   return at::native::adaptive_avg_pool3d_out_quantized_cpu(input, output_size, output);
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/AveragePool2d.cpp

@@ -24,8 +24,7 @@
 #include <limits>
 #include <vector>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 DEFINE_DISPATCH(qavg_pool2d_nhwc_stub);
 
@@ -390,5 +389,4 @@ Tensor avg_pool2d_quantized_cpu(
   return output;
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/AveragePool3d.cpp

@@ -16,8 +16,7 @@
 
 #include <vector>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 DEFINE_DISPATCH(qavg_pool3d_nhwc_stub);
 
@@ -180,5 +179,4 @@ Tensor avg_pool3d_quantized_cpu(
   return output;
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/BinaryOps.cpp

@@ -25,8 +25,7 @@
 #include <algorithm>
 #include <utility>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 DEFINE_DISPATCH(qadd_relu_stub);
 DEFINE_DISPATCH(qadd_stub);
@@ -505,4 +504,4 @@ Tensor quantized_add(Tensor qa, Tensor qb, double scale, int64_t zero_point){
   return qadd<false>(std::move(qa), std::move(qb), scale, zero_point);
 }
 
-}}  // namespace at::native
+}  // namespace at::native

aten/src/ATen/native/quantized/cpu/BinaryOps.h

@@ -1,8 +1,6 @@
 #include <ATen/core/Tensor.h>
 
-namespace at {
-namespace native {
+namespace at::native {
 TORCH_API Tensor
 quantized_add(Tensor qa, Tensor qb, double scale, int64_t zero_point);
-}
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/ChannelShuffle.cpp

@@ -12,8 +12,7 @@
 #include <ATen/ops/channel_shuffle_native.h>
 #endif
 
-namespace at {
-namespace native {
+namespace at::native {
 
 #ifdef USE_PYTORCH_QNNPACK
 namespace {
@@ -120,5 +119,4 @@ class QChannelShuffle final : public c10::OperatorKernel {
 
 } // namespace
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/IntReprQuant.cpp

@@ -15,8 +15,7 @@
 #include <ATen/ops/int_repr_native.h>
 #endif
 
-namespace at {
-namespace native {
+namespace at::native {
 
 // When input Tensor is non-dense, i.e. the allocated memory
 // is larger than the memory used by all the elements, we'll
@@ -52,5 +51,4 @@ Tensor int_repr_quantized_cpu(const Tensor& self) {
   return dst;
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/MakePerTensorQuantizedTensor.cpp

@@ -11,8 +11,7 @@
 #include <ATen/ops/_make_per_tensor_quantized_tensor_native.h>
 #endif
 
-namespace at {
-namespace native {
+namespace at::native {
 
 Tensor make_per_tensor_quantized_tensor_cpu(
     const Tensor& self,
@@ -37,5 +36,4 @@ Tensor make_per_tensor_quantized_tensor_cpu(
   return dst;
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/Normalization.cpp

@@ -16,8 +16,7 @@
 
 #include <algorithm>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 DEFINE_DISPATCH(qbatch_norm_stub);
 DEFINE_DISPATCH(qbatch_norm_relu_stub);
@@ -412,5 +411,4 @@ TORCH_LIBRARY_IMPL(quantized, QuantizedCPU, m) {
   m.impl(TORCH_SELECTIVE_NAME("quantized::batch_norm3d_relu"), TORCH_FN(q_batch_norm3d_impl<true>));
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/Pooling.cpp

@@ -29,8 +29,7 @@
 #include <algorithm>
 #include <vector>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 DEFINE_DISPATCH(qmaxpool_2d_nhwc_stub);
 DEFINE_DISPATCH(qmaxpool_3d_nthwc_stub);
@@ -763,5 +762,4 @@ TORCH_LIBRARY_IMPL(quantized, CPU, m) {
 }
 
 } // namespace
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/QnnpackUtils.h

@@ -428,9 +428,7 @@ inline std::pair<T, T> activationLimits(
   }
 }
 
-namespace at {
-namespace native {
-namespace qnnp_avgpool_helper {
+namespace at::native::qnnp_avgpool_helper {
 Tensor qnnpack_avg_pool2d(
     Tensor input,
     IntArrayRef kernel_size,
@@ -439,9 +437,7 @@ Tensor qnnpack_avg_pool2d(
     bool ceil_mode,
     bool count_include_pad,
     std::optional<int64_t> divisor_override);
-} // qnnp_avgpool_helper
-} // namespace native
-} // namespace at
+} // namespace at::native::qnnp_avgpool_helper
 
 namespace {
 [[maybe_unused]] std::vector<float> generate_requantization_scales(

aten/src/ATen/native/quantized/cpu/QuantizedOps.h

@@ -6,8 +6,7 @@
 #include <ATen/native/Activation.h>
 #include <ATen/native/DispatchStub.h>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 using qrelu_fn = void (*)(const at::Tensor& /*qx*/, at::Tensor& /*qy*/);
 using qrelu_leaky_fn = void (*)(Tensor& /*out*/, const Tensor& /*qx*/,
@@ -254,5 +253,4 @@ DECLARE_DISPATCH(qmean_inner_dim_fn, qmean_inner_dim_stub);
 DECLARE_DISPATCH(qstd_inner_dim_fn, qstd_inner_dim_stub);
 DECLARE_DISPATCH(qprelu_fn, qprelu_stub);
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/ReduceOps.cpp

@@ -20,8 +20,7 @@
 #include <ATen/ops/zeros_like_ops.h>
 #endif
 
-namespace at {
-namespace native {
+namespace at::native {
 
 DEFINE_DISPATCH(qmean_inner_dim_stub);
 DEFINE_DISPATCH(qstd_inner_dim_stub);
@@ -227,5 +226,4 @@ Tensor std_quantized_cpu(
   return result;
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/RuyUtils.cpp

@@ -3,9 +3,7 @@
 #include <ATen/ATen.h>
 #include <ATen/native/quantized/cpu/RuyUtils.h>
 
-namespace at {
-namespace native {
-namespace ruy_utils {
+namespace at::native::ruy_utils {
 
 static thread_local ruy::Context context;
 
@@ -30,8 +28,6 @@ void quantize_multiplier(double scale,
   *multiplier_fixedpoint = static_cast<std::int32_t>(q_fixed);
 }
 
-} // namespace ruy_utils
-} // namespace native
-} // namespace
+} // namespace at::native::ruy_utils
 
 #endif // USE_RUY_QMATMUL

aten/src/ATen/native/quantized/cpu/RuyUtils.h

@@ -4,18 +4,14 @@
 
 #include <ruy/ruy.h>
 
-namespace at {
-namespace native {
-namespace ruy_utils {
+namespace at::native::ruy_utils {
 
 ruy::Context* get_ruy_context();
 
 void quantize_multiplier(double scale,
                          int* multiplier_fixedpoint,
                          int* multiplier_exponent);
 
-} // namespace ruy_utils
-} // namespace native
-} // namespace
+} // namespace at::native::ruy_utils
 
 #endif // USE_RUY_QMATMUL

aten/src/ATen/native/quantized/cpu/Sorting.cpp

@@ -13,8 +13,7 @@
 #include <ATen/ops/topk_native.h>
 #endif
 
-namespace at {
-namespace native {
+namespace at::native {
 
 // Currently internal-only.
 //
@@ -64,4 +63,4 @@ std::tuple<Tensor, Tensor> topk_quantized_cpu(
 
 DEFINE_DISPATCH(qtopk_stub);
 
-}}  // namespace at::native
+}  // namespace at::native

aten/src/ATen/native/quantized/cpu/TensorOperators.cpp

@@ -24,8 +24,7 @@
 #include <ATen/ops/resize_native.h>
 #endif
 
-namespace at {
-namespace native {
+namespace at::native {
 
 /*
 All comparator operators will be named "<aten op name>_quantized_cpu".
@@ -100,4 +99,4 @@ const Tensor& quantized_resize_cpu_(
   return self;
 }
 
-}}  // at::native
+}  // namespace at::native

aten/src/ATen/native/quantized/cpu/UpSampleBilinear2d.cpp

@@ -18,8 +18,7 @@
 
 #include <cstring>
 
-namespace at {
-namespace native {
+namespace at::native {
 namespace {
 
 // pre calculate interpolation params on width
@@ -217,5 +216,4 @@ Tensor upsample_bilinear2d_quantized_cpu(
 }
 
 DEFINE_DISPATCH(qupsample_bilinear2d_nhwc_stub);
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/UpSampleNearest2d.cpp

@@ -19,8 +19,7 @@
 #include <cstring>
 
 
-namespace at {
-namespace native {
+namespace at::native {
 
 // Define a typedef to dispatch to nearest_idx or nearest_exact_idx
 typedef int64_t (*nn_compute_source_index_fn_t)(const float, int64_t, int64_t);
@@ -218,5 +217,4 @@ Tensor _upsample_nearest_exact2d_quantized_cpu(
   return _upsample_nearest2d_quantized_cpu<nearest_neighbor_exact_compute_source_index>(input, osize, scale_h, scale_w);
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/UpSampleNearest3d.cpp

@@ -17,8 +17,7 @@
 #include <cstring>
 
 
-namespace at {
-namespace native {
+namespace at::native {
 
 // Define a typedef to dispatch to nearest_idx or nearest_exact_idx
 typedef int64_t (*nn_compute_source_index_fn_t)(const float, int64_t, int64_t);
@@ -234,5 +233,4 @@ Tensor _upsample_nearest_exact3d_quantized_cpu(
       input, osize, scale_d, scale_h, scale_w);
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native

aten/src/ATen/native/quantized/cpu/XnnpackUtils.cpp

@@ -5,9 +5,7 @@
 #include <ATen/native/quantized/cpu/XnnpackUtils.h>
 #include <c10/util/irange.h>
 
-namespace at {
-namespace native {
-namespace xnnp_utils {
+namespace at::native::xnnp_utils {
 
 std::vector<size_t> get_mem_format_aware_shape(const at::Tensor& in) {
   const auto mem_format = in.suggest_memory_format();
@@ -82,8 +80,6 @@ Tensor convert_conv_weights_to_channel_last_tensor<2>(
                    // 2d conv weight transform
                    : src.contiguous(c10::MemoryFormat::ChannelsLast);
 }
-} // namespace xnnp_utils
-} // namespace native
-} // namespace at
+} // namespace at::native::xnnp_utils
 
 #endif // USE_XNNPACK

aten/src/ATen/native/quantized/cpu/XnnpackUtils.h

@@ -8,9 +8,7 @@
 
 using xnnpack_operator = at::native::xnnpack::Operator;
 
-namespace at {
-namespace native {
-namespace xnnp_utils {
+namespace at::native::xnnp_utils {
 
 /*
  * Return shape in the same order as the memory format
@@ -328,8 +326,6 @@ enum xnn_status xnnp_setup_fully_connected_nc(
     );
 }
 
-} // namespace xnnp_utils
-} // namespace native
-} // namespace at
+} // namespace at::native::xnnp_utils
 
 #endif // USE_XNNPACK