Move minimal wrapdim functionality to core, remove THTensor include i… (pytorch#11283)

Summary:
…n TensorImpl.
Pull Request resolved: pytorch#11283

Reviewed By: ezyang

Differential Revision: D9660015

Pulled By: gchanan

fbshipit-source-id: 263cba226d9ee981d55281c94e6fda5842a46b02

Author: gchanan

aten/src/ATen/TensorImpl.cpp

@@ -5,11 +5,10 @@
 #include <ATen/core/optional.h>
 #include <ATen/Context.h>
 #include <ATen/core/Backend.h>
+#include <ATen/core/WrapDimMinimal.h>
 
 #include <ATen/detail/VariableHooksInterface.h>
 
-#include <TH/THTensor.hpp>
-
 namespace at {
 
 Type& TensorImpl::type() const {

aten/src/ATen/WrapDimUtils.h

@@ -1,30 +1,10 @@
 #pragma once
 
+#include "ATen/core/WrapDimMinimal.h"
 #include "ATen/TensorImpl.h"
-#include <sstream>
 
 namespace at {
 
-static inline int64_t maybe_wrap_dim(int64_t dim, int64_t dim_post_expr, bool wrap_scalar=true) {
-  if (dim_post_expr <= 0) {
-    if (!wrap_scalar) {
-      std::ostringstream oss;
-      oss << "dimension specified as " << dim << " but tensor has no dimensions";
-      throw std::runtime_error(oss.str());
-    }
-    dim_post_expr = 1; // this will make range [-1, 0]
-  }
-
-  int64_t min = -dim_post_expr;
-  int64_t max = dim_post_expr - 1;
-  AT_CHECK(
-      dim >= min && dim <= max,
-      "Dimension out of range (expected to be in range of [",
-      min, ", ", max, "], but got ", dim, ")");
-  if (dim < 0) dim += dim_post_expr;
-  return dim;
-}
-
 static inline int64_t maybe_wrap_dim(int64_t dim, TensorImpl *tensor) {
   return maybe_wrap_dim(dim, tensor->dim());
 }

aten/src/ATen/core/WrapDimMinimal.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "ATen/core/Error.h"
+
+namespace at {
+
+static inline int64_t maybe_wrap_dim(int64_t dim, int64_t dim_post_expr, bool wrap_scalar=true) {
+  if (dim_post_expr <= 0) {
+    AT_CHECK(wrap_scalar, "dimension specified as ", dim, " but tensor has no dimensions");
+    dim_post_expr = 1; // this will make range [-1, 0]
+  }
+
+  int64_t min = -dim_post_expr;
+  int64_t max = dim_post_expr - 1;
+  AT_CHECK(
+      dim >= min && dim <= max,
+      "Dimension out of range (expected to be in range of [",
+      min, ", ", max, "], but got ", dim, ")");
+  if (dim < 0) dim += dim_post_expr;
+  return dim;
+}
+
+}

aten/src/ATen/test/native_test.cpp

@@ -6,6 +6,8 @@
 
 using namespace at;
 
+using Catch::Matchers::StartsWith;
+
 #define REQUIRE_EQUAL(t1, t2) \
   REQUIRE(t1.equal(t2));
 
@@ -73,10 +75,10 @@ void test(Type & T, Type & AccT) {
 
   SECTION( "size / stride" ) {
     auto scalar = randn({}, T);
-		REQUIRE_THROWS_WITH(scalar.size(0), "dimension specified as 0 but tensor has no dimensions");
-    REQUIRE_THROWS_WITH(scalar.size(-1), "dimension specified as -1 but tensor has no dimensions");
-    REQUIRE_THROWS_WITH(scalar.stride(0), "dimension specified as 0 but tensor has no dimensions");
-    REQUIRE_THROWS_WITH(scalar.stride(-1), "dimension specified as -1 but tensor has no dimensions");
+    REQUIRE_THROWS_WITH(scalar.size(0), StartsWith("dimension specified as 0 but tensor has no dimensions"));
+    REQUIRE_THROWS_WITH(scalar.size(-1), StartsWith("dimension specified as -1 but tensor has no dimensions"));
+    REQUIRE_THROWS_WITH(scalar.stride(0), StartsWith("dimension specified as 0 but tensor has no dimensions"));
+    REQUIRE_THROWS_WITH(scalar.stride(-1), StartsWith("dimension specified as -1 but tensor has no dimensions"));
 
     auto empty = randn({0}, T);
     REQUIRE(empty.size(0) == 0);