Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update C++ Standard to C++17 #100

Merged
merged 4 commits into from
Mar 6, 2023
Merged

Update C++ Standard to C++17 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7be750
Update requested std
andrjohns Feb 7, 2023
71b47b5
Update workflow actions versions
andrjohns Feb 8, 2023
4ffb680
Update author role
andrjohns Feb 9, 2023
b25e872
Add boost cpp flags
andrjohns Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/check-standard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-pandoc@v1
- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck BH RcppParallel RcppEigen Rcpp rstan StanHeaders

- name: Check against CRAN StanHeaders and CRAN RStan
uses: r-lib/actions/check-r-package@v1
uses: r-lib/actions/check-r-package@v2

- name: Install Development StanHeaders and CRAN RStan
run: |
Expand All @@ -55,7 +55,7 @@ jobs:
shell: Rscript {0}

- name: Check against Development StanHeaders and CRAN RStan
uses: r-lib/actions/check-r-package@v1
uses: r-lib/actions/check-r-package@v2

- name: Install Development StanHeaders and Development RStan
run: |
Expand All @@ -65,7 +65,7 @@ jobs:
shell: Rscript {0}

- name: Check against Development StanHeaders and Development RStan
uses: r-lib/actions/check-r-package@v1
uses: r-lib/actions/check-r-package@v2

- name: Show testthat output
if: always()
Expand Down
10 changes: 5 additions & 5 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Type: Package
Title: Tools for Developing R Packages Interfacing with 'Stan'
Version: 2.2.0.9000
Date: 2022-04-05
Authors@R:
Authors@R:
c(person(given = "Jonah",
family = "Gabry",
role = c("aut", "cre"),
Expand All @@ -18,7 +18,7 @@ Authors@R:
email = "mlysy@uwaterloo.ca"),
person(given = "Andrew",
family = "Johnson",
role = "ctb"),
role = "aut"),
person(given = "Hamada S.",
family = "Badr",
role = "ctb"),
Expand All @@ -32,9 +32,9 @@ Authors@R:
family = "Columbia University",
role = "cph"))
Description: Provides various tools for developers of R packages interfacing
with 'Stan' <https://mc-stan.org>, including functions to set up the required
package structure, S3 generics and default methods to unify function naming
across 'Stan'-based R packages, and vignettes with recommendations for
with 'Stan' <https://mc-stan.org>, including functions to set up the required
package structure, S3 generics and default methods to unify function naming
across 'Stan'-based R packages, and vignettes with recommendations for
developers.
License: GPL (>=3)
URL: https://mc-stan.org/rstantools/, https://discourse.mc-stan.org/
Expand Down
4 changes: 2 additions & 2 deletions inst/include/sys/Makevars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
STANHEADERS_SRC = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "message()" -e "cat(system.file('include', 'src', package = 'StanHeaders', mustWork = TRUE))" -e "message()" | grep "StanHeaders")

STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= 2.26, '-DUSE_STANC3',''))")
PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_MATH_OVERFLOW_ERROR_POLICY=errno_on_error $(STANC_FLAGS)
PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_MATH_OVERFLOW_ERROR_POLICY=errno_on_error $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0
PKG_CXXFLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::CxxFlags()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::CxxFlags()")
PKG_LIBS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::RcppParallelLibs()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::LdFlags()")

CXX_STD = CXX14
CXX_STD = CXX17
4 changes: 2 additions & 2 deletions inst/include/sys/Makevars.win
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
STANHEADERS_SRC = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "message()" -e "cat(system.file('include', 'src', package = 'StanHeaders', mustWork = TRUE))" -e "message()" | grep "StanHeaders")

STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= 2.26, '-DUSE_STANC3',''))")
PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 $(STANC_FLAGS)
PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0
PKG_CXXFLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::CxxFlags()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::CxxFlags()")
PKG_LIBS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::RcppParallelLibs()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::LdFlags()")

CXX_STD = CXX14
CXX_STD = CXX17