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

Fix RStan 2.26 building & Standalone functions #85

Merged
merged 12 commits into from
Oct 1, 2021
Merged

Fix RStan 2.26 building & Standalone functions #85

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
87cf723
Add Makevars flags needed for use with RStan 2.26
Apr 24, 2021
af897fe
Update inst/include/sys/Makevars.win
Sep 11, 2021
a9e8a97
Update inst/include/sys/Makevars
Sep 11, 2021
748a84e
Merge branch 'stan-dev:master' into feature/fix_rstan226
andrjohns Sep 11, 2021
4a076b7
Append makevars for install
Sep 11, 2021
d9c7f9a
Revert append flags
Sep 24, 2021
786bb15
Test standalone
Sep 28, 2021
1eed8b6
Compatibility with stanc3
Sep 28, 2021
af75fe1
Fix false positive
Sep 29, 2021
96b49b7
Fix handling of non-templated plain types
Sep 29, 2021
cb5ab9a
Revert makevars changes & fix USE_STANC3 definition
Sep 30, 2021
510d867
Re-add makevars changes
Sep 30, 2021
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
2 changes: 1 addition & 1 deletion inst/include/sys/Makevars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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")

PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_MATH_OVERFLOW_ERROR_POLICY=errno_on_error
PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_MATH_OVERFLOW_ERROR_POLICY=errno_on_error -DUSE_STANC3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

USE_STANC3 should only be defined if the C++ code is generated by stanc3. This is ok when rstan 2.26 is released, but the transition to CRAN may require releasing stan-dev/rstan#912 first that's compatible with the older version of rstan. So, if USE_STANC3 is defined, Math v4+ headers will be exposed and break the C++ code generated by stanc2.

Solution: While the development version of rstan defines USE_STANC3 in the generated C++ code, it's safe to define it here only if (utils::packageVersion("rstan") >= 2.26).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I missed this comment! Thanks for clarifying that, good catch. I'll fix that up

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries. You may also check nzchar(system.file("stanc.js", package = "rstan")), but utils::packageVersion("rstan") >= 2.26 is the right way since we can remove the local JS to use the nightly version of stanc3.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrjohns A variant of the following should work:

"$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= 2.26, '-DUSE_STANC3', ''))"

andrjohns marked this conversation as resolved.
Show resolved Hide resolved
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()")

Expand Down
2 changes: 1 addition & 1 deletion inst/include/sys/Makevars.win
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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")

PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1
PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 -DUSE_STANC3
andrjohns marked this conversation as resolved.
Show resolved Hide resolved
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()")

Expand Down