Skip to content

Remove obsolete flag for WINARM64, fix TBB library lookup on Windows #241

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

Merged
merged 2 commits into from
Oct 7, 2025
Merged

Remove obsolete flag for WINARM64, fix TBB library lookup on Windows #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4370a79
Remove unnecessary flag for WINARM64
andrjohns Oct 7, 2025
811e884
Fix TBB library lookup
andrjohns Oct 7, 2025
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
10 changes: 1 addition & 9 deletions R/tbb.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tbbLibraryPath <- function(name = NULL) {
# form library names
tbbLibNames <- list(
"Darwin" = paste0("lib", name, ".dylib"),
"Windows" = paste0( name, ".dll"),
"Windows" = paste0("lib", name, c("12", ""), ".a"),
"SunOS" = paste0("lib", name, ".so"),
"Linux" = paste0("lib", name, c(".so.2", ".so"))
)
Expand Down Expand Up @@ -58,14 +58,6 @@ tbbCxxFlags <- function() {
return("-DRCPP_PARALLEL_USE_TBB=0")

flags <- c("-DRCPP_PARALLEL_USE_TBB=1")

# TBB does not have assembly code for Windows ARM64
# so we need to use compiler builtins
if (TBB_ENABLED && is_windows()) {
if (R.version$arch == "aarch64") {
flags <- c(flags, "-DTBB_USE_GCC_BUILTINS")
}
}

# if TBB_INC is set, apply those library paths
tbbInc <- Sys.getenv("TBB_INC", unset = TBB_INC)
Expand Down
5 changes: 4 additions & 1 deletion R/zzz.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
.tbbMallocProxyDllInfo <- NULL

loadTbbLibrary <- function(name) {

# TBB is statically linked on Windows
if (is_windows()) {
return(NULL)
}
path <- tbbLibraryPath(name)
if (is.null(path))
return(NULL)
Expand Down
3 changes: 0 additions & 3 deletions inst/include/RcppParallel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
#endif

#if RCPP_PARALLEL_USE_TBB
# if defined(WINNT) && defined(__aarch64__) && !defined(TBB_USE_GCC_BUILTINS)
# define TBB_USE_GCC_BUILTINS 1
# endif
# include "RcppParallel/TBB.h"
#endif

Expand Down
Loading