[BE] Use nested namespaces for sparse (pytorch#117415)

malfet · pytorchmergebot · commit 53f33613193e · 2024-01-13T19:51:28.000Z
C++17 is fu Pull Request resolved: pytorch#117415 Approved by: https://github.com/Skylion007
diff --git a/aten/src/ATen/native/sparse/ParamUtils.h b/aten/src/ATen/native/sparse/ParamUtils.h
@@ -4,8 +4,7 @@
 #include <ATen/TensorUtils.h>
 #include <tuple>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 TORCH_API std::tuple<Tensor, Tensor, int64_t> softmax_sparse_input_preprocessing(
     const Tensor& input_,
@@ -20,5 +19,4 @@ TORCH_API std::tuple<Tensor, Tensor, Tensor, int64_t> softmax_backward_sparse_in
     const Tensor& input_,
     CheckedFrom function_name);
 
-} // namespace native
-} // namespace at
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/SparseBinaryOpIntersectionCommon.h b/aten/src/ATen/native/sparse/SparseBinaryOpIntersectionCommon.h
@@ -23,8 +23,7 @@
 #define NAME "sparse_binary_op_intersection_cpu"
 #endif
 
-namespace at {
-namespace native {
+namespace at::native {
 
 namespace {
 
@@ -478,4 +477,4 @@ void _sparse_binary_op_intersection_kernel_out(
 
 } // anonymous namespace
 
-}} // at::native
+} // at::native
diff --git a/aten/src/ATen/native/sparse/SparseBlas.h b/aten/src/ATen/native/sparse/SparseBlas.h
@@ -5,9 +5,7 @@
 #include <ATen/Tensor.h>
 #include <ATen/core/Scalar.h>
 
-namespace at {
-namespace native {
-namespace sparse {
+namespace at::native::sparse {
 
 TORCH_API void sparse_sampled_addmm_check_inputs(
     const Tensor& self,
@@ -17,6 +15,4 @@ TORCH_API void sparse_sampled_addmm_check_inputs(
     const Scalar& alpha,
     const Tensor& result);
 
-} // namespace sparse
-} // namespace native
-} // namespace at
+} // namespace at::native::sparse
diff --git a/aten/src/ATen/native/sparse/SparseBlasImpl.h b/aten/src/ATen/native/sparse/SparseBlasImpl.h
@@ -3,10 +3,7 @@
 #include <ATen/Tensor.h>
 #include <ATen/core/Scalar.h>
 
-namespace at {
-namespace native {
-namespace sparse {
-namespace impl {
+namespace at::native::sparse::impl {
 
 TORCH_API Tensor& _compressed_row_strided_mm_out(
     const Tensor& compressed_row_sparse,
@@ -45,7 +42,4 @@ void triangular_solve_out_sparse_csr(
     bool unitriangular);
 
 } // namespace cpu
-} // namespace impl
-} // namespace sparse
-} // namespace native
-} // namespace at
+} // namespace at::native::sparse::impl
diff --git a/aten/src/ATen/native/sparse/SparseCsrTensorMath.h b/aten/src/ATen/native/sparse/SparseCsrTensorMath.h
@@ -6,10 +6,7 @@
 #include <ATen/native/ReductionType.h>
 #include <ATen/native/cpu/SpmmReduceKernel.h>
 
-namespace at {
-namespace native {
-namespace sparse {
-namespace impl {
+namespace at::native::sparse::impl {
 
 // Returns true if all entries of self are zero
 // TODO: This has potential to be a generic helper
@@ -84,7 +81,4 @@ inline void check_sparse_mm_reduce_impl_inputs(
   check_dim_size(other, 2, 0, self.size(1));
 }
 
-}
-}
-}
-}
+} // at::native::sparse::impl
diff --git a/aten/src/ATen/native/sparse/SparseStubs.h b/aten/src/ATen/native/sparse/SparseStubs.h
@@ -22,6 +22,5 @@ DECLARE_DISPATCH(sparse_mask_projection_out_fn, sparse_mask_projection_out_stub)
 using flatten_indices_fn = Tensor (*)(const Tensor& indices, IntArrayRef size);
 DECLARE_DISPATCH(flatten_indices_fn, flatten_indices_stub);
 
-}
-
-}
+} // namespace native
+} // namespace at
diff --git a/aten/src/ATen/native/sparse/SparseTensorMath.h b/aten/src/ATen/native/sparse/SparseTensorMath.h
@@ -2,12 +2,12 @@
 
 #include <ATen/native/SparseTensorUtils.h>
 
-namespace at { namespace native {
+namespace at::native {
 
 TORCH_API sparse::SparseTensor& mul_out_sparse_scalar(sparse::SparseTensor& r, const sparse::SparseTensor& t, const Scalar& value);
 TORCH_API sparse::SparseTensor& mul_out_sparse_zerodim(sparse::SparseTensor& r, const sparse::SparseTensor& t, const Tensor& value);
 TORCH_API sparse::SparseTensor& _mul_dense_sparse_out(const Tensor& d, const Tensor& s, Tensor& res);
 TORCH_API sparse::SparseTensor& _mul_sparse_sparse_zero_dim_out(const Tensor& zero_dim, const Tensor& other, Tensor& res);
 TORCH_API sparse::SparseTensor& _mul_sparse_sparse_out(const Tensor& x, const Tensor& y, Tensor& res);
 
-}}
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/ValidateCompressedIndicesCommon.h b/aten/src/ATen/native/sparse/ValidateCompressedIndicesCommon.h
@@ -24,8 +24,7 @@
 
 #define INVARIANT_CHECK_FUNC_API static INLINE FUNCAPI void
 
-namespace at {
-namespace native {
+namespace at::native {
 
 namespace {
 
@@ -412,5 +411,4 @@ void validate_compressed_sparse_indices_kernel(
 
 } // namespace
 
-} // namespace native
-} // namespace at
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/cuda/SoftMax.cu b/aten/src/ATen/native/sparse/cuda/SoftMax.cu
@@ -61,8 +61,7 @@
 
 #include <c10/cuda/CUDAMathCompat.h>
 
-namespace at {
-namespace native {
+namespace at::native {
 namespace {
 
 // Number of threads in a block given an input size up to MAX_BLOCK_SIZE
@@ -669,5 +668,4 @@ Tensor log_softmax_backward_sparse_cuda(
   return grad_input;
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/cuda/SparseBlas.cpp b/aten/src/ATen/native/sparse/cuda/SparseBlas.cpp
@@ -24,8 +24,7 @@
 
 #include <c10/util/MaybeOwned.h>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 /*
   Computes `result` <- α*(A @ B) * spy(C) + β*C, where spy(C) is the sparsity pattern matrix of C.
@@ -285,5 +284,4 @@ std::tuple<Tensor&, Tensor&> triangular_solve_out_sparse_csr_cuda(
   return std::tuple<Tensor&, Tensor&>(X, clone_A);
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/cuda/SparseBlasImpl.cpp b/aten/src/ATen/native/sparse/cuda/SparseBlasImpl.cpp
@@ -23,11 +23,7 @@
 #include <c10/cuda/CUDACachingAllocator.h>
 #include <c10/util/MaybeOwned.h>
 
-namespace at {
-namespace native {
-namespace sparse {
-namespace impl {
-namespace cuda {
+namespace at::native::sparse::impl::cuda {
 
 namespace {
 
@@ -1515,8 +1511,4 @@ void sampled_addmm_out_sparse_csr(
 #endif
 }
 
-} // namespace cuda
-} // namespace impl
-} // namespace sparse
-} // namespace native
-} // namespace at
+} // namespace at::native::sparse::impl::cuda
diff --git a/aten/src/ATen/native/sparse/cuda/SparseBlasImpl.h b/aten/src/ATen/native/sparse/cuda/SparseBlasImpl.h
@@ -4,11 +4,7 @@
 #include <ATen/Tensor.h>
 #include <ATen/core/Scalar.h>
 
-namespace at {
-namespace native {
-namespace sparse {
-namespace impl {
-namespace cuda {
+namespace at::native::sparse::impl::cuda {
 
 void addmm_out_sparse_csr(
     const Tensor& input,
@@ -47,8 +43,4 @@ void sampled_addmm_out_sparse_csr(
     const Scalar& alpha,
     const at::sparse_csr::SparseCsrTensor& result);
 
-} // namespace cuda
-} // namespace impl
-} // namespace sparse
-} // namespace native
-} // namespace at
+} // namespace at::native::sparse::impl::cuda
diff --git a/aten/src/ATen/native/sparse/cuda/SparseBlasLegacy.cpp b/aten/src/ATen/native/sparse/cuda/SparseBlasLegacy.cpp
@@ -9,8 +9,7 @@ This file will be removed eventually.
 #include <ATen/native/sparse/cuda/SparseBlasLegacy.h>
 #include <ATen/native/sparse/cuda/SparseCUDABlas.h>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 void s_addmm_out_csr_sparse_dense_cuda_worker(int64_t nnz, int64_t m, int64_t n, int64_t k, const Tensor& r_, const Scalar& beta, const Tensor& t, const Scalar& alpha, const Tensor& crow_indices, const Tensor& col_indices, const Tensor& values, const Tensor& dense) {
   TORCH_INTERNAL_ASSERT(nnz > 0);
@@ -71,5 +70,4 @@ void s_addmm_out_csr_sparse_dense_cuda_worker(int64_t nnz, int64_t m, int64_t n,
     );
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/cuda/SparseBlasLegacy.h b/aten/src/ATen/native/sparse/cuda/SparseBlasLegacy.h
@@ -9,10 +9,8 @@ Here only 32-bit indices sparse indices are supported.
 This file will be removed eventually.
 */
 
-namespace at {
-namespace native {
+namespace at::native {
 
 void s_addmm_out_csr_sparse_dense_cuda_worker(int64_t nnz, int64_t m, int64_t n, int64_t k, const Tensor& r_, const Scalar& beta, const Tensor& t, const Scalar& alpha, const Tensor& crow_indices, const Tensor& col_indices, const Tensor& values, const Tensor& dense);
 
-} // namespace native
-} // namespace at
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/cuda/SparseCUDAApplyUtils.cuh b/aten/src/ATen/native/sparse/cuda/SparseCUDAApplyUtils.cuh
@@ -5,9 +5,7 @@
 #include <ATen/native/cuda/thread_constants.h>
 #include <c10/macros/Macros.h>
 
-namespace at { namespace native {
-
-namespace apply {
+namespace at::native::apply {
 
 using at::cuda::detail::TensorInfo;
 using indexT = int64_t;
@@ -290,6 +288,4 @@ __global__ void coalesceValuesKernel(
   }
 }
 
-} // namespace apply
-
-}} // namespace at::native
+} // namespace at::native::apply
diff --git a/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cpp b/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cpp
@@ -69,7 +69,7 @@ const char* cusparseGetErrorString(cusparseStatus_t status) {
 }
 #endif
 
-namespace at { namespace native { namespace sparse { namespace cuda {
+namespace at::native::sparse::cuda {
 
 void Xcoo2csr(const int *coorowind, int64_t nnz, int64_t m, int *csrrowptr) {
   TORCH_CHECK((m <= INT_MAX) && (nnz <= INT_MAX),
@@ -524,4 +524,4 @@ void XcoosortByRow(int64_t m, int64_t n, int64_t nnz, int *cooRows, int *cooCols
 }
 
 
-}}}} // namespace at::native::sparse::cuda
+} // namespace at::native::sparse::cuda
diff --git a/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.h b/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.h
@@ -2,7 +2,7 @@
 
 #include <ATen/cuda/ATenCUDAGeneral.h>
 
-namespace at { namespace native { namespace sparse { namespace cuda {
+namespace at::native::sparse::cuda{
 
 TORCH_CUDA_CU_API void Xcoo2csr(
     const int* coorowind,
@@ -61,4 +61,4 @@ TORCH_CUDA_CU_API void XcoosortByRow(
     int* cooCols,
     int* P,
     void* pBuffer);
-}}}} // namespace at::native::sparse::cuda
+} // namespace at::native::sparse::cuda
diff --git a/aten/src/ATen/native/sparse/cuda/SparseCUDATensor.cu b/aten/src/ATen/native/sparse/cuda/SparseCUDATensor.cu
@@ -36,7 +36,7 @@
 #include <thrust/binary_search.h>
 #include <c10/macros/Macros.h>
 
-namespace at { namespace native {
+namespace at::native {
 
 using namespace at::sparse;
 
@@ -166,4 +166,4 @@ SparseTensor _coalesce_sparse_cuda(const SparseTensor& self) {
   return dst;
 }
 
-}} // namespace at::native
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/cuda/SparseCUDATensorMath.cu b/aten/src/ATen/native/sparse/cuda/SparseCUDATensorMath.cu
@@ -51,7 +51,7 @@
 #define I_INFO(tensor) cuda::detail::getTensorInfo<int64_t, uint64_t>(tensor)
 #define V_INFO(tensor) cuda::detail::getTensorInfo<scalar_t, uint64_t>(tensor)
 
-namespace at { namespace native {
+namespace at::native {
 
 using namespace at::sparse;
 using at::cuda::detail::TensorInfo;
@@ -961,4 +961,4 @@ Tensor& bmm_out_sparse_cuda(const SparseTensor& self, const Tensor& mat2, Tensor
   return result;
 }
 
-}} // namespace at::native
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/cuda/SparseCUDATensorMath.cuh b/aten/src/ATen/native/sparse/cuda/SparseCUDATensorMath.cuh
@@ -10,8 +10,8 @@ namespace c10 {
 class Scalar;
 }
 
-namespace at { namespace native {
+namespace at::native {
 
 void s_addmm_out_sparse_dense_cuda_worker(int64_t nnz, int64_t m, int64_t n, int64_t k, Tensor& r_, const Scalar& beta, const Tensor& t, const Scalar& alpha, Tensor& indices, Tensor& values, const Tensor& dense);
 
-}} // namespace at::native
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/cuda/SparseCsrTensorMath.cu b/aten/src/ATen/native/sparse/cuda/SparseCsrTensorMath.cu
@@ -45,8 +45,7 @@
 #include <thrust/for_each.h>
 #include <thrust/sequence.h>
 
-namespace at {
-namespace native {
+namespace at::native {
 
 namespace {
 
@@ -737,5 +736,4 @@ Tensor _sparse_csr_prod_cuda(const Tensor& input, IntArrayRef dims_to_reduce, bo
   return result;
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/cuda/SparseMatMul.cu b/aten/src/ATen/native/sparse/cuda/SparseMatMul.cu
@@ -50,8 +50,7 @@
 #include <library_types.h>
 #endif
 
-namespace at {
-namespace native {
+namespace at::native {
 
 namespace {
 
@@ -811,5 +810,4 @@ Tensor sparse_sparse_matmul_cuda(const Tensor& mat1_, const Tensor& mat2_) {
   return output;
 }
 
-} // namespace native
-} // namespace at
+} // namespace at::native
diff --git a/aten/src/ATen/native/sparse/cuda/SparseSemiStructuredLinear.cu b/aten/src/ATen/native/sparse/cuda/SparseSemiStructuredLinear.cu
