From a0d4afb11317e70e55ba7a40e297c0cafa8a6fed Mon Sep 17 00:00:00 2001 From: Steve Bronder Date: Thu, 10 Aug 2023 15:59:38 -0400 Subject: [PATCH 1/2] update opencl assign test after recover_memory() to reinstantiate the size 0 matrix of vars --- src/test/unit/model/indexing/assign_cl_test.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/test/unit/model/indexing/assign_cl_test.cpp b/src/test/unit/model/indexing/assign_cl_test.cpp index 17222e6897c..51d4aecd434 100644 --- a/src/test/unit/model/indexing/assign_cl_test.cpp +++ b/src/test/unit/model/indexing/assign_cl_test.cpp @@ -101,18 +101,16 @@ TEST(ModelIndexing, assign_opencl_vector_1d) { set_adjoints1(m1_v_cl); stan::math::grad(); - EXPECT_MATRIX_EQ(m1_v1.adj(), stan::math::from_matrix_cl(m1_v_cl.adj())); EXPECT_MATRIX_EQ(m1_v1.val(), stan::math::from_matrix_cl(m1_v_cl.val())); - + EXPECT_THROW(assign(m1_v_cl, m_err, "double err1", index_cl), std::invalid_argument); EXPECT_ANY_THROW(assign(m_empty_v_cl, rvalue(m2_cl, "rvalue double cl", index_cl), "double cl index err", index_cl)); - stan::math::recover_memory(); // rev = rev @@ -136,9 +134,7 @@ TEST(ModelIndexing, assign_opencl_vector_1d) { set_adjoints2(m2_v1); set_adjoints1(m1_v_cl); set_adjoints2(m2_v_cl); - stan::math::grad(); - EXPECT_MATRIX_EQ(m1_v1.adj(), stan::math::from_matrix_cl(m1_v_cl.adj())); EXPECT_MATRIX_EQ(m2_v1.adj(), @@ -151,10 +147,10 @@ TEST(ModelIndexing, assign_opencl_vector_1d) { stan::math::var_value> m_v_err = m_err; EXPECT_THROW(assign(m1_v_cl, m_v_err, "double err2", index_cl), std::invalid_argument); + m_empty_v_cl = stan::math::matrix_cl(0, 1); EXPECT_ANY_THROW(assign(m_empty_v_cl, - rvalue(m2_v_cl, "rvalue double cl", index_cl), - "double cl index err", index_cl)); - + rvalue(m2_v_cl, "rvalue var cl", index_cl), + "var cl index err", index_cl)); stan::math::recover_memory(); }, indices); From 9432d32380f56c939d6999d457c74aaff2069a35 Mon Sep 17 00:00:00 2001 From: Stan Jenkins Date: Thu, 10 Aug 2023 16:07:27 -0400 Subject: [PATCH 2/2] [Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1 --- src/test/unit/model/indexing/assign_cl_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/unit/model/indexing/assign_cl_test.cpp b/src/test/unit/model/indexing/assign_cl_test.cpp index 51d4aecd434..b11be100dea 100644 --- a/src/test/unit/model/indexing/assign_cl_test.cpp +++ b/src/test/unit/model/indexing/assign_cl_test.cpp @@ -105,7 +105,7 @@ TEST(ModelIndexing, assign_opencl_vector_1d) { stan::math::from_matrix_cl(m1_v_cl.adj())); EXPECT_MATRIX_EQ(m1_v1.val(), stan::math::from_matrix_cl(m1_v_cl.val())); - + EXPECT_THROW(assign(m1_v_cl, m_err, "double err1", index_cl), std::invalid_argument); EXPECT_ANY_THROW(assign(m_empty_v_cl, @@ -147,7 +147,7 @@ TEST(ModelIndexing, assign_opencl_vector_1d) { stan::math::var_value> m_v_err = m_err; EXPECT_THROW(assign(m1_v_cl, m_v_err, "double err2", index_cl), std::invalid_argument); - m_empty_v_cl = stan::math::matrix_cl(0, 1); + m_empty_v_cl = stan::math::matrix_cl(0, 1); EXPECT_ANY_THROW(assign(m_empty_v_cl, rvalue(m2_v_cl, "rvalue var cl", index_cl), "var cl index err", index_cl));