merge to upstream

Author: SteveBronder

stan/math/opencl/matrix_cl.hpp

@@ -518,13 +518,14 @@ class matrix_cl : public matrix_cl_base {
     for (std::size_t i = 0; i < write_events_size; ++i) {
       read_write_events[i] = read_events_vec[i];
     }
-    for (std::size_t i = write_events_size, j = 0; i < read_write_size; ++i, ++j) {
+    for (std::size_t i = write_events_size, j = 0; i < read_write_size;
+         ++i, ++j) {
       read_write_events[i] = write_events_vec[j];
     }
     try {
-      opencl_context.queue().enqueueFillBuffer(
-          buffer_cl_, static_cast<T>(0), 0, sizeof(T) * this->size(),
-          &read_write_events, &zero_event);
+      opencl_context.queue().enqueueFillBuffer(buffer_cl_, static_cast<T>(0), 0,
+                                               sizeof(T) * this->size(),
+                                               &read_write_events, &zero_event);
     } catch (const cl::Error& e) {
       check_opencl_error("setZero", e);
     }

stan/math/rev/core/var.hpp

@@ -390,8 +390,6 @@ class var_value<T, internal::require_matrix_var_value<T>> {
     reverse_pass_callback(
         [this_vi = this->vi_, other_vi = other.vi_]() mutable {
           other_vi->adj_ += this_vi->adj_;
-          // Reset the adjoint for `this` to replicate SoA before assignment
-          this_vi->adj_.setZero();
         });
   }
 

test/unit/math/rev/core/var_test.cpp

@@ -960,8 +960,7 @@ TEST_F(AgradRev, assign_nan_matvar) {
   EXPECT_MATRIX_EQ(z_ans_adj, z.adj());
 }
 
-
-TEST_F(AgradRev, assign_nullptr_vari) {
+TEST_F(AgradRev, assign_nullptr_var) {
   using stan::math::var_value;
   using var_vector = var_value<Eigen::Matrix<double, -1, 1>>;
   using stan::math::var;
@@ -980,6 +979,5 @@ TEST_F(AgradRev, assign_nullptr_vari) {
     x_ans_adj(i) = -(i + 0.1);
   }
   EXPECT_MATRIX_EQ(x.adj(), x_ans_adj);
-  Eigen::VectorXd y_ans_adj = Eigen::VectorXd::Zero(10);
-  EXPECT_MATRIX_EQ(y_ans_adj, y.adj());
+  EXPECT_MATRIX_EQ(x_ans_adj, y.adj());
 }