Merge branch 'kg_cast' of https://github.com/bstatcomp/math into kg_cast

t4c1 · t4c1 · commit 3962c69fd35e · 2021-04-16T13:25:45.000+02:00
diff --git a/stan/math/opencl/kernel_generator/cast.hpp b/stan/math/opencl/kernel_generator/cast.hpp
@@ -89,8 +89,7 @@ inline auto cast(T&& a) {
  * @param a input argument
  * @return Typecast of given expression
  */
-template <typename Scalar, typename T,
-          require_stan_scalar_t<T>* = nullptr>
+template <typename Scalar, typename T, require_stan_scalar_t<T>* = nullptr>
 inline Scalar cast(T a) {
   return a;
 }
diff --git a/stan/math/opencl/prim/cauchy_cdf.hpp b/stan/math/opencl/prim/cauchy_cdf.hpp
@@ -63,8 +63,7 @@ return_type_t<T_y_cl, T_loc_cl, T_scale_cl> cauchy_cdf(
       = check_cl(function, "Scale parameter", sigma_val, "positive finite");
   auto sigma_positive_finite_expr = 0 < sigma_val && isfinite(sigma_val);
 
-  auto any_y_neg_inf
-      = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
+  auto any_y_neg_inf = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
   auto cond = y_val == INFTY;
   auto sigma_inv = elt_divide(1.0, sigma_val);
   auto z = elt_multiply(y_val - mu_val, sigma_inv);
diff --git a/stan/math/opencl/prim/exp_mod_normal_cdf.hpp b/stan/math/opencl/prim/exp_mod_normal_cdf.hpp
@@ -72,8 +72,7 @@ return_type_t<T_y_cl, T_loc_cl, T_scale_cl, T_inv_scale_cl> exp_mod_normal_cdf(
       = check_cl(function, "Inv_cale parameter", lambda_val, "positive finite");
   auto lambda_positive_finite_expr = 0 < lambda_val && isfinite(lambda_val);
 
-  auto any_y_neg_inf
-      = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
+  auto any_y_neg_inf = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
   auto inv_sigma = elt_divide(1.0, sigma_val);
   auto diff = y_val - mu_val;
   auto v = elt_multiply(lambda_val, sigma_val);
diff --git a/stan/math/opencl/prim/exp_mod_normal_lccdf.hpp b/stan/math/opencl/prim/exp_mod_normal_lccdf.hpp
@@ -73,8 +73,7 @@ exp_mod_normal_lccdf(const T_y_cl& y, const T_loc_cl& mu,
       = check_cl(function, "Inv_cale parameter", lambda_val, "positive finite");
   auto lambda_positive_finite_expr = 0 < lambda_val && isfinite(lambda_val);
 
-  auto any_y_neg_inf
-      = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
+  auto any_y_neg_inf = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
   auto any_y_pos_inf = colwise_max(cast<char>(y_val == INFTY));
   auto inv_sigma = elt_divide(1.0, sigma_val);
   auto diff = y_val - mu_val;
diff --git a/stan/math/opencl/prim/exp_mod_normal_lcdf.hpp b/stan/math/opencl/prim/exp_mod_normal_lcdf.hpp
@@ -73,8 +73,7 @@ return_type_t<T_y_cl, T_loc_cl, T_scale_cl, T_inv_scale_cl> exp_mod_normal_lcdf(
       = check_cl(function, "Inv_cale parameter", lambda_val, "positive finite");
   auto lambda_positive_finite_expr = 0 < lambda_val && isfinite(lambda_val);
 
-  auto any_y_neg_inf
-      = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
+  auto any_y_neg_inf = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
   auto any_y_pos_inf = colwise_max(cast<char>(y_val == INFTY));
   auto sigma_inv = elt_divide(1.0, sigma_val);
   auto diff = y_val - mu_val;
diff --git a/stan/math/opencl/prim/logistic_cdf.hpp b/stan/math/opencl/prim/logistic_cdf.hpp
@@ -63,8 +63,7 @@ return_type_t<T_y_cl, T_loc_cl, T_scale_cl> logistic_cdf(
       = check_cl(function, "Scale parameter", sigma_val, "positive finite");
   auto sigma_positive_finite_expr = 0 < sigma_val && isfinite(sigma_val);
 
-  auto any_y_neg_inf
-      = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
+  auto any_y_neg_inf = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
   auto cond = y_val == INFTY;
   auto inv_sigma = elt_divide(1.0, sigma_val);
   auto mu_minus_y_div_sigma = elt_multiply(mu_val - y_val, inv_sigma);
diff --git a/stan/math/opencl/prim/logistic_lccdf.hpp b/stan/math/opencl/prim/logistic_lccdf.hpp
@@ -63,8 +63,7 @@ return_type_t<T_y_cl, T_loc_cl, T_scale_cl> logistic_lccdf(
       = check_cl(function, "Scale parameter", sigma_val, "positive finite");
   auto sigma_positive_finite_expr = 0 < sigma_val && isfinite(sigma_val);
 
-  auto any_y_neg_inf
-      = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
+  auto any_y_neg_inf = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
   auto any_y_pos_inf = colwise_max(cast<char>(y_val == INFTY));
   auto inv_sigma = elt_divide(1.0, sigma_val);
   auto mu_minus_y_div_sigma = elt_multiply(mu_val - y_val, inv_sigma);
diff --git a/stan/math/opencl/prim/logistic_lcdf.hpp b/stan/math/opencl/prim/logistic_lcdf.hpp
@@ -63,8 +63,7 @@ return_type_t<T_y_cl, T_loc_cl, T_scale_cl> logistic_lcdf(
       = check_cl(function, "Scale parameter", sigma_val, "positive finite");
   auto sigma_positive_finite_expr = 0 < sigma_val && isfinite(sigma_val);
 
-  auto any_y_neg_inf
-      = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
+  auto any_y_neg_inf = colwise_max(cast<char>(y_val == NEGATIVE_INFTY));
   auto cond = y_val == INFTY;
   auto inv_sigma = elt_divide(1.0, sigma_val);
   auto mu_minus_y_div_sigma = elt_multiply(mu_val - y_val, inv_sigma);
diff --git a/stan/math/opencl/prim/pareto_cdf.hpp b/stan/math/opencl/prim/pareto_cdf.hpp
@@ -62,8 +62,7 @@ return_type_t<T_y_cl, T_scale_cl, T_shape_cl> pareto_cdf(
       = check_cl(function, "Shape parameter", alpha_val, "positive finite");
   auto alpha_positive_finite_expr = 0 < alpha_val && isfinite(alpha_val);
 
-  auto any_y_lower_than_y_min
-      = colwise_max(cast<char>(y_val < y_min_val));
+  auto any_y_lower_than_y_min = colwise_max(cast<char>(y_val < y_min_val));
   auto cond = y_val == INFTY;
   auto log_dbl = log(elt_divide(y_min_val, y_val));
   auto y_min_inv = elt_divide(1.0, y_min_val);
diff --git a/stan/math/opencl/prim/pareto_lccdf.hpp b/stan/math/opencl/prim/pareto_lccdf.hpp
@@ -63,8 +63,7 @@ return_type_t<T_y_cl, T_scale_cl, T_shape_cl> pareto_lccdf(
       = check_cl(function, "Shape parameter", alpha_val, "positive finite");
   auto alpha_positive_finite_expr = 0 < alpha_val && isfinite(alpha_val);
 
-  auto any_y_lower_than_y_min
-      = colwise_max(cast<char>(y_val < y_min_val));
+  auto any_y_lower_than_y_min = colwise_max(cast<char>(y_val < y_min_val));
   auto any_y_inf = colwise_max(cast<char>(isinf(y_val)));
 
   auto log_quot = log(elt_divide(y_min_val, y_val));
diff --git a/stan/math/opencl/prim/pareto_lcdf.hpp b/stan/math/opencl/prim/pareto_lcdf.hpp
@@ -63,8 +63,7 @@ return_type_t<T_y_cl, T_scale_cl, T_shape_cl> pareto_lcdf(
       = check_cl(function, "Shape parameter", alpha_val, "positive finite");
   auto alpha_positive_finite_expr = 0 < alpha_val && isfinite(alpha_val);
 
-  auto any_y_lower_than_y_min
-      = colwise_max(cast<char>(y_val < y_min_val));
+  auto any_y_lower_than_y_min = colwise_max(cast<char>(y_val < y_min_val));
   auto any_y_inf = colwise_max(cast<char>(isinf(y_val)));
 
   auto log_quot = log(elt_divide(y_min_val, y_val));
diff --git a/stan/math/opencl/prim/poisson_log_lpmf.hpp b/stan/math/opencl/prim/poisson_log_lpmf.hpp
@@ -60,8 +60,8 @@ return_type_t<T_log_rate_cl> poisson_log_lpmf(const T_n_cl& n,
       = check_cl(function, "Log rate parameter", alpha_val, "not nan");
   auto alpha_not_nan = !isnan(alpha_val);
 
-  auto return_log_zero = colwise_max(
-      cast<char>(isinf(alpha_val) && (alpha_val > 0 || n != 0)));
+  auto return_log_zero
+      = colwise_max(cast<char>(isinf(alpha_val) && (alpha_val > 0 || n != 0)));
   auto exp_alpha = exp(alpha_val);
 
   auto logp1 = elt_multiply(n, alpha_val);
diff --git a/stan/math/opencl/prim/poisson_lpmf.hpp b/stan/math/opencl/prim/poisson_lpmf.hpp
@@ -60,7 +60,7 @@ return_type_t<T_rate_cl> poisson_lpmf(const T_n_cl& n,
   auto lambda_nonnegative = 0.0 <= lambda_val;
 
   auto return_log_zero = colwise_max(
-      cast<char> (isinf(lambda_val) || (lambda_val == 0 && n != 0)));
+      cast<char>(isinf(lambda_val) || (lambda_val == 0 && n != 0)));
 
   auto logp1 = multiply_log(n, lambda_val);
   auto logp2 = static_select<include_summand<propto, T_rate_cl>::value>(
diff --git a/stan/math/opencl/prim/uniform_cdf.hpp b/stan/math/opencl/prim/uniform_cdf.hpp
@@ -68,8 +68,8 @@ return_type_t<T_y_cl, T_low_cl, T_high_cl> uniform_cdf(const T_y_cl& y,
       "positive");
   auto diff_positive_expr = b_minus_a > 0.0;
 
-  auto any_y_out_of_bounds = colwise_max(
-      cast<char>(y_val < alpha_val || y_val > beta_val));
+  auto any_y_out_of_bounds
+      = colwise_max(cast<char>(y_val < alpha_val || y_val > beta_val));
   auto cdf_n = elt_divide(y_val - alpha_val, b_minus_a);
   auto cdf_expr = colwise_prod(cdf_n);
 
diff --git a/stan/math/opencl/prim/uniform_lccdf.hpp b/stan/math/opencl/prim/uniform_lccdf.hpp
@@ -67,8 +67,8 @@ return_type_t<T_y_cl, T_low_cl, T_high_cl> uniform_lccdf(
       "positive");
   auto diff_positive_expr = b_minus_a > 0.0;
 
-  auto any_y_out_of_bounds = colwise_max(
-      cast<char>(y_val < alpha_val || y_val > beta_val));
+  auto any_y_out_of_bounds
+      = colwise_max(cast<char>(y_val < alpha_val || y_val > beta_val));
   auto y_minus_alpha = y_val - alpha_val;
   auto ccdf_n = 1.0 - elt_divide(y_minus_alpha, b_minus_a);
   auto lccdf_expr = colwise_sum(log(ccdf_n));
diff --git a/stan/math/opencl/prim/uniform_lcdf.hpp b/stan/math/opencl/prim/uniform_lcdf.hpp
@@ -68,8 +68,8 @@ return_type_t<T_y_cl, T_low_cl, T_high_cl> uniform_lcdf(const T_y_cl& y,
       "positive");
   auto diff_positive_expr = b_minus_a > 0.0;
 
-  auto any_y_out_of_bounds = colwise_max(
-      cast<char> (y_val < alpha_val || y_val > beta_val));
+  auto any_y_out_of_bounds
+      = colwise_max(cast<char>(y_val < alpha_val || y_val > beta_val));
   auto y_minus_alpha = y_val - alpha_val;
   auto cdf_n = elt_divide(y_minus_alpha, b_minus_a);
   auto lcdf_expr = colwise_sum(log(cdf_n));
diff --git a/stan/math/opencl/prim/uniform_lpdf.hpp b/stan/math/opencl/prim/uniform_lpdf.hpp
@@ -81,7 +81,8 @@ inline return_type_t<T_y_cl, T_low_cl, T_high_cl> uniform_lpdf(
       function, "Difference between upper and lower bound", diff, "positive");
   auto diff_positive = diff > 0;
 
-  auto y_out_of_bounds = colwise_max(cast<char>(y_val < alpha_val || beta_val < y_val));
+  auto y_out_of_bounds
+      = colwise_max(cast<char>(y_val < alpha_val || beta_val < y_val));
 
   auto logp_expr = colwise_sum(
       static_select<include_summand<propto, T_low_cl, T_high_cl>::value>(
diff --git a/stan/math/opencl/prim/weibull_lpdf.hpp b/stan/math/opencl/prim/weibull_lpdf.hpp
@@ -66,7 +66,7 @@ inline return_type_t<T_y_cl, T_shape_cl, T_scale_cl> weibull_lpdf(
       = check_cl(function, "Scale parameter", sigma_val, "positive finite");
   auto sigma_positive_finite = isfinite(sigma_val) && 0 < sigma_val;
 
-  auto any_y_negative = colwise_max(cast<char> (y_val < 0));
+  auto any_y_negative = colwise_max(cast<char>(y_val < 0));
   auto log_y = log(y_val);
   auto log_sigma = log(sigma_val);
   auto inv_sigma = elt_divide(1., sigma_val);
diff --git a/test/unit/math/opencl/kernel_generator/cast_test.cpp b/test/unit/math/opencl/kernel_generator/cast_test.cpp
@@ -65,6 +65,4 @@ TEST(KernelGenerator, cast_multiple_operations_lvalue) {
   EXPECT_MATRIX_NEAR(res, correct, 1e-9);
 }
 
-
-
 #endif
