Skip to content

Commit 1e321cc

Browse files
SteveBronderSteveBronder
committed
update to develop
2 parents cbc3565 + 00e82e3 commit 1e321cc

347 files changed

Lines changed: 5534 additions & 762 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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Stan Math depends on four libraries:
2727

2828
- 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)
30-
- SUNDIALS (version 5.6.1): [Sundials Home Page](https://computation.llnl.gov/projects/sundials/sundials-software)
30+
- SUNDIALS (version 5.7.0): [Sundials Home Page](https://computation.llnl.gov/projects/sundials/sundials-software)
3131
- Intel TBB (version 2020.3): [Intel TBB Home Page](https://www.threadingbuildingblocks.org)
3232

3333
These are distributed under the `lib/` subdirectory. Only these
@@ -91,8 +91,13 @@ 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
9393
`~/stan-dev/math/lib/boost_1.75.0` and
94+
<<<<<<< HEAD
9495
`~/stan-dev/math/lib/sundials_5.6.1/include` and
9596
`~/stan-dev/math/lib/tbb_2020.3/include`. The
97+
=======
98+
`~/stan-dev/math/lib/sundials_5.7.0/include` and
99+
`~/stan-dev/math/lib/tbb_2019_U8/include`. The
100+
>>>>>>> origin/develop
96101
`~/stan-dev/math/lib/tbb` directory is created by the `math-libs`
97102
makefile target automatically and contains the dynamically loaded
98103
Intel TBB library. The flags `-Wl,-rpath,...` instruct the linker to

lib/sundials_5.6.1/CONTRIBUTING.md renamed to lib/sundials_5.7.0/CONTRIBUTING.md

File renamed without changes.

lib/sundials_5.6.1/LICENSE renamed to lib/sundials_5.7.0/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2002-2020, Lawrence Livermore National Security and Southern Methodist University.
3+
Copyright (c) 2002-2021, Lawrence Livermore National Security and Southern Methodist University.
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

lib/sundials_5.6.1/NOTICE renamed to lib/sundials_5.7.0/NOTICE

File renamed without changes.

lib/sundials_5.6.1/README.md renamed to lib/sundials_5.7.0/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SUNDIALS: SUite of Nonlinear and DIfferential/ALgebraic equation Solvers #
2-
### Version 5.6.1 (Dec 2020) ###
2+
### Version 5.7.0 (Jan 2021) ###
33

44
**Center for Applied Scientific Computing, Lawrence Livermore National Laboratory**
55

lib/sundials_5.6.1/include/cvodes/cvodes.h renamed to lib/sundials_5.7.0/include/cvodes/cvodes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Programmer(s): Radu Serban @ LLNL
33
* -----------------------------------------------------------------
44
* SUNDIALS Copyright Start
5-
* Copyright (c) 2002-2020, Lawrence Livermore National Security
5+
* Copyright (c) 2002-2021, Lawrence Livermore National Security
66
* and Southern Methodist University.
77
* All rights reserved.
88
*

lib/sundials_5.6.1/include/cvodes/cvodes_bandpre.h renamed to lib/sundials_5.7.0/include/cvodes/cvodes_bandpre.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Radu Serban @ LLNL
44
* -----------------------------------------------------------------
55
* SUNDIALS Copyright Start
6-
* Copyright (c) 2002-2020, Lawrence Livermore National Security
6+
* Copyright (c) 2002-2021, Lawrence Livermore National Security
77
* and Southern Methodist University.
88
* All rights reserved.
99
*

lib/sundials_5.6.1/include/cvodes/cvodes_bbdpre.h renamed to lib/sundials_5.7.0/include/cvodes/cvodes_bbdpre.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Radu Serban @ LLNL
44
* -----------------------------------------------------------------
55
* SUNDIALS Copyright Start
6-
* Copyright (c) 2002-2020, Lawrence Livermore National Security
6+
* Copyright (c) 2002-2021, Lawrence Livermore National Security
77
* and Southern Methodist University.
88
* All rights reserved.
99
*

lib/sundials_5.6.1/include/cvodes/cvodes_diag.h renamed to lib/sundials_5.7.0/include/cvodes/cvodes_diag.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Programmer(s): Radu Serban @ LLNL
33
* ---------------------------------------------------------------------
44
* SUNDIALS Copyright Start
5-
* Copyright (c) 2002-2020, Lawrence Livermore National Security
5+
* Copyright (c) 2002-2021, Lawrence Livermore National Security
66
* and Southern Methodist University.
77
* All rights reserved.
88
*

lib/sundials_5.6.1/include/cvodes/cvodes_direct.h renamed to lib/sundials_5.7.0/include/cvodes/cvodes_direct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Programmer(s): Daniel R. Reynolds @ SMU
33
* -----------------------------------------------------------------
44
* SUNDIALS Copyright Start
5-
* Copyright (c) 2002-2020, Lawrence Livermore National Security
5+
* Copyright (c) 2002-2021, Lawrence Livermore National Security
66
* and Southern Methodist University.
77
* All rights reserved.
88
*

0 commit comments

Comments
 (0)