Skip to content

Commit 6cbb647

Browse files
committed
Merge branch 'master' into model-methods
2 parents c23f522 + 37b8cd3 commit 6cbb647

File tree

6 files changed

+11
-14
lines changed

6 files changed

+11
-14
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272

7373
- name: Cache R packages
7474
if: runner.os != 'Windows'
75-
uses: actions/cache@v3
75+
uses: actions/cache@v4
7676
with:
7777
path: ${{ env.R_LIBS_USER }}
7878
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

.github/workflows/Test-coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
shell: Rscript {0}
5151

5252
- name: Cache R packages
53-
uses: actions/cache@v3
53+
uses: actions/cache@v4
5454
with:
5555
path: ${{ env.R_LIBS_USER }}
5656
key: ubuntu-r-4.0-1-${{ hashFiles('.github/depends.Rds') }}

.github/workflows/cmdstan-tarball-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
- name: Cache R packages
5858
if: runner.os != 'Windows'
59-
uses: actions/cache@v3
59+
uses: actions/cache@v4
6060
with:
6161
path: ${{ env.R_LIBS_USER }}
6262
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

tests/testthat/test-model-laplace.R

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ test_that("laplace() runs when all arguments specified validly", {
5555
expect_equal(fit1$mode()$metadata()$jacobian, as.integer(ok_arg_values$jacobian))
5656
expect_equal(fit1$mode()$metadata()$init_alpha, ok_arg_values$opt_args$init_alpha)
5757

58-
# https://github.com/stan-dev/cmdstan/issues/1242
59-
#expect_equal(fit1$mode()$metadata()$tol_obj, ok_arg_values$opt_args$tol_obj, tolerance = 0)
58+
expect_equal(fit1$mode()$metadata()$tol_obj, ok_arg_values$opt_args$tol_obj, tolerance = 0)
6059

6160
# leaving all at default (except 'data')
6261
expect_laplace_output(fit2 <- mod$laplace(data = data_list, seed = 123))

tests/testthat/test-model-optimize.R

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ test_that("optimize() works with (L-)BFGS tolerances specified", {
117117
# using values that aren't the defaults
118118
init_alpha = 0.002,
119119
tol_obj = 2e-11,
120-
tol_rel_obj = 10001,
120+
tol_rel_obj = 1000,
121121
tol_grad = 5e-07,
122-
tol_rel_grad = 10000001,
122+
tol_rel_grad = 1000000,
123123
tol_param = 5e-07,
124124
history_size = 6,
125125
seed = 123
@@ -128,12 +128,10 @@ test_that("optimize() works with (L-)BFGS tolerances specified", {
128128
metadata <- fit$metadata()
129129
expect_equal(metadata$init_alpha, 0.002)
130130
expect_equal(metadata$tol_obj, 2e-11)
131-
expect_equal(metadata$tol_rel_obj, 10001)
132-
# https://github.com/stan-dev/cmdstan/issues/1242
133-
# expect_equal(metadata$tol_grad, 5e-07)
134-
expect_equal(metadata$tol_rel_grad, 10000001)
135-
# https://github.com/stan-dev/cmdstan/issues/1242
136-
# expect_equal(metadata$tol_param, 5e-07)
131+
expect_equal(metadata$tol_rel_obj, 1000)
132+
expect_equal(metadata$tol_grad, 5e-07)
133+
expect_equal(metadata$tol_rel_grad, 1000000)
134+
expect_equal(metadata$tol_param, 5e-07)
137135
expect_equal(metadata$history_size, 6)
138136
})
139137

vignettes/articles-online-only/opencl.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ mdata <- list(k = k, n = n, y = y, X = X)
104104
In this model, most of the computation will be handled by the
105105
`bernoulli_logit_glm_lpmf` function. Because this is a supported GPU function,
106106
it should be possible to accelerate it with OpenCL. Check
107-
[here](http://mc-stan.org/math/d0/d8f/opencl_support.html) for a list of functions
107+
[here](https://mc-stan.org/math/md_doxygen_2parallelism__support_2opencl__support.html) for a list of functions
108108
with OpenCL support.
109109

110110
To build the model with OpenCL support, add

0 commit comments

Comments
 (0)