Skip to content

Commit 9895be8

Browse files
Revert "Merge branch 'master' into develop"
This reverts commit 526a078, reversing changes made to 40a3fc1.
1 parent 526a078 commit 9895be8

File tree

23,445 files changed

+763696
-995685
lines changed

Some content is hidden

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

23,445 files changed

+763696
-995685
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ If this is a **feature request**, show what you expect to happen if the feature
2525

2626

2727
#### Current Version:
28-
v4.0.1
28+
v4.0.0

Jenkinsfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def runTests(String testPath, boolean jumbo = false) {
1010
sh "./runTests.py -j${env.PARALLEL} ${testPath}"
1111
}
1212
}
13-
finally { junit 'test/**/*.xml' }
13+
finally { junit 'test/**/*.xml' }
1414
}
1515

1616
def runTestsWin(String testPath, boolean buildLibs = true, boolean jumbo = false) {
@@ -19,11 +19,11 @@ def runTestsWin(String testPath, boolean buildLibs = true, boolean jumbo = false
1919
if (buildLibs){
2020
bat "mingw32-make.exe -f make/standalone math-libs"
2121
}
22-
try {
22+
try {
2323
if (jumbo) {
24-
bat "runTests.py -j${env.PARALLEL} ${testPath} --jumbo"
24+
bat "runTests.py -j${env.PARALLEL} ${testPath} --jumbo"
2525
} else {
26-
bat "runTests.py -j${env.PARALLEL} ${testPath}"
26+
bat "runTests.py -j${env.PARALLEL} ${testPath}"
2727
}
2828
}
2929
finally { junit 'test/**/*.xml' }
@@ -252,7 +252,7 @@ pipeline {
252252
runTestsWin("test/unit/math/opencl", false, false)
253253
runTestsWin("test/unit/multiple_translation_units_test.cpp", false, false)
254254
runTestsWin("test/unit/math/prim/fun/gp_exp_quad_cov_test.cpp", false, false)
255-
runTestsWin("test/unit/math/prim/fun/multiply_test.cpp", false, false)
255+
runTestsWin("test/unit/math/prim/fun/multiply_test.cpp", false, false)
256256
runTestsWin("test/unit/math/rev/fun/multiply_test.cpp", false, false)
257257
}
258258
}
@@ -286,10 +286,10 @@ pipeline {
286286
runTestsWin("test/unit/math/opencl", false, false)
287287
runTestsWin("test/unit/multiple_translation_units_test.cpp", false, false)
288288
runTestsWin("test/unit/math/prim/fun/gp_exp_quad_cov_test.cpp", false, false)
289-
runTestsWin("test/unit/math/prim/fun/multiply_test.cpp", false, false)
289+
runTestsWin("test/unit/math/prim/fun/multiply_test.cpp", false, false)
290290
runTestsWin("test/unit/math/rev/fun/multiply_test.cpp", false, false)
291291
}
292-
292+
293293
}
294294
}
295295
}
@@ -339,7 +339,7 @@ pipeline {
339339
sh "find . -name *_test.xml | xargs rm"
340340
runTests("test/unit -f reduce_sum")
341341
}
342-
}
342+
}
343343
}
344344
post { always { retry(3) { deleteDir() } } }
345345
}

README.md

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Required Libraries
2525
------------------
2626
Stan Math depends on four libraries:
2727

28-
- Boost (version 1.72.0): [Boost Home Page](https://www.boost.org)
28+
- Boost (version 1.75.0): [Boost Home Page](https://www.boost.org)
2929
- Eigen (version 3.3.9: [Eigen Home Page](https://eigen.tuxfamily.org/index.php?title=Main_Page)
3030
- SUNDIALS (version 5.6.1): [Sundials Home Page](https://computation.llnl.gov/projects/sundials/sundials-software)
3131
- Intel TBB (version 2019_U8): [Intel TBB Home Page](https://www.threadingbuildingblocks.org)
@@ -90,7 +90,7 @@ for subsequent compilations.
9090
The standalone makefile ensures that all the required `-I` include
9191
statements are given to the compiler and the necessary libraries are
9292
linked: `~/stan-dev/math` and `~/stan-dev/math/lib/eigen_3.3.9` and
93-
`~/stan-dev/math/lib/boost_1.72.0` and
93+
`~/stan-dev/math/lib/boost_1.75.0` and
9494
`~/stan-dev/math/lib/sundials_5.6.1/include` and
9595
`~/stan-dev/math/lib/tbb_2019_U8/include`. The
9696
`~/stan-dev/math/lib/tbb` directory is created by the `math-libs`
@@ -108,6 +108,41 @@ this file to the same directory of the executable or to add the
108108
directory `/path/to/math/lib/tbb` as absolute path to the system-wide
109109
`PATH` variable.
110110

111+
Intel TBB
112+
---------
113+
114+
`math` now supports the new interface of Intel TBB and allows using external library (e.g., with [`oneTBB`](https://github.com/oneapi-src/oneTBB) or the system TBB library), using `TBB_LIB` and `TBB_INC` environment variables.
115+
116+
To build the development version of `math` with [`oneTBB`](https://github.com/oneapi-src/oneTBB):
117+
118+
- Install [`oneTBB`](https://github.com/oneapi-src/oneTBB).
119+
120+
For example, installing [`oneTBB`](https://github.com/oneapi-src/oneTBB) on Linux 64-bit (`x86_64`) to `$HOME` directory (change if needed!):
121+
```bash
122+
TBB_VERSION="2021.1.1"
123+
124+
wget https://github.com/oneapi-src/oneTBB/releases/download/v2021.1.1/oneapi-tbb-$TBB_VERSION-lin.tgz
125+
tar zxvf oneapi-tbb-$TBB_VERSION-lin.tgz -C $HOME
126+
127+
export TBB="$HOME/oneapi-tbb-$TBB_VERSION"
128+
```
129+
130+
- Set the TBB environment variables (specifically: `TBB` for the installation prefix, `TBB_INC` for the directory that includes the header files, and `TBB_LIB` for the libraries directory).
131+
132+
For example, installing [`oneTBB`](https://github.com/oneapi-src/oneTBB) on Linux 64-bit (`x86_64`) to `$HOME` directory (change if needed!):
133+
```bash
134+
source $TBB/env/vars.sh intel64
135+
136+
export TBB_INC="$TBB/include"
137+
export TBB_LIB="$TBB/lib/intel64/gcc4.8"
138+
```
139+
140+
- Set `Stan` local compiler flags to use the new TBB interface:
141+
```bash
142+
mkdir -p ~/.config/stan
143+
echo TBB_INTERFACE_NEW=true>> ~/.config/stan/make.local
144+
```
145+
111146
Compilers
112147
---------
113148

RELEASE-NOTES.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
Stan Math Library Release Notes
22

33
======================================================================
4-
v4.0.1 (17 February 2021)
5-
======================================================================
6-
7-
- Fixed issue with `cholesky_decompose` not propagating derivatives correctly .
8-
- Fixed OpenCL implementations of distributions mostly not working with row vectors.
9-
- Fixed handling of input expressions with reduce_sum.
10-
11-
======================================================================
12-
v4.0.0 (26 January 2021)
4+
v4.0.0 (26 January 2020)
135
======================================================================
146

157
New functions:
@@ -132,6 +124,7 @@ OpenCL backend:
132124
- Added OpenCL reverse mode implementations of matrix multiply and sum.(#2099)
133125
- vari_base can now be constructed with matrix_cl value and adjoint. Copying between host and device is possible for vars containing Eigen::Matrix/matrix_cl. Adjoints are propagated over these copies.(#1967)
134126

127+
135128
======================================================================
136129
v3.3.0 (28 July 2020)
137130
======================================================================

benchmarks/benchmark.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,10 +403,10 @@ def benchmark(
403403
n,
404404
(arg_overload, cpp_arg_template, stan_arg),
405405
) in enumerate(zip(arg_overloads, cpp_arg_templates, stan_args)):
406-
if stan_arg.endswith("]"):
407-
stan_arg2, vec = stan_arg.split("[")
406+
n_vec, inner_type = parse_array(stan_arg)
407+
if n_vec:
408408
benchmark_name += (
409-
"_" + arg_overload + "_" + stan_arg2 + str(len(vec))
409+
"_" + arg_overload + "_" + inner_type + str(n_vec)
410410
)
411411
else:
412412
benchmark_name += "_" + arg_overload + "_" + stan_arg

doxygen/doxygen.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "Stan Math Library"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 4.0.1
41+
PROJECT_NUMBER = 4.0.0
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

lib/boost_1.72.0/boost/algorithm/string/compare.hpp

Lines changed: 0 additions & 199 deletions
This file was deleted.

0 commit comments

Comments
 (0)