Treat Scalar parameter as if it is constant

wxie · wxie · commit eed8bbd450e1 · 2021-03-11T22:36:38.000-08:00
Pull Request resolved: #53582 We will pass `Scalar` by reference in the following commit, i.e. `const Scalar&`. ghstack-source-id: 123755068 Differential Revision: [D26904444](https://our.internmc.facebook.com/intern/diff/D26904444/)
diff --git a/aten/src/ATen/native/LinearAlgebra.cpp b/aten/src/ATen/native/LinearAlgebra.cpp
@@ -601,9 +601,10 @@ static void addbmm_impl_(
     return;
   }
 
+  auto adjusted_beta(beta);
   for (int64_t batch = 0; batch < num_batches; ++batch) {
-    result.addmm_(batch1[batch], batch2[batch], beta, alpha);
-    beta = 1; // accumulate output once
+    result.addmm_(batch1[batch], batch2[batch], adjusted_beta, alpha);
+    adjusted_beta = 1; // accumulate output once
   }
 }
 
diff --git a/aten/src/ATen/native/Pow.cpp b/aten/src/ATen/native/Pow.cpp
@@ -105,8 +105,8 @@ Tensor& float_power_out(Tensor& result, const Tensor& base, Scalar exp) {
 
   // Note: need the casts inside the ternary because conversion functions return e.g. c10::complex,
   // which causes a complex scalar to always be returned.
-  exp = (dtype == at::kComplexDouble) ? Scalar(exp.toComplexDouble()) : Scalar(exp.toDouble());
-  return at::pow_out(result, base.to(dtype), exp);
+  auto casted_exp = (dtype == at::kComplexDouble) ? Scalar(exp.toComplexDouble()) : Scalar(exp.toDouble());
+  return at::pow_out(result, base.to(dtype), casted_exp);
 }
 
 Tensor& float_power_out(Tensor& result, Scalar base, const Tensor& exp) {
@@ -115,20 +115,20 @@ Tensor& float_power_out(Tensor& result, Scalar base, const Tensor& exp) {
               "the output given to float_power has dtype ", result.scalar_type(),
               " but the operation's result requires dtype ", dtype);
 
-  base = (dtype == at::kComplexDouble) ? Scalar(base.toComplexDouble()) : Scalar(base.toDouble());
-  return at::pow_out(result, base, exp.to(dtype));
+  auto casted_base = (dtype == at::kComplexDouble) ? Scalar(base.toComplexDouble()) : Scalar(base.toDouble());
+  return at::pow_out(result, casted_base, exp.to(dtype));
 }
 
 Tensor float_power(const Tensor& base, Scalar exp) {
   auto dtype = (at::isComplexType(base.scalar_type()) || exp.isComplex()) ? at::kComplexDouble : at::kDouble;
-  exp = (dtype == at::kComplexDouble) ? Scalar(exp.toComplexDouble()) : Scalar(exp.toDouble());
-  return at::pow(base.to(dtype), exp);
+  auto casted_exp = (dtype == at::kComplexDouble) ? Scalar(exp.toComplexDouble()) : Scalar(exp.toDouble());
+  return at::pow(base.to(dtype), casted_exp);
 }
 
 Tensor float_power(Scalar base, const Tensor& exp) {
   auto dtype = (at::isComplexType(exp.scalar_type()) || base.isComplex()) ? at::kComplexDouble : at::kDouble;
-  base = (dtype == at::kComplexDouble) ? Scalar(base.toComplexDouble()) : Scalar(base.toDouble());
-  return at::pow(base, exp.to(dtype));
+  auto casted_base = (dtype == at::kComplexDouble) ? Scalar(base.toComplexDouble()) : Scalar(base.toDouble());
+  return at::pow(casted_base, exp.to(dtype));
 }
 
 Tensor float_power(const Tensor& base, const Tensor& exp) {
@@ -151,8 +151,8 @@ Tensor& float_power_(Tensor& base, Scalar exp) {
               "the base given to float_power_ has dtype ", base.scalar_type(),
               " but the operation's result requires dtype ", dtype);
 
-  exp = (dtype == at::kComplexDouble) ? Scalar(exp.toComplexDouble()) : Scalar(exp.toDouble());
-  return base.pow_(exp);
+  auto casted_exp = (dtype == at::kComplexDouble) ? Scalar(exp.toComplexDouble()) : Scalar(exp.toDouble());
+  return base.pow_(casted_exp);
 }
 
 } // namespace native
diff --git a/aten/src/ATen/native/TensorFactories.cpp b/aten/src/ATen/native/TensorFactories.cpp
@@ -45,16 +45,6 @@ void window_function_checks(
       window_length);
 }
 
-// bool inputs are considered integral
-static inline bool allIntegral(std::initializer_list<std::reference_wrapper<Scalar>> l) {
-  for (Scalar& s : l) {
-    if (!s.isIntegral(true)) {
-      return false;
-    }
-  }
-  return true;
-}
-
 } // namespace
 
 DEFINE_DISPATCH(complex_stub);
@@ -75,7 +65,12 @@ Tensor arange(
     Scalar end,
     Scalar step,
     const TensorOptions& options) {
-  bool set_to_integral_dtype = !options.has_dtype() && allIntegral({start, end, step});
+  bool set_to_integral_dtype = !options.has_dtype() &&
+       // bool inputs are considered integral
+       start.isIntegral(true) &&
+       end.isIntegral(true) &&
+       step.isIntegral(true);
+
   Tensor result = set_to_integral_dtype
       ? at::empty({0}, options.dtype(at::ScalarType::Long))
       : at::empty({0}, options);

Original file line number	Diff line number	Diff line change
`@@ -601,9 +601,10 @@ static void addbmm_impl_(`
`601`	`601`	`return;`
`602`	`602`	`}`
`603`	`603`
	`604`	`+ auto adjusted_beta(beta);`
`604`	`605`	`for (int64_t batch = 0; batch < num_batches; ++batch) {`
`605`		`- result.addmm_(batch1[batch], batch2[batch], beta, alpha);`
`606`		`- beta = 1; // accumulate output once`
	`606`	`+ result.addmm_(batch1[batch], batch2[batch], adjusted_beta, alpha);`
	`607`	`+ adjusted_beta = 1; // accumulate output once`
`607`	`608`	`}`
`608`	`609`	`}`
`609`	`610`