Skip to content

Commit 7af50b6

Browse files
weberse2weberse2
committed
Merge remote-tracking branch 'origin/develop' into feature/faster-ad-tls-v5
2 parents f76ecac + 57215ea commit 7af50b6

File tree

334 files changed

+1133
-1613
lines changed

Some content is hidden

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

334 files changed

+1133
-1613
lines changed

‎Jenkinsfile

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -162,30 +162,6 @@ pipeline {
162162
}
163163
post { always { retry(3) { deleteDir() } } }
164164
}
165-
stage('Windows Headers & Unit') {
166-
agent { label 'windows' }
167-
steps {
168-
deleteDirWin()
169-
unstash 'MathSetup'
170-
bat "make -j${env.PARALLEL} test-headers"
171-
runTestsWin("test/unit")
172-
}
173-
}
174-
stage('Windows Threading') {
175-
agent { label 'windows' }
176-
steps {
177-
deleteDirWin()
178-
unstash 'MathSetup'
179-
bat "echo CXX=${env.CXX} -Werror > make/local"
180-
bat "echo CXXFLAGS+=-DSTAN_THREADS >> make/local"
181-
runTestsWin("test/unit -f thread")
182-
runTestsWin("test/unit -f map_rect")
183-
}
184-
}
185-
}
186-
}
187-
stage('Always-run tests part 2') {
188-
parallel {
189165
stage('Full unit with GPU') {
190166
agent { label "gpu" }
191167
steps {
@@ -199,6 +175,10 @@ pipeline {
199175
}
200176
post { always { retry(3) { deleteDir() } } }
201177
}
178+
}
179+
}
180+
stage('Always-run tests part 2') {
181+
parallel {
202182
stage('Distribution tests') {
203183
agent { label "distribution-tests" }
204184
steps {
@@ -226,6 +206,39 @@ pipeline {
226206
}
227207
}
228208
}
209+
stage('Threading tests') {
210+
agent any
211+
steps {
212+
deleteDir()
213+
unstash 'MathSetup'
214+
sh "echo CXX=${env.CXX} -Werror > make/local"
215+
sh "echo CPPFLAGS+=-DSTAN_THREADS >> make/local"
216+
runTests("test/unit -f thread")
217+
sh "find . -name *_test.xml | xargs rm"
218+
runTests("test/unit -f map_rect")
219+
}
220+
post { always { retry(3) { deleteDir() } } }
221+
}
222+
stage('Windows Headers & Unit') {
223+
agent { label 'windows' }
224+
steps {
225+
deleteDirWin()
226+
unstash 'MathSetup'
227+
bat "make -j${env.PARALLEL} test-headers"
228+
runTestsWin("test/unit")
229+
}
230+
}
231+
stage('Windows Threading') {
232+
agent { label 'windows' }
233+
steps {
234+
deleteDirWin()
235+
unstash 'MathSetup'
236+
bat "echo CXX=${env.CXX} -Werror > make/local"
237+
bat "echo CXXFLAGS+=-DSTAN_THREADS >> make/local"
238+
runTestsWin("test/unit -f thread")
239+
runTestsWin("test/unit -f map_rect")
240+
}
241+
}
229242
}
230243
}
231244
stage('Additional merge tests') {

‎make/compiler_flags

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ ifdef STAN_OPENCL
151151
OPENCL_DEVICE_ID ?= 0
152152
OPENCL_PLATFORM_ID ?= 0
153153

154-
CPPFLAGS_OPENCL ?= -DSTAN_OPENCL -DOPENCL_DEVICE_ID=$(OPENCL_DEVICE_ID) -DOPENCL_PLATFORM_ID=$(OPENCL_PLATFORM_ID) -DCL_USE_DEPRECATED_OPENCL_1_2_APIS
154+
CPPFLAGS_OPENCL ?= -DSTAN_OPENCL -DOPENCL_DEVICE_ID=$(OPENCL_DEVICE_ID) -DOPENCL_PLATFORM_ID=$(OPENCL_PLATFORM_ID) -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -D__CL_ENABLE_EXCEPTIONS -Wno-ignored-attributes
155155
CXXFLAGS_OPENCL ?= -I $(OPENCL)
156156
endif
157157

‎stan/math/fwd/mat/fun/columns_dot_product.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
#define STAN_MATH_FWD_MAT_FUN_COLUMNS_DOT_PRODUCT_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
65
#include <stan/math/prim/mat/err/check_matching_dims.hpp>
76
#include <stan/math/fwd/mat/fun/typedefs.hpp>
8-
#include <stan/math/fwd/mat/fun/dot_product.hpp>
97
#include <stan/math/fwd/core.hpp>
10-
#include <vector>
118

129
namespace stan {
1310
namespace math {

‎stan/math/fwd/mat/fun/columns_dot_self.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
#define STAN_MATH_FWD_MAT_FUN_COLUMNS_DOT_SELF_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
65
#include <stan/math/fwd/core.hpp>
76
#include <stan/math/fwd/mat/fun/dot_self.hpp>
8-
#include <vector>
97

108
namespace stan {
119
namespace math {

‎stan/math/fwd/mat/fun/crossprod.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
#define STAN_MATH_FWD_MAT_FUN_CROSSPROD_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
6-
#include <stan/math/fwd/mat/fun/typedefs.hpp>
75
#include <stan/math/fwd/mat/fun/multiply.hpp>
86
#include <stan/math/prim/mat/fun/transpose.hpp>
9-
#include <vector>
107

118
namespace stan {
129
namespace math {

‎stan/math/fwd/mat/fun/determinant.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
55
#include <stan/math/fwd/core.hpp>
6-
#include <stan/math/fwd/mat/fun/typedefs.hpp>
76
#include <stan/math/prim/mat/fun/multiply.hpp>
87
#include <stan/math/fwd/mat/fun/multiply.hpp>
98
#include <stan/math/prim/mat/fun/inverse.hpp>
109
#include <stan/math/fwd/mat/fun/inverse.hpp>
1110
#include <stan/math/prim/mat/err/check_square.hpp>
12-
#include <boost/math/tools/promotion.hpp>
13-
#include <vector>
1411

1512
namespace stan {
1613
namespace math {

‎stan/math/fwd/mat/fun/divide.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
55
#include <stan/math/fwd/core.hpp>
6-
#include <stan/math/fwd/mat/fun/to_fvar.hpp>
7-
#include <stan/math/fwd/mat/fun/typedefs.hpp>
8-
#include <stan/math/prim/scal/meta/return_type.hpp>
9-
#include <vector>
106

117
namespace stan {
128
namespace math {

‎stan/math/fwd/mat/fun/dot_product.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
#define STAN_MATH_FWD_MAT_FUN_DOT_PRODUCT_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
65
#include <stan/math/prim/mat/err/check_vector.hpp>
76
#include <stan/math/prim/arr/err/check_matching_sizes.hpp>
87
#include <stan/math/fwd/mat/fun/typedefs.hpp>
9-
#include <stan/math/fwd/mat/fun/to_fvar.hpp>
108
#include <vector>
119

1210
namespace stan {

‎stan/math/fwd/mat/fun/dot_self.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
#define STAN_MATH_FWD_MAT_FUN_DOT_SELF_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
65
#include <stan/math/prim/mat/err/check_vector.hpp>
76
#include <stan/math/fwd/core.hpp>
87
#include <stan/math/fwd/mat/fun/dot_product.hpp>
9-
#include <vector>
108

119
namespace stan {
1210
namespace math {

‎stan/math/fwd/mat/fun/inverse.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
#include <stan/math/fwd/mat/fun/multiply.hpp>
99
#include <stan/math/prim/mat/fun/inverse.hpp>
1010
#include <stan/math/prim/mat/err/check_square.hpp>
11-
#include <boost/math/tools/promotion.hpp>
12-
#include <vector>
1311

1412
namespace stan {
1513
namespace math {

‎stan/math/fwd/mat/fun/log_determinant.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
55
#include <stan/math/fwd/core.hpp>
6-
#include <stan/math/fwd/mat/fun/typedefs.hpp>
76
#include <stan/math/fwd/mat/fun/determinant.hpp>
87
#include <stan/math/fwd/scal/fun/fabs.hpp>
98
#include <stan/math/fwd/scal/fun/log.hpp>
109
#include <stan/math/prim/mat/err/check_square.hpp>
11-
#include <boost/math/tools/promotion.hpp>
12-
#include <vector>
1310

1411
namespace stan {
1512
namespace math {

‎stan/math/fwd/mat/fun/log_sum_exp.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <stan/math/prim/mat/fun/Eigen.hpp>
77
#include <stan/math/fwd/scal/fun/log.hpp>
88
#include <stan/math/fwd/scal/fun/exp.hpp>
9-
#include <vector>
109

1110
namespace stan {
1211
namespace math {

‎stan/math/fwd/mat/fun/mdivide_left.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
#include <stan/math/prim/mat/fun/typedefs.hpp>
66
#include <stan/math/prim/mat/err/check_multiplicable.hpp>
77
#include <stan/math/fwd/core.hpp>
8-
#include <stan/math/fwd/mat/fun/typedefs.hpp>
9-
#include <stan/math/fwd/mat/fun/inverse.hpp>
108
#include <stan/math/fwd/mat/fun/multiply.hpp>
119
#include <stan/math/prim/mat/fun/multiply.hpp>
1210
#include <stan/math/fwd/mat/fun/to_fvar.hpp>
13-
#include <stan/math/prim/mat/fun/inverse.hpp>
1411
#include <stan/math/prim/mat/fun/mdivide_left.hpp>
1512
#include <stan/math/prim/mat/err/check_square.hpp>
1613
#include <vector>

‎stan/math/fwd/mat/fun/mdivide_left_ldlt.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
#include <stan/math/prim/mat/fun/Eigen.hpp>
55
#include <stan/math/prim/mat/fun/LDLT_factor.hpp>
66
#include <stan/math/prim/mat/err/check_multiplicable.hpp>
7-
#include <stan/math/prim/mat/fun/promote_common.hpp>
87
#include <stan/math/prim/mat/fun/mdivide_left_ldlt.hpp>
98
#include <stan/math/fwd/mat/fun/to_fvar.hpp>
10-
#include <boost/math/tools/promotion.hpp>
119

1210
namespace stan {
1311
namespace math {

‎stan/math/fwd/mat/fun/mdivide_left_tri_low.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
#define STAN_MATH_FWD_MAT_FUN_MDIVIDE_LEFT_TRI_LOW_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
65
#include <stan/math/prim/mat/fun/mdivide_left.hpp>
76
#include <stan/math/prim/mat/err/check_multiplicable.hpp>
87
#include <stan/math/fwd/mat/fun/typedefs.hpp>
98
#include <stan/math/fwd/mat/fun/to_fvar.hpp>
109
#include <stan/math/fwd/mat/fun/multiply.hpp>
11-
#include <stan/math/fwd/mat/fun/inverse.hpp>
1210
#include <stan/math/fwd/core.hpp>
1311
#include <stan/math/prim/mat/err/check_square.hpp>
14-
#include <vector>
1512

1613
namespace stan {
1714
namespace math {

‎stan/math/fwd/mat/fun/mdivide_right.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22
#define STAN_MATH_FWD_MAT_FUN_MDIVIDE_RIGHT_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
65
#include <stan/math/prim/mat/fun/mdivide_right.hpp>
76
#include <stan/math/prim/mat/err/check_multiplicable.hpp>
87
#include <stan/math/prim/mat/err/check_square.hpp>
98
#include <stan/math/fwd/core.hpp>
109
#include <stan/math/fwd/mat/fun/typedefs.hpp>
11-
#include <stan/math/fwd/mat/fun/inverse.hpp>
1210
#include <stan/math/fwd/mat/fun/multiply.hpp>
1311
#include <stan/math/prim/mat/fun/multiply.hpp>
1412
#include <stan/math/fwd/mat/fun/to_fvar.hpp>
15-
#include <stan/math/prim/mat/fun/inverse.hpp>
1613
#include <vector>
1714

1815
namespace stan {

‎stan/math/fwd/mat/fun/mdivide_right_tri_low.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
55
#include <stan/math/prim/mat/fun/mdivide_right.hpp>
6-
#include <stan/math/prim/mat/fun/typedefs.hpp>
76
#include <stan/math/prim/mat/err/check_multiplicable.hpp>
87
#include <stan/math/prim/mat/err/check_square.hpp>
9-
#include <stan/math/fwd/mat/fun/typedefs.hpp>
108
#include <stan/math/fwd/mat/fun/to_fvar.hpp>
119
#include <stan/math/fwd/mat/fun/multiply.hpp>
12-
#include <stan/math/fwd/mat/fun/inverse.hpp>
1310
#include <stan/math/fwd/core.hpp>
14-
#include <vector>
1511

1612
namespace stan {
1713
namespace math {

‎stan/math/fwd/mat/fun/multiply.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
#define STAN_MATH_FWD_MAT_FUN_MULTIPLY_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
65
#include <stan/math/prim/mat/err/check_multiplicable.hpp>
76
#include <stan/math/fwd/core.hpp>
87
#include <stan/math/fwd/mat/fun/typedefs.hpp>
9-
#include <stan/math/fwd/mat/fun/to_fvar.hpp>
108
#include <stan/math/fwd/mat/fun/dot_product.hpp>
11-
#include <boost/math/tools/promotion.hpp>
12-
#include <vector>
139

1410
namespace stan {
1511
namespace math {

‎stan/math/fwd/mat/fun/multiply_lower_tri_self_transpose.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#define STAN_MATH_FWD_MAT_FUN_MULTIPLY_LOWER_TRI_SELF_TRANSPOSE_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
6-
#include <stan/math/fwd/mat/fun/typedefs.hpp>
75
#include <stan/math/fwd/mat/fun/multiply.hpp>
86
#include <stan/math/prim/mat/fun/transpose.hpp>
97
#include <vector>

‎stan/math/fwd/mat/fun/quad_form_sym.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <stan/math/fwd/core.hpp>
55
#include <stan/math/fwd/mat/fun/multiply.hpp>
66
#include <stan/math/fwd/mat/fun/dot_product.hpp>
7-
#include <stan/math/prim/mat/fun/quad_form_sym.hpp>
87

98
namespace stan {
109
namespace math {

‎stan/math/fwd/mat/fun/rows_dot_product.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
#define STAN_MATH_FWD_MAT_FUN_ROWS_DOT_PRODUCT_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
65
#include <stan/math/prim/mat/err/check_matching_dims.hpp>
7-
#include <stan/math/fwd/mat/fun/typedefs.hpp>
86
#include <stan/math/fwd/mat/fun/dot_product.hpp>
97
#include <stan/math/fwd/core.hpp>
10-
#include <vector>
118

129
namespace stan {
1310
namespace math {

‎stan/math/fwd/mat/fun/rows_dot_self.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
#define STAN_MATH_FWD_MAT_FUN_ROWS_DOT_SELF_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
65
#include <stan/math/fwd/core.hpp>
76
#include <stan/math/fwd/mat/fun/dot_self.hpp>
8-
#include <vector>
97

108
namespace stan {
119
namespace math {

‎stan/math/fwd/mat/fun/squared_distance.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
#include <stan/math/prim/mat/fun/Eigen.hpp>
55
#include <stan/math/prim/mat/err/check_vector.hpp>
66
#include <stan/math/prim/arr/err/check_matching_sizes.hpp>
7-
#include <stan/math/fwd/core/operator_subtraction.hpp>
87
#include <stan/math/fwd/mat/fun/dot_self.hpp>
9-
#include <stan/math/fwd/mat/fun/to_fvar.hpp>
108
#include <stan/math/prim/mat/fun/subtract.hpp>
119

1210
namespace stan {

‎stan/math/fwd/mat/fun/tcrossprod.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
#define STAN_MATH_FWD_MAT_FUN_TCROSSPROD_HPP
33

44
#include <stan/math/prim/mat/fun/Eigen.hpp>
5-
#include <stan/math/prim/mat/fun/typedefs.hpp>
6-
#include <stan/math/fwd/mat/fun/typedefs.hpp>
75
#include <stan/math/fwd/mat/fun/multiply.hpp>
86
#include <stan/math/prim/mat/fun/transpose.hpp>
9-
#include <vector>
107

118
namespace stan {
129
namespace math {

‎stan/math/fwd/mat/functor/hessian.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include <stan/math/fwd/core.hpp>
55
#include <stan/math/prim/mat/fun/Eigen.hpp>
6-
#include <stdexcept>
76

87
namespace stan {
98
namespace math {

‎stan/math/fwd/mat/functor/jacobian.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include <stan/math/fwd/core.hpp>
55
#include <stan/math/prim/mat/fun/Eigen.hpp>
6-
#include <vector>
76

87
namespace stan {
98
namespace math {

‎stan/math/fwd/mat/meta/operands_and_partials.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef STAN_MATH_FWD_MAT_META_OPERANDS_AND_PARTIALS_HPP
22
#define STAN_MATH_FWD_MAT_META_OPERANDS_AND_PARTIALS_HPP
33

4-
#include <stan/math/fwd/mat/fun/typedefs.hpp>
54
#include <stan/math/fwd/scal/meta/operands_and_partials.hpp>
65
#include <stan/math/prim/scal/meta/broadcast_array.hpp>
6+
#include <stan/math/prim/mat/fun/Eigen.hpp>
77
#include <vector>
88

99
namespace stan {

‎stan/math/fwd/scal/fun/abs.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
#define STAN_MATH_FWD_SCAL_FUN_ABS_HPP
33

44
#include <stan/math/fwd/core.hpp>
5-
#include <stan/math/fwd/scal/fun/value_of.hpp>
65
#include <stan/math/prim/scal/fun/constants.hpp>
76
#include <stan/math/prim/scal/fun/abs.hpp>
87
#include <stan/math/prim/scal/fun/value_of.hpp>
9-
#include <stan/math/prim/scal/meta/likely.hpp>
108

119
namespace stan {
1210
namespace math {

0 commit comments

Comments
 (0)