Skip to content

Commit b916789

Browse files
SteveBronderSteveBronder
authored
Merge pull request #3246 from stan-dev/fix/cleanup-rev-tests
Have each Rev test cleanup memory after running
2 parents c89ca16 + 28c7048 commit b916789

File tree

225 files changed

+1016
-791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+1016
-791
lines changed

‎test/unit/math/rev/core/accumulate_adjoints_test.cpp‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#include <gtest/gtest.h>
22
#include <stan/math/rev/core.hpp>
33
#include <stan/math.hpp>
4+
#include <test/unit/math/rev/util.hpp>
45
#include <vector>
56

6-
TEST(AgradRev_accumulate_adjoints, zero_args) {
7+
TEST_F(AgradRev, Rev_accumulate_adjoints_zero_args) {
78
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
89
double* ptr = stan::math::accumulate_adjoints(storage.data());
910

@@ -14,7 +15,7 @@ TEST(AgradRev_accumulate_adjoints, zero_args) {
1415
EXPECT_EQ(ptr, storage.data());
1516
}
1617

17-
TEST(AgradRev_accumulate_adjoints, int_arg) {
18+
TEST_F(AgradRev, Rev_accumulate_adjoints_int_arg) {
1819
int arg = 5;
1920
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
2021

@@ -27,7 +28,7 @@ TEST(AgradRev_accumulate_adjoints, int_arg) {
2728
EXPECT_EQ(ptr, storage.data());
2829
}
2930

30-
TEST(AgradRev_accumulate_adjoints, double_arg) {
31+
TEST_F(AgradRev, Rev_accumulate_adjoints_double_arg) {
3132
double arg = 5.0;
3233

3334
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
@@ -40,7 +41,7 @@ TEST(AgradRev_accumulate_adjoints, double_arg) {
4041
EXPECT_EQ(ptr, storage.data());
4142
}
4243

43-
TEST(AgradRev_accumulate_adjoints, std_vector_int_arg) {
44+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_int_arg) {
4445
std::vector<int> arg(5, 10);
4546

4647
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
@@ -53,7 +54,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_int_arg) {
5354
EXPECT_EQ(ptr, storage.data());
5455
}
5556

56-
TEST(AgradRev_accumulate_adjoints, std_vector_double_arg) {
57+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_double_arg) {
5758
std::vector<double> arg(5, 10.0);
5859

5960
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
@@ -66,7 +67,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_double_arg) {
6667
EXPECT_EQ(ptr, storage.data());
6768
}
6869

69-
TEST(AgradRev_accumulate_adjoints, eigen_vector_arg) {
70+
TEST_F(AgradRev, Rev_accumulate_adjoints_eigen_vector_arg) {
7071
Eigen::VectorXd arg = Eigen::VectorXd::Ones(5);
7172

7273
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
@@ -78,7 +79,7 @@ TEST(AgradRev_accumulate_adjoints, eigen_vector_arg) {
7879
EXPECT_EQ(ptr, storage.data());
7980
}
8081

81-
TEST(AgradRev_accumulate_adjoints, eigen_row_vector_arg) {
82+
TEST_F(AgradRev, Rev_accumulate_adjoints_eigen_row_vector_arg) {
8283
Eigen::RowVectorXd arg = Eigen::RowVectorXd::Ones(5);
8384

8485
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
@@ -91,7 +92,7 @@ TEST(AgradRev_accumulate_adjoints, eigen_row_vector_arg) {
9192
EXPECT_EQ(ptr, storage.data());
9293
}
9394

94-
TEST(AgradRev_accumulate_adjoints, eigen_matrix_arg) {
95+
TEST_F(AgradRev, Rev_accumulate_adjoints_eigen_matrix_arg) {
9596
Eigen::MatrixXd arg = Eigen::MatrixXd::Ones(5, 5);
9697

9798
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
@@ -104,7 +105,7 @@ TEST(AgradRev_accumulate_adjoints, eigen_matrix_arg) {
104105
EXPECT_EQ(ptr, storage.data());
105106
}
106107

107-
TEST(AgradRev_accumulate_adjoints, std_vector_std_vector_double_arg) {
108+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_std_vector_double_arg) {
108109
std::vector<std::vector<double>> arg(5, std::vector<double>(5, 10.0));
109110

110111
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
@@ -117,7 +118,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_std_vector_double_arg) {
117118
EXPECT_EQ(ptr, storage.data());
118119
}
119120

120-
TEST(AgradRev_accumulate_adjoints, std_vector_eigen_vector_arg) {
121+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_eigen_vector_arg) {
121122
std::vector<Eigen::VectorXd> arg(2, Eigen::VectorXd::Ones(5));
122123

123124
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
@@ -130,7 +131,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_eigen_vector_arg) {
130131
EXPECT_EQ(ptr, storage.data());
131132
}
132133

133-
TEST(AgradRev_accumulate_adjoints, std_vector_eigen_row_vector_arg) {
134+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_eigen_row_vector_arg) {
134135
std::vector<Eigen::RowVectorXd> arg(2, Eigen::VectorXd::Ones(5));
135136

136137
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
@@ -143,7 +144,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_eigen_row_vector_arg) {
143144
EXPECT_EQ(ptr, storage.data());
144145
}
145146

146-
TEST(AgradRev_accumulate_adjoints, std_vector_eigen_matrix_arg) {
147+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_eigen_matrix_arg) {
147148
std::vector<Eigen::MatrixXd> arg(2, Eigen::MatrixXd::Ones(5, 3));
148149

149150
Eigen::VectorXd storage = Eigen::VectorXd::Zero(1000);
@@ -156,7 +157,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_eigen_matrix_arg) {
156157
EXPECT_EQ(ptr, storage.data());
157158
}
158159

159-
TEST(AgradRev_accumulate_adjoints, var_arg) {
160+
TEST_F(AgradRev, Rev_accumulate_adjoints_var_arg) {
160161
using stan::math::var;
161162
using stan::math::vari;
162163
var arg(5.0);
@@ -178,7 +179,7 @@ TEST(AgradRev_accumulate_adjoints, var_arg) {
178179
stan::math::recover_memory();
179180
}
180181

181-
TEST(AgradRev_accumulate_adjoints, std_vector_var_arg) {
182+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_var_arg) {
182183
using stan::math::var;
183184
using stan::math::vari;
184185
std::vector<var> arg(5);
@@ -203,7 +204,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_var_arg) {
203204
stan::math::recover_memory();
204205
}
205206

206-
TEST(AgradRev_accumulate_adjoints, eigen_vector_var_arg) {
207+
TEST_F(AgradRev, Rev_accumulate_adjoints_eigen_vector_var_arg) {
207208
using stan::math::var;
208209
using stan::math::vari;
209210
Eigen::Matrix<var, Eigen::Dynamic, 1> arg(5);
@@ -228,7 +229,7 @@ TEST(AgradRev_accumulate_adjoints, eigen_vector_var_arg) {
228229
stan::math::recover_memory();
229230
}
230231

231-
TEST(AgradRev_accumulate_adjoints, eigen_row_vector_var_arg) {
232+
TEST_F(AgradRev, Rev_accumulate_adjoints_eigen_row_vector_var_arg) {
232233
using stan::math::var;
233234
using stan::math::vari;
234235
Eigen::Matrix<var, 1, Eigen::Dynamic> arg(5);
@@ -253,7 +254,7 @@ TEST(AgradRev_accumulate_adjoints, eigen_row_vector_var_arg) {
253254
stan::math::recover_memory();
254255
}
255256

256-
TEST(AgradRev_accumulate_adjoints, eigen_matrix_var_arg) {
257+
TEST_F(AgradRev, Rev_accumulate_adjoints_eigen_matrix_var_arg) {
257258
using stan::math::var;
258259
using stan::math::vari;
259260
Eigen::Matrix<var, Eigen::Dynamic, Eigen::Dynamic> arg(5, 5);
@@ -278,7 +279,7 @@ TEST(AgradRev_accumulate_adjoints, eigen_matrix_var_arg) {
278279
stan::math::recover_memory();
279280
}
280281

281-
TEST(AgradRev_accumulate_adjoints, std_vector_std_vector_var_arg) {
282+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_std_vector_var_arg) {
282283
using stan::math::var;
283284
using stan::math::vari;
284285
std::vector<var> arg_(5, var(5.0));
@@ -302,7 +303,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_std_vector_var_arg) {
302303
stan::math::recover_memory();
303304
}
304305

305-
TEST(AgradRev_accumulate_adjoints, std_vector_eigen_vector_var_arg) {
306+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_eigen_vector_var_arg) {
306307
using stan::math::var;
307308
using stan::math::vari;
308309
Eigen::Matrix<var, Eigen::Dynamic, 1> arg_(5);
@@ -328,7 +329,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_eigen_vector_var_arg) {
328329
stan::math::recover_memory();
329330
}
330331

331-
TEST(AgradRev_accumulate_adjoints, std_vector_eigen_row_vector_var_arg) {
332+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_eigen_row_vector_var_arg) {
332333
using stan::math::var;
333334
using stan::math::vari;
334335
Eigen::Matrix<var, 1, Eigen::Dynamic> arg_(5);
@@ -354,7 +355,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_eigen_row_vector_var_arg) {
354355
stan::math::recover_memory();
355356
}
356357

357-
TEST(AgradRev_accumulate_adjoints, std_vector_eigen_matrix_var_arg) {
358+
TEST_F(AgradRev, Rev_accumulate_adjoints_std_vector_eigen_matrix_var_arg) {
358359
using stan::math::var;
359360
using stan::math::vari;
360361
Eigen::Matrix<var, Eigen::Dynamic, Eigen::Dynamic> arg_(5, 3);
@@ -380,7 +381,7 @@ TEST(AgradRev_accumulate_adjoints, std_vector_eigen_matrix_var_arg) {
380381
stan::math::recover_memory();
381382
}
382383

383-
TEST(AgradRev_accumulate_adjoints, sum) {
384+
TEST_F(AgradRev, Rev_accumulate_adjoints_sum) {
384385
using stan::math::var;
385386
using stan::math::vari;
386387
int arg1 = 1;

‎test/unit/math/rev/core/arena_allocator_test.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <stan/math/rev/core.hpp>
2+
#include <test/unit/math/rev/util.hpp>
23
#include <gtest/gtest.h>
34
#include <vector>
45
#include <deque>
@@ -138,6 +139,6 @@ inline void arena_allocator_test() {
138139
}
139140
}
140141

141-
TEST(AgradRevArena, arena_allocator_test) {
142+
TEST_F(AgradRev, RevArena_arena_allocator_test) {
142143
EXPECT_NO_THROW(arena_allocator_test());
143144
}

‎test/unit/math/rev/core/arena_matrix_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ TEST_F(AgradRev, arena_sparse_matrix_inplace_ops) {
241241
expect_sparse_dense_matrix_equal(A_m, C);
242242
}
243243

244-
TEST(AgradRevArenaMat, arena_matrix_move_test) {
244+
TEST_F(AgradRev, RevArenaMat_arena_matrix_move_test) {
245245
using stan::math::arena_matrix;
246246
Eigen::VectorXd c = Eigen::VectorXd::Random(3);
247247
Eigen::VectorXd d = c;

‎test/unit/math/rev/core/build_vari_array_test.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#include <stan/math/rev/core.hpp>
2+
#include <test/unit/math/rev/util.hpp>
23
#include <gtest/gtest.h>
34
#include <sstream>
45

5-
TEST(AgradRevBuild, build_vari_array) {
6+
TEST_F(AgradRev, RevBuild_build_vari_array) {
67
using Eigen::Dynamic;
78
using Eigen::Matrix;
89
using stan::math::var;

‎test/unit/math/rev/core/callback_vari_test.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#include <stan/math.hpp>
22
#include <gtest/gtest.h>
33
#include <test/unit/util.hpp>
4+
#include <test/unit/math/rev/util.hpp>
45

5-
TEST(AgradRevCBack, callback_vari_scalar_test) {
6+
TEST_F(AgradRev, RevCBack_callback_vari_scalar_test) {
67
stan::math::var a = 1;
78
stan::math::var b = 1;
89

@@ -20,7 +21,7 @@ TEST(AgradRevCBack, callback_vari_scalar_test) {
2021
EXPECT_EQ(b.adj(), 2);
2122
}
2223

23-
TEST(AgradRevCBack, callback_vari_const_scalar_compile_test) {
24+
TEST_F(AgradRev, RevCBack_callback_vari_const_scalar_compile_test) {
2425
stan::math::var a = 1;
2526

2627
const double& a_val = a.val();
@@ -30,7 +31,7 @@ TEST(AgradRevCBack, callback_vari_const_scalar_compile_test) {
3031
EXPECT_FLOAT_EQ(a.val(), b.val());
3132
}
3233

33-
TEST(AgradRevCBack, callback_vari_eigen_test) {
34+
TEST_F(AgradRev, RevCBack_callback_vari_eigen_test) {
3435
Eigen::MatrixXd val(2, 3);
3536
val << 1, 2, 3, 4, 5, 6;
3637
stan::math::var_value<Eigen::MatrixXd> a = val;
@@ -44,7 +45,7 @@ TEST(AgradRevCBack, callback_vari_eigen_test) {
4445
EXPECT_MATRIX_EQ(a.adj(), Eigen::MatrixXd::Constant(2, 3, 2));
4546
}
4647

47-
TEST(AgradRevCBack, make_callback_var_scalar_test) {
48+
TEST_F(AgradRev, RevCBack_make_callback_var_scalar_test) {
4849
stan::math::var a = 1;
4950
stan::math::var b = 1;
5051

@@ -63,7 +64,7 @@ TEST(AgradRevCBack, make_callback_var_scalar_test) {
6364
EXPECT_EQ(b.adj(), 2);
6465
}
6566

66-
TEST(AgradRevCBack, make_callback_var_eigen_test) {
67+
TEST_F(AgradRev, RevCBack_make_callback_var_eigen_test) {
6768
Eigen::MatrixXd val(2, 3);
6869
val << 1, 2, 3, 4, 5, 6;
6970
stan::math::var_value<Eigen::MatrixXd> a = val;

‎test/unit/math/rev/core/chainable_object_test.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include <stan/math.hpp>
22
#include <gtest/gtest.h>
33
#include <test/unit/util.hpp>
4+
#include <test/unit/math/rev/util.hpp>
45

56
class ChainableObjectTest {
67
public:
@@ -11,7 +12,7 @@ class ChainableObjectTest {
1112

1213
int ChainableObjectTest::counter = 0;
1314

14-
TEST(AgradRevChain, chainable_object_test) {
15+
TEST_F(AgradRev, RevChain_chainable_object_test) {
1516
{
1617
EXPECT_NO_THROW(new stan::math::chainable_object<ChainableObjectTest>(
1718
ChainableObjectTest()));
@@ -23,7 +24,7 @@ TEST(AgradRevChain, chainable_object_test) {
2324
EXPECT_EQ((ChainableObjectTest::counter), 1);
2425
}
2526

26-
TEST(AgradRevChain, chainable_object_nested_test) {
27+
TEST_F(AgradRev, RevChain_chainable_object_nested_test) {
2728
stan::math::start_nested();
2829

2930
{
@@ -39,7 +40,7 @@ TEST(AgradRevChain, chainable_object_nested_test) {
3940
EXPECT_EQ((ChainableObjectTest::counter), 1);
4041
}
4142

42-
TEST(AgradRevChain, make_chainable_ptr_test) {
43+
TEST_F(AgradRev, RevChain_make_chainable_ptr_test) {
4344
{
4445
EXPECT_NO_THROW(stan::math::make_chainable_ptr(ChainableObjectTest()));
4546
ChainableObjectTest::counter = 0;
@@ -50,7 +51,7 @@ TEST(AgradRevChain, make_chainable_ptr_test) {
5051
EXPECT_EQ((ChainableObjectTest::counter), 1);
5152
}
5253

53-
TEST(AgradRevChain, make_chainable_ptr_nested_test) {
54+
TEST_F(AgradRev, RevChain_make_chainable_ptr_nested_test) {
5455
stan::math::start_nested();
5556

5657
{
@@ -74,7 +75,7 @@ class UnsafeChainableObjectTest {
7475

7576
int UnsafeChainableObjectTest::counter = 0;
7677

77-
TEST(AgradRevChain, unsafe_chainable_object_test) {
78+
TEST_F(AgradRev, RevChain_unsafe_chainable_object_test) {
7879
{
7980
EXPECT_NO_THROW(
8081
new stan::math::unsafe_chainable_object<UnsafeChainableObjectTest>(
@@ -87,7 +88,7 @@ TEST(AgradRevChain, unsafe_chainable_object_test) {
8788
EXPECT_EQ((UnsafeChainableObjectTest::counter), 1);
8889
}
8990

90-
TEST(AgradRevChain, unsafe_chainable_object_nested_test) {
91+
TEST_F(AgradRev, RevChain_unsafe_chainable_object_nested_test) {
9192
stan::math::start_nested();
9293

9394
{
@@ -103,7 +104,7 @@ TEST(AgradRevChain, unsafe_chainable_object_nested_test) {
103104
EXPECT_EQ((UnsafeChainableObjectTest::counter), 1);
104105
}
105106

106-
TEST(AgradRevChain, make_unsafe_chainable_ptr_test) {
107+
TEST_F(AgradRev, RevChain_make_unsafe_chainable_ptr_test) {
107108
{
108109
EXPECT_NO_THROW(
109110
stan::math::make_unsafe_chainable_ptr(UnsafeChainableObjectTest()));
@@ -115,7 +116,7 @@ TEST(AgradRevChain, make_unsafe_chainable_ptr_test) {
115116
EXPECT_EQ((UnsafeChainableObjectTest::counter), 1);
116117
}
117118

118-
TEST(AgradRevChain, make_unsafe_chainable_ptr_nested_test) {
119+
TEST_F(AgradRev, RevChain_make_unsafe_chainable_ptr_nested_test) {
119120
stan::math::start_nested();
120121

121122
{

0 commit comments

Comments
 (0)