Move WrapDimMinimal to c10

Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/14793

Reviewed By: ezyang

Differential Revision: D13336841

fbshipit-source-id: 4365a799e1856cc68dd94a273e97663fee5f51db

diff --git a/aten/src/ATen/WrapDimUtils.h b/aten/src/ATen/WrapDimUtils.h
index b2299d5..6c39cc2 100644 (file)
--- a/aten/src/ATen/WrapDimUtils.h
+++ b/aten/src/ATen/WrapDimUtils.h
@@ -5,6 +5,10 @@
 
 namespace at {
 
+static inline int64_t maybe_wrap_dim(int64_t dim, int64_t dim_post_expr, bool wrap_scalar=true) {
+  return c10::maybe_wrap_dim(dim, dim_post_expr, wrap_scalar);
+}
+
 static inline int64_t maybe_wrap_dim(int64_t dim, TensorImpl *tensor) {
   return maybe_wrap_dim(dim, tensor->dim());
 }

diff --git a/aten/src/ATen/core/TensorImpl.cpp b/aten/src/ATen/core/TensorImpl.cpp
index 7b5ab38..95fe517 100644 (file)
--- a/aten/src/ATen/core/TensorImpl.cpp
+++ b/aten/src/ATen/core/TensorImpl.cpp
@@ -1,7 +1,7 @@
 #include <ATen/core/TensorImpl.h>
 
 #include <c10/core/Backend.h>
-#include <ATen/core/WrapDimMinimal.h>
+#include <c10/core/WrapDimMinimal.h>
 #include <c10/util/Optional.h>
 
 namespace at {

diff --git a/aten/src/ATen/core/WrapDimMinimal.h b/aten/src/ATen/core/WrapDimMinimal.h
index ee793c9..17f295e 100644 (file)
--- a/aten/src/ATen/core/WrapDimMinimal.h
+++ b/aten/src/ATen/core/WrapDimMinimal.h
@@ -1,23 +1 @@
-#pragma once
-
-#include <c10/util/Exception.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;
-}
-
-}
+#include <c10/core/WrapDimMinimal.h>

diff --git a/c10/core/WrapDimMinimal.h b/c10/core/WrapDimMinimal.h
new file mode 100644 (file)
index 0000000..bebd24a
--- /dev/null
+++ b/c10/core/WrapDimMinimal.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <c10/util/Exception.h>
+
+namespace c10 {
+
+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;
+}
+
+}