fixed negative dims

Author: rusty1s

csrc/cpu/scatter_cpu.cpp

@@ -17,9 +17,6 @@ scatter_cpu(torch::Tensor src, torch::Tensor index, int64_t dim,
   for (auto i = 0; i < index.dim() - 1; i++)
     CHECK_INPUT(src.size(i) >= index.size(i));
 
-  if (dim < 0)
-    dim = src.dim() + dim;
-
   src = src.contiguous();
 
   torch::Tensor out;

csrc/cuda/scatter_cuda.cu

@@ -69,9 +69,6 @@ scatter_cuda(torch::Tensor src, torch::Tensor index, int64_t dim,
   for (auto i = 0; i < index.dim() - 1; i++)
     CHECK_INPUT(src.size(i) >= index.size(i));
 
-  if (dim < 0)
-    dim = src.dim() + dim;
-
   src = src.contiguous();
 
   torch::Tensor out;

csrc/scatter.cpp

@@ -8,8 +8,6 @@
 #endif
 
 torch::Tensor broadcast(torch::Tensor src, torch::Tensor other, int64_t dim) {
-  if (dim < 0)
-    dim = other.dim() + dim;
   if (src.dim() == 1)
     for (auto i = 0; i < dim; i++)
       src = src.unsqueeze(0);
@@ -43,6 +41,7 @@ class ScatterSum : public torch::autograd::Function<ScatterSum> {
                                Variable index, int64_t dim,
                                torch::optional<Variable> optional_out,
                                torch::optional<int64_t> dim_size) {
+    dim = dim < 0 ? src.dim() + dim : dim;
     ctx->saved_data["dim"] = dim;
     ctx->saved_data["src_shape"] = src.sizes();
     index = broadcast(index, src, dim);
@@ -116,6 +115,7 @@ class ScatterMin : public torch::autograd::Function<ScatterMin> {
                                Variable index, int64_t dim,
                                torch::optional<Variable> optional_out,
                                torch::optional<int64_t> dim_size) {
+    dim = dim < 0 ? src.dim() + dim : dim;
     ctx->saved_data["dim"] = dim;
     ctx->saved_data["src_shape"] = src.sizes();
 
@@ -151,6 +151,7 @@ class ScatterMax : public torch::autograd::Function<ScatterMax> {
                                Variable index, int64_t dim,
                                torch::optional<Variable> optional_out,
                                torch::optional<int64_t> dim_size) {
+    dim = dim < 0 ? src.dim() + dim : dim;
     ctx->saved_data["dim"] = dim;
     ctx->saved_data["src_shape"] = src.sizes();