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

Add RcppParallel cxxflags to makevars #70

Merged
merged 2 commits into from
May 17, 2024
Merged

Add RcppParallel cxxflags to makevars #70

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d93fd5
Add RcppParallel cxxflags to makevars
andrjohns May 16, 2024
92688fc
Tidy
andrjohns May 16, 2024
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
1 change: 1 addition & 0 deletions src/Makevars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
PKG_CXXFLAGS += -DRCPP_USE_UNWIND_PROTECT
KG_CXXFLAGS += $(shell ${R_HOME}/bin/Rscript -e "RcppParallel::CxxFlags()")
Copy link
Owner

Choose a reason for hiding this comment

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

There's a typo, an initial P is missing. Also, where did you find this information? The documentation doesn't mention this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There's a typo, an initial P is missing.

Oh good catch, sorry about that!

Also, where did you find this information? The documentation doesn't mention this.

The CxxFlags function didn't previously have much use for packages, but the TBB headers needs additional compilation flags on Windows ARM64


# Needed due to RcppArmadillo
PKG_LIBS += $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
Expand Down
1 change: 1 addition & 0 deletions src/Makevars.win
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
PKG_CXXFLAGS += -DRCPP_PARALLEL_USE_TBB=1
PKG_CXXFLAGS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "RcppParallel::CxxFlags()")
asardaes marked this conversation as resolved.
Show resolved Hide resolved

# Needed due to RcppArmadillo
PKG_LIBS += $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
Expand Down
Loading