[THC] remove TensorTypeUtils and TensorInfo (#64965)

Natalia Gimelshein · facebook-github-bot · commit 35c82dbf5cb7 · 2021-09-13T20:36:28.000-07:00
Summary: per title Pull Request resolved: #64965 Reviewed By: mruberry Differential Revision: D30916754 Pulled By: ngimel fbshipit-source-id: b24020d6a7ce8a05a5ab6c579d176dd94dd3b1d7
diff --git a/aten/src/ATen/native/cuda/IndexKernel.cu b/aten/src/ATen/native/cuda/IndexKernel.cu
@@ -16,7 +16,6 @@
 #include <ATen/native/cuda/Loops.cuh>
 #include <ATen/native/cuda/KernelUtils.cuh>
 #include <c10/util/MaybeOwned.h>
-#include <THC/THCTensorInfo.cuh>
 
 namespace at { namespace native {
 
diff --git a/aten/src/ATen/native/cuda/Indexing.cu b/aten/src/ATen/native/cuda/Indexing.cu
@@ -14,7 +14,6 @@
 
 #include <THC/THCDeviceUtils.cuh>
 #include <THC/THCGeneral.h>
-#include <THC/THCTensorInfo.cuh>
 #include <ATen/cuda/CUDAContext.h>
 #include <ATen/cuda/cub.cuh>
 #include <c10/util/irange.h>
@@ -479,9 +478,9 @@ Tensor& index_add_cuda_(Tensor & self, int64_t dim, const Tensor & index, const
   Tensor self_ = (self.dim() == 0) ? self.view(1) : self;
   Tensor source_ = (source.dim() == 0) ? source.view(1) : source;
 
-  TORCH_CHECK(self.dim() <= MAX_CUTORCH_DIMS, CUTORCH_DIM_WARNING);
-  TORCH_CHECK(source.dim() <= MAX_CUTORCH_DIMS, CUTORCH_DIM_WARNING);
-  TORCH_CHECK(index.dim() <= MAX_CUTORCH_DIMS, CUTORCH_DIM_WARNING);
+  TORCH_CHECK(self.dim() <= MAX_TENSORINFO_DIMS, "tensor has too many (>", MAX_TENSORINFO_DIMS, ") dims");
+  TORCH_CHECK(source.dim() <= MAX_TENSORINFO_DIMS, "tensor has too many (>", MAX_TENSORINFO_DIMS, ") dims" );
+  TORCH_CHECK(index.dim() <= MAX_TENSORINFO_DIMS, "tensor has too many (>", MAX_TENSORINFO_DIMS, ") dims");
 
   at::assert_no_internal_overlap(self);
   at::assert_no_partial_overlap(self, index);
diff --git a/aten/src/THC/CMakeLists.txt b/aten/src/THC/CMakeLists.txt
@@ -57,8 +57,6 @@ install(FILES
           THCGenerateComplexDoubleType.h
           THCIntegerDivider.cuh
           THCNumerics.cuh
-          THCTensorInfo.cuh
-          THCTensorTypeUtils.cuh
           THCThrustAllocator.cuh
           # See Note [TH abstraction violation]
           THCTensor.hpp
diff --git a/aten/src/THC/THCTensor.cpp b/aten/src/THC/THCTensor.cpp
@@ -16,8 +16,6 @@
 #include <THC/generic/THCTensor.cpp>
 #include <THC/THCGenerateBFloat16Type.h>
 
-#include <THC/THCTensorInfo.cuh>
-
 #include <ATen/native/cuda/Resize.cuh>
 
 int THCTensor_nDimension(THCState *state, const THCTensor *self) {
@@ -326,51 +324,3 @@ int compareSizeAndStride(const void* a, const void* b) {
 }
 
 }
-
-/* Returns false if there is no possibility that the tensor    */
-/* has "overlapping" indices and true otherwise.               */
-/* "Overlapping" indices are two+ valid indices that specify   */
-/* the same offset within the tensor.                          */
-/* The function does this by checking for a sufficient but not */
-/* necessary condition of no overlap. In particular, that      */
-/* that there exists an ordering of the tensor's dimensions    */
-/* that is nicely "nested," with each dimension contained      */
-/* within the next one.                                        */
-bool THCTensor_maybeOverlappingIndices(THCState* state, const THCTensor* t) {
-  /* Extract size/stride arrays; only consider size >1 dims. */
-  SizeAndStride info[MAX_CUTORCH_DIMS];
-
-  int dims = THCTensor_nDimensionLegacyAll(state, t);
-  int nonSize1Dims = 0;
-  for (int i = 0; i < dims; ++i) {
-    int64_t size = THCTensor_sizeLegacyNoScalars(state, t, i);
-
-    if (size > 1) {
-      info[nonSize1Dims].size = size;
-      info[nonSize1Dims].stride =
-        THCTensor_stride(state, t, i);
-
-      if (info[nonSize1Dims].stride < 1) {
-        return true;
-      }
-
-      ++nonSize1Dims;
-    }
-  }
-
-  /* Short-circuits if tensor is a single element.             */
-  if (nonSize1Dims == 0) {
-    return false;
-  }
-
-  /* Ascending order (innermost dimension in sorted view is at [0]) */
-  qsort(info, nonSize1Dims, sizeof(SizeAndStride), compareSizeAndStride);
-
-  for (int i = 0; i < (nonSize1Dims - 1); ++i) {
-    if (((info[i].size - 1) * info[i].stride) >= info[i + 1].stride) {
-      return true;
-    }
-  }
-
-  return false;
-}
diff --git a/aten/src/THC/THCTensor.hpp b/aten/src/THC/THCTensor.hpp
@@ -110,12 +110,6 @@ TORCH_CUDA_CU_API void THCTensor_preserveReduceDimSemantics(
     int in_dims,
     int64_t dimension,
     int keepdim);
-/* Returns false if there is no possibility that the tensor    */
-/* has more than one index that references the same datapoint, */
-/* true otherwise.                                             */
-TORCH_CUDA_CU_API bool THCTensor_maybeOverlappingIndices(
-    THCState* state,
-    const THCTensor* t);
 
 #include <THC/generic/THCTensor.hpp>
 #include <THC/THCGenerateAllTypes.h>
diff --git a/aten/src/THC/THCTensorCopy.cu b/aten/src/THC/THCTensorCopy.cu
@@ -1,4 +1,4 @@
-#include <THC/THCTensorTypeUtils.cuh>
+#include <THC/THCTensor.hpp>
 #include <THC/THCTensorCopy.h>
 #include <THC/THCTensorCopy.hpp>
 
diff --git a/aten/src/THC/THCTensorInfo.cuh b/aten/src/THC/THCTensorInfo.cuh
diff --git a/aten/src/THC/THCTensorTypeUtils.cuh b/aten/src/THC/THCTensorTypeUtils.cuh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <THC/THCTensorTypeUtils.cuh>`
	`1`	`+#include <THC/THCTensor.hpp>`
`2`	`2`	`#include <THC/THCTensorCopy.h>`
`3`	`3`	`#include <THC/THCTensorCopy.hpp>`
`4`	`4`