Skip to content

Commit 6c16889

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/unary-var-matrix
2 parents a7958c7 + 9207570 commit 6c16889

72 files changed

Lines changed: 4345 additions & 13046 deletions

File tree

Some content is hidden

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

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,16 @@ To build the development version of `math` with [`oneTBB`](https://github.com/on
119119

120120
For example, installing [`oneTBB`](https://github.com/oneapi-src/oneTBB) on Linux 64-bit (`x86_64`) to `$HOME` directory (change if needed!):
121121
```bash
122-
TBB_VERSION="2021.1.1"
122+
TBB_RELEASE="https://api.github.com/repos/oneapi-src/oneTBB/releases/latest"
123+
TBB_TAG=$(curl --silent $TBB_RELEASE | grep -Po '"tag_name": "\K.*?(?=")')
124+
TBB_VERSION=${TBB_TAG#?}
123125

124126
wget https://github.com/oneapi-src/oneTBB/releases/download/v${TBB_VERSION}/oneapi-tbb-${TBB_VERSION}-lin.tgz
125127
tar zxvf oneapi-tbb-$TBB_VERSION-lin.tgz -C $HOME
126128

127129
export TBB="$HOME/oneapi-tbb-$TBB_VERSION"
128130
```
131+
Note that you may replace `TBB_VERSION=${TBB_TAG#?}` with a custom version number if needed ( check available releases [here](https://github.com/oneapi-src/oneTBB/releases) ).
129132

130133
- 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).
131134

make/tests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ $(EXPRESSION_TESTS) : $(LIBSUNDIALS)
6464
# CVODES tests
6565
##
6666

67-
CVODES_TESTS := $(subst .cpp,$(EXE),$(call findfiles,test,*cvodes*_test.cpp) $(call findfiles,test,*_bdf_*_test.cpp) $(call findfiles,test,*_adams_*_test.cpp))
67+
CVODES_TESTS := $(subst .cpp,$(EXE),$(call findfiles,test,*cvodes*_test.cpp) $(call findfiles,test,*_bdf_*_test.cpp) $(call findfiles,test,*_adams_*_test.cpp) $(call findfiles,test,*_ode_typed_*test.cpp))
6868
$(CVODES_TESTS) : $(LIBSUNDIALS)
6969

7070

stan/math/opencl/copy.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <stan/math/opencl/opencl_context.hpp>
1010
#include <stan/math/opencl/value_type.hpp>
1111
#include <stan/math/opencl/scalar_type.hpp>
12-
#include <stan/math/opencl/kernels/copy.hpp>
1312
#include <stan/math/opencl/kernels/pack.hpp>
1413
#include <stan/math/opencl/kernels/unpack.hpp>
1514
#include <stan/math/opencl/err/check_opencl.hpp>

stan/math/opencl/err.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
#ifndef STAN_MATH_OPENCL_ERR_HPP
22
#define STAN_MATH_OPENCL_ERR_HPP
33

4-
#include <stan/math/opencl/err/check_diagonal_zeros.hpp>
5-
#include <stan/math/opencl/err/check_invalid_matrix_view.hpp>
64
#include <stan/math/opencl/err/check_mat_size_one.hpp>
7-
#include <stan/math/opencl/err/check_nan.hpp>
85
#include <stan/math/opencl/err/check_opencl.hpp>
96
#include <stan/math/opencl/err/check_symmetric.hpp>
107
#include <stan/math/opencl/err/check_triangular.hpp>

stan/math/opencl/err/check_diagonal_zeros.hpp

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

stan/math/opencl/err/check_invalid_matrix_view.hpp

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

stan/math/opencl/err/check_mat_size_one.hpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,6 @@
99
namespace stan {
1010
namespace math {
1111

12-
/** \ingroup error_checks_opencl
13-
* Check if the <code>matrix_cl</code> has a single element.
14-
*
15-
* @param function Function name (for error messages)
16-
* @param name Variable name (for error messages)
17-
* @param A <code>matrix_cl</code> to test
18-
*
19-
* @throw <code>std::domain_error</code> if the <code>matrix_cl</code>
20-
* size is not 1
21-
*/
22-
template <typename T>
23-
inline void check_mat_size_one(const char* function, const char* name,
24-
const matrix_cl<T>& A) {
25-
if (A.size() != 1) {
26-
invalid_argument(function, name, "should have exactly one element.", "");
27-
}
28-
}
29-
3012
/** \ingroup error_checks_opencl
3113
* Check if the <code>matrix_cl</code> has a single element.
3214
*

stan/math/opencl/err/check_nan.hpp

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

stan/math/opencl/kernels/check_diagonal_zeros.hpp

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

stan/math/opencl/kernels/check_nan.hpp

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

0 commit comments

Comments
 (0)