frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Sparse] Move SparseTensorUtils.* to native/ (#96696)

Browse Source 
Fixes internal linking problem after `DECLARE_DISPATCH` was introduced in SparseTensorUtils.cpp, but implemented inside the native library.

Also, fix `sign-unsigned` compare in `_flatten_indices_impl`
Followups:
 Move code declared/implemented in `SparseTensorUtils.*` to `at::native` namespace
Pull Request resolved: https://github.com/pytorch/pytorch/pull/96696
Approved by: https://github.com/albanD
This commit is contained in:
Nikita Shulga
2023-03-14 02:56:52 +00:00
committed by PyTorch MergeBot
parent c31f5cc26a
commit 82daf98151
27 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
aten/src/ATen/SparseCsrTensorImpl.cpp
View File

@ -3,7 +3,6 @@
#include <ATen/SparseCsrTensorImpl.h>
#include <ATen/SparseCsrTensorUtils.h>
#include <ATen/SparseTensorImpl.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/core/LegacyTypeDispatch.h>
#include <ATen/native/Resize.h>

1
aten/src/ATen/SparseCsrTensorUtils.h
View File

@ -2,7 +2,6 @@
#include <ATen/SparseCsrTensorImpl.h>
#include <ATen/SparseTensorImpl.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/core/Tensor.h>
#ifndef AT_PER_OPERATOR_HEADERS

2
aten/src/ATen/SparseTensorUtils.cpp → aten/src/ATen/native/SparseTensorUtils.cpp
View File

@ -1,4 +1,4 @@
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#include <ATen/ATen.h>
#include <ATen/SparseTensorImpl.h>

0
aten/src/ATen/SparseTensorUtils.h → aten/src/ATen/native/SparseTensorUtils.h
View File

2
aten/src/ATen/native/TensorConversions.cpp
View File

@ -47,10 +47,10 @@
#endif
#include <ATen/SparseCsrTensorUtils.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/core/ATen_fwd.h>
#include <ATen/native/IndexingUtils.h>
#include <ATen/native/NonSymbolicBC.h>
#include <ATen/native/SparseTensorUtils.h>
#include <c10/core/impl/DeviceGuardImplInterface.h>
#include <algorithm>
#include <numeric>

2
aten/src/ATen/native/TensorShape.cpp
View File

@ -11,7 +11,6 @@
#include <ATen/MemoryOverlap.h>
#include <ATen/NamedTensorUtils.h>
#include <ATen/SparseCsrTensorUtils.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/TensorOperators.h>
#include <ATen/WrapDimUtils.h>
#include <ATen/core/DimVector.h>
@ -19,6 +18,7 @@
#include <ATen/native/Copy.h>
#include <ATen/native/NonSymbolicBC.h>
#include <ATen/native/Resize.h>
#include <ATen/native/SparseTensorUtils.h>
#include <ATen/native/TensorIterator.h>
#include <ATen/native/TensorShape.h>
#include <ATen/native/TypeProperties.h>

1
aten/src/ATen/native/mkl/SparseCsrLinearAlgebra.cpp
View File

@ -1,5 +1,6 @@
#define TORCH_ASSERT_ONLY_METHOD_OPERATORS
#include <ATen/native/mkl/SparseCsrLinearAlgebra.h>
#include <ATen/native/SparseTensorUtils.h>
// Don't compile with MKL for MSVC/macos since linking the sparse MKL routines
// needs some build fixes.

4
aten/src/ATen/native/sparse/FlattenIndicesCommon.h
View File

@ -5,7 +5,7 @@
#include <ATen/Dispatch.h>
#include <ATen/native/sparse/Macros.h>
#include <ATen/ExpandUtils.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#ifndef AT_PER_OPERATOR_HEADERS
#include <ATen/Functions.h>
@ -38,7 +38,7 @@ template <
typename index_t,
int64_t max_static_len = 0>
Tensor _flatten_indices_impl(const Tensor& indices, IntArrayRef size) {
TORCH_INTERNAL_ASSERT(indices.dim() > 1 && indices.size(0) == size.size());
TORCH_INTERNAL_ASSERT(indices.dim() > 1 && static_cast<size_t>(indices.size(0)) == size.size());
// Need owning storage in case of the Tensor class.
const auto hash_coeffs_storage = [&]() -> auto {

2
aten/src/ATen/native/sparse/SoftMax.cpp
View File

@ -4,8 +4,8 @@
#include <ATen/Dispatch.h>
#include <ATen/NamedTensorUtils.h>
#include <ATen/native/sparse/ParamUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#include <ATen/Parallel.h>
#include <ATen/SparseTensorUtils.h>
#include <c10/util/accumulate.h>
#include <c10/util/irange.h>

2
aten/src/ATen/native/sparse/SparseBinaryOpIntersectionCommon.h
View File

@ -5,7 +5,7 @@
#include <ATen/Dispatch.h>
#include <ATen/native/sparse/Macros.h>
#include <ATen/ExpandUtils.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#ifndef AT_PER_OPERATOR_HEADERS
#include <ATen/Functions.h>

2
aten/src/ATen/native/sparse/SparseCsrTensorMath.cpp
View File

@ -3,12 +3,12 @@
#include <ATen/ExpandUtils.h>
#include <ATen/Parallel.h>
#include <ATen/SparseCsrTensorUtils.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/core/Tensor.h>
#include <ATen/mkl/Sparse.h>
#include <ATen/native/BinaryOps.h>
#include <ATen/native/CPUBlas.h>
#include <ATen/native/Resize.h>
#include <ATen/native/SparseTensorUtils.h>
#include <ATen/native/mkl/SparseBlasImpl.h>
#include <ATen/native/sparse/SparseBlasImpl.h>
#include <ATen/native/sparse/SparseCsrTensorMath.h>

2
aten/src/ATen/native/sparse/SparseMatMul.cpp
View File

@ -4,7 +4,7 @@
#include <ATen/Dispatch.h>
#include <ATen/NamedTensorUtils.h>
#include <ATen/SparseTensorImpl.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#include <ATen/native/Resize.h>
#include <ATen/native/StridedRandomAccessor.h>
#include <ATen/native/CompositeRandomAccessor.h>

2
aten/src/ATen/native/sparse/SparseTensor.cpp
View File

@ -7,7 +7,7 @@
#include <ATen/Layout.h>
#include <ATen/Parallel.h>
#include <ATen/SparseTensorImpl.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#include <ATen/native/sparse/SparseStubs.h>
#include <ATen/native/IndexingUtils.h>
#include <ATen/native/NonSymbolicBC.h>

2
aten/src/ATen/native/sparse/SparseTensorMath.cpp
View File

@ -13,11 +13,11 @@
#include <ATen/ExpandUtils.h>
#include <ATen/ScalarOps.h>
#include <ATen/InitialTensorOptions.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/WrapDimUtilsMulti.h>
#include <ATen/native/BinaryOps.h>
#include <ATen/native/Copy.h>
#include <ATen/native/CPUBlas.h>
#include <ATen/native/SparseTensorUtils.h>
#ifndef AT_PER_OPERATOR_HEADERS
#include <ATen/Functions.h>

2
aten/src/ATen/native/sparse/SparseTensorMath.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
namespace at { namespace native {

2
aten/src/ATen/native/sparse/SparseUnaryOps.cpp
View File

@ -1,5 +1,5 @@
// #define TORCH_ASSERT_ONLY_METHOD_OPERATORS
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#include <ATen/core/Tensor.h>
#ifndef AT_PER_OPERATOR_HEADERS

2
aten/src/ATen/native/sparse/ValidateCompressedIndicesCommon.h
View File

@ -4,7 +4,7 @@
#include <ATen/Utils.h>
#include <ATen/native/TensorIterator.h>
#include <ATen/native/sparse/Macros.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#ifndef AT_PER_OPERATOR_HEADERS
#include <ATen/Functions.h>

2
aten/src/ATen/native/sparse/cuda/SoftMax.cu
View File

@ -2,12 +2,12 @@
#include <ATen/core/Tensor.h>
#include <ATen/Dispatch.h>
#include <ATen/ExpandUtils.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/WrapDimUtilsMulti.h>
#include <ATen/cuda/CUDAContext.h>
#include <ATen/cuda/CUDAUtils.h>
#include <ATen/cuda/ThrustAllocator.h>
#include <ATen/native/sparse/SparseTensorMath.h>
#include <ATen/native/SparseTensorUtils.h>
#include <ATen/native/sparse/ParamUtils.h>
#include <ATen/cuda/detail/IndexUtils.cuh>
#include <ATen/native/sparse/cuda/SparseCUDAApplyUtils.cuh>

2
aten/src/ATen/native/sparse/cuda/SparseBlasLegacy.cpp
View File

@ -5,7 +5,7 @@ This file will be removed eventually.
#define TORCH_ASSERT_ONLY_METHOD_OPERATORS
#include <ATen/core/Tensor.h>
#include <ATen/Dispatch.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#include <ATen/native/sparse/cuda/SparseBlasLegacy.h>
#include <ATen/native/sparse/cuda/SparseCUDABlas.h>

2
aten/src/ATen/native/sparse/cuda/SparseCUDATensor.cu
View File

@ -8,7 +8,7 @@
#include <ATen/native/sparse/cuda/SparseCUDAApplyUtils.cuh>
#include <ATen/native/cuda/SortingCommon.cuh>
#include <ATen/native/NonSymbolicBC.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#include <c10/macros/Macros.h>
#include <c10/util/accumulate.h>

2
aten/src/ATen/native/sparse/cuda/SparseCUDATensorMath.cu
View File

@ -4,7 +4,7 @@
#include <ATen/core/Tensor.h>
#include <ATen/Dispatch.h>
#include <ATen/cuda/CUDAContext.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#include <ATen/native/sparse/SparseTensorMath.h>
#include <ATen/native/sparse/cuda/SparseBlasLegacy.h>
#include <ATen/native/sparse/cuda/SparseCUDAApplyUtils.cuh>

2
aten/src/ATen/native/sparse/cuda/SparseCsrTensorMath.cu
View File

@ -5,10 +5,10 @@
#include <ATen/InitialTensorOptions.h>
#include <ATen/SparseCsrTensorImpl.h>
#include <ATen/SparseCsrTensorUtils.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/WrapDimUtilsMulti.h>
#include <ATen/native/BinaryOps.h>
#include <ATen/native/Resize.h>
#include <ATen/native/SparseTensorUtils.h>
#include <algorithm>
#ifndef AT_PER_OPERATOR_HEADERS

2
aten/src/ATen/native/sparse/cuda/SparseMatMul.cu
View File

@ -5,8 +5,8 @@
#include <ATen/NamedTensorUtils.h>
#include <ATen/Parallel.h>
#include <ATen/SparseTensorImpl.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/native/Resize.h>
#include <ATen/native/SparseTensorUtils.h>
#include <cuda_runtime.h>
#include <type_traits>

2
build_variables.bzl
View File

@ -990,7 +990,6 @@ aten_cpu_source_non_codegen_list = [
"aten/src/ATen/ScalarOps.cpp",
"aten/src/ATen/SparseTensorImpl.cpp",
"aten/src/ATen/SparseCsrTensorImpl.cpp",
"aten/src/ATen/SparseTensorUtils.cpp",
"aten/src/ATen/TensorGeometry.cpp",
"aten/src/ATen/TensorIndexing.cpp",
"aten/src/ATen/TensorMeta.cpp",
@ -1310,6 +1309,7 @@ aten_native_source_non_codegen_list = [
"aten/src/ATen/native/SobolEngineOpsUtils.cpp",
"aten/src/ATen/native/SoftMax.cpp",
"aten/src/ATen/native/Sorting.cpp",
"aten/src/ATen/native/SparseTensorUtils.cpp",
"aten/src/ATen/native/SpectralOps.cpp",
"aten/src/ATen/native/SummaryOps.cpp",
"aten/src/ATen/native/TensorAdvancedIndexing.cpp",

2
torch/csrc/autograd/FunctionsManual.cpp
View File

@ -10,7 +10,6 @@
#include <ATen/LegacyBatchedTensorImpl.h>
#include <ATen/ScalarOps.h>
#include <ATen/SparseCsrTensorUtils.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/TensorSubclassLikeUtils.h>
#include <ATen/Utils.h>
#include <ATen/WrapDimUtils.h>
@ -20,6 +19,7 @@
#include <ATen/native/Activation.h>
#include <ATen/native/IndexingUtils.h>
#include <ATen/native/LinearAlgebraUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#include <c10/core/TensorOptions.h>
#include <c10/util/OptionalArrayRef.h>
#include <c10/util/SmallBuffer.h>

2
torch/csrc/autograd/input_buffer.cpp
View File

@ -2,9 +2,9 @@
#include <ATen/LegacyBatchedTensorImpl.h>
#include <ATen/SparseCsrTensorUtils.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/TensorOperators.h>
#include <ATen/TensorSubclassLikeUtils.h>
#include <ATen/native/SparseTensorUtils.h>
#include <c10/core/DeviceGuard.h>
#include <c10/core/Event.h>

2
torch/csrc/distributed/c10d/ProcessGroupGloo.cpp
View File

@ -34,8 +34,8 @@
#include <gloo/reduce.h>
#include <gloo/scatter.h>
#include <ATen/SparseTensorUtils.h>
#include <ATen/ThreadLocalState.h>
#include <ATen/native/SparseTensorUtils.h>
#include <c10/util/StringUtil.h>
#include <c10/util/intrusive_ptr.h>