tweaks for TBB auto-detection and handling

kevinushey · kevinushey · commit 640468165c05 · 2023-02-23T21:41:01.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,5 @@ revdep
 src-i386
 src-x64
 tbb.log
+
+R/tbb-autodetected.R
diff --git a/R/aaa.R b/R/aaa.R
@@ -0,0 +1,4 @@
+
+# stubs that get overridden via configure script
+TBB_LIB <- ""
+TBB_INC <- ""
diff --git a/R/tbb-autodetected.R.in b/R/tbb-autodetected.R.in
@@ -0,0 +1,3 @@
+
+TBB_LIB <- "@TBB_LIB@"
+TBB_INC <- "@TBB_INC@"
diff --git a/R/tbb.R b/R/tbb.R
@@ -53,8 +53,8 @@ tbbCxxFlags <- function() {
       flags <- c(flags, "-DRCPP_PARALLEL_USE_TBB=1")
    
    # if TBB_INC is set, apply those library paths
-   tbbInc <- Sys.getenv("TBB_INC", unset = NA)
-   if (!is.na(tbbInc)) {
+   tbbInc <- Sys.getenv("TBB_INC", unset = TBB_INC)
+   if (nzchar(tbbInc)) {
       
       # add include path
       flags <- c(flags, paste0("-I", asBuildPath(tbbInc)))
@@ -75,8 +75,8 @@ tbbCxxFlags <- function() {
 tbbLdFlags <- function() {
    
    # shortcut if TBB_LIB defined
-   tbbLib <- Sys.getenv("TBB_LIB", unset = NA)
-   if (!is.na(tbbLib)) {
+   tbbLib <- Sys.getenv("TBB_LIB", unset = TBB_LIB)
+   if (nzchar(tbbLib)) {
       fmt <- "-L%1$s -Wl,-rpath,%1$s -ltbb -ltbbmalloc"
       return(sprintf(fmt, asBuildPath(tbbLib)))
    }
@@ -96,8 +96,8 @@ tbbLdFlags <- function() {
 
 tbbRoot <- function() {
    
-   # TODO: rstan
-   # parts <- c("libs", if (nzchar(rArch)) rArch, "tbb")
+   if (nzchar(TBB_LIB))
+      return(TBB_LIB)
    
    rArch <- .Platform$r_arch
    parts <- c("lib", if (nzchar(rArch)) rArch)
diff --git a/inst/include/.gitignore b/inst/include/.gitignore
@@ -1,6 +1,7 @@
 
 # These TBB libraries are copied in at configure time.
 /index.html
+/oneapi
 /serial
 /tbb
 
diff --git a/inst/tests/runit.distance.R b/inst/tests/runit.distance.R
@@ -1,14 +1,18 @@
 
+library(Rcpp)
+library(RUnit)
+
 sourceCpp(system.file("tests/cpp/distance.cpp", package = "RcppParallel")) 
 
 test.distance <- function() {
    
-   n  = 1000
-   m = matrix(runif(n*10), ncol = 10)
-   m = m/rowSums(m)
+   n <- 1000
+   m <- matrix(runif(n*10), ncol = 10)
+   m <- m/rowSums(m)
    
    checkEquals(
       rcpp_js_distance(m), 
       rcpp_parallel_js_distance(m)
    )
+   
 }
diff --git a/inst/tests/runit.innerproduct.R b/inst/tests/runit.innerproduct.R
@@ -1,4 +1,7 @@
 
+library(Rcpp)
+library(RUnit)
+
 sourceCpp(system.file("tests/cpp/innerproduct.cpp", package = "RcppParallel"))
 
 test.innerproduct <- function() {
@@ -10,4 +13,5 @@ test.innerproduct <- function() {
       innerProduct(x, y), 
       parallelInnerProduct(x, y)
    )
+   
 }
diff --git a/inst/tests/runit.sum.R b/inst/tests/runit.sum.R
@@ -1,4 +1,7 @@
 
+library(Rcpp)
+library(RUnit)
+
 sourceCpp(system.file("tests/cpp/sum.cpp", package = "RcppParallel"))
 
 test.sum <- function() {
diff --git a/inst/tests/runit.transform.R b/inst/tests/runit.transform.R
@@ -1,4 +1,7 @@
 
+library(Rcpp)
+library(RUnit)
+
 sourceCpp(system.file("tests/cpp/transform.cpp", package = "RcppParallel"))
 
 test.transform <- function() {
diff --git a/src/Makevars.in b/src/Makevars.in
@@ -1,38 +1,17 @@
 
 PKG_CXXFLAGS = @CXX11STD@
 
-# If TBB_ROOT is defined, use it.
-ifdef TBB_ROOT
-
-	ifndef TBB_LIB
-		TBB_LIB = $(TBB_ROOT)/lib
-	endif
-
-	ifndef TBB_INC
-		TBB_INC = $(TBB_ROOT)/include
-	endif
-
-endif
-
-# If TBB_LIB is not defined, try to use autodetection
-ifndef TBB_LIB
-	TBB_LIB = @TBB_LIB_AUTO@
-	TBB_INC = @TBB_INC_AUTO@
-endif
-
-# If TBB_LIB is defined but TBB_INC is not, make a guess.
-ifdef TBB_LIB
-	ifndef TBB_INC
-		TBB_INC = $(TBB_LIB)/../include
-	endif
-endif
+TBB_LIB = @TBB_LIB@
+TBB_INC = @TBB_INC@
 
+# If TBB_INC is defined, include those library paths.
 ifdef TBB_INC
 	PKG_CPPFLAGS = -I../inst/include -I$(TBB_INC)
 else
 	PKG_CPPFLAGS = -I../inst/include
 endif
 
+# If TBB_LIB is defined, link to that explicitly.
 ifdef TBB_LIB
 	PKG_LIBS = -Wl,-L,"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -ltbb -ltbbmalloc
 endif
diff --git a/tools/config/configure.R b/tools/config/configure.R
@@ -132,23 +132,81 @@ if (Sys.info()[["sysname"]] == "SunOS") {
    }
 }
 
-# tbb autodetection on Unix
-define(TBB_LIB_AUTO = "", TBB_INC_AUTO = "")
-if (.Platform$OS.type == "unix") {
-   tbbLib <- Sys.glob(c(
-      "/usr/*/libtbb.so",
-      "/usr/*/*/libtbb.so",
-      "/usr/*/*/*/libtbb.so"
-   ))
-   tbbInc <- Sys.glob(c(
-      "/usr/include/tbb.h",
-      "/usr/include/*/tbb.h"
-   ))
-   if (length(tbbLib) && length(tbbInc)) {
-      define(
-         TBB_LIB_AUTO = dirname(tbbLib[1]),
-         TBB_INC_AUTO = dirname(tbbInc[1])
-      )
+# try and figure out path to TBB
+tbbRoot <- Sys.getenv("TBB_ROOT", unset = NA)
+tbbLib  <- Sys.getenv("TBB_LIB", unset = NA)
+tbbInc  <- Sys.getenv("TBB_INC", unset = NA)
+
+# check TBB_ROOT first if defined
+if (!is.na(tbbRoot)) {
+   
+   if (is.na(tbbLib)) {
+      tbbLib <- file.path(tbbRoot, "lib")
+   }
+   
+   if (is.na(tbbInc)) {
+      tbbInc <- file.path(tbbRoot, "include")
+   }
+   
+}
+
+# if TBB_LIB is defined, guess TBB_INC
+if (!is.na(tbbLib) && is.na(tbbInc)) {
+   tbbIncCandidate <- file.path(tbbLib, "../include")
+   if (file.exists(tbbIncCandidate)) {
+      tbbInc <- normalizePath(tbbIncCandidate)
+   }
+}
+
+# if TBB_LIB and TBB_INC are still not defined, try auto-detecting
+tryAutoDetect <-
+   .Platform$OS.type == "unix" &&
+   Sys.getenv("TBB_AUTODETECT", unset = "TRUE") == "TRUE" &&
+   is.na(tbbLib) &&
+   is.na(tbbInc)
+
+if (tryAutoDetect) {
+   
+   sysInfo <- as.list(Sys.info())
+   
+   homebrewPrefix <- if (sysInfo$sysname == "Darwin") {
+      "/opt/homebrew"
+   } else {
+      "/usr/local"
    }
+   
+   tbbLibSearch <- if (sysInfo$sysname == "Darwin") {
+      file.path(homebrewPrefix, "opt/tbb/lib/libtbb.dylib")
+   } else {
+      Sys.glob(c(
+         "/usr/*/libtbb.so",
+         "/usr/*/*/libtbb.so",
+         "/usr/*/*/*/libtbb.so"
+      ))
+   }
+   
+   tbbIncSearch <- if (sysInfo$sysname == "Darwin") {
+      file.path(homebrewPrefix, "opt/tbb/include/tbb")
+   } else {
+      Sys.glob(c(
+         "/usr/include/tbb.h",
+         "/usr/include/*/tbb.h"
+      ))
+   }
+   
+   if (length(tbbLibSearch) &&
+       length(tbbIncSearch) &&
+       file.exists(tbbLibSearch[[1L]]) &&
+       file.exists(tbbIncSearch[[1L]]))
+   {
+      tbbLib <- dirname(tbbLibSearch[[1L]])
+      tbbInc <- dirname(tbbIncSearch[[1L]])
+   }
+   
 }
 
+# now, define TBB_LIB and TBB_INC as appropriate
+define(
+   TBB_LIB = if (!is.na(tbbLib)) tbbLib else "",
+   TBB_INC = if (!is.na(tbbInc)) tbbInc else ""
+)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+`
	`2`	`+TBB_LIB <- "@TBB_LIB@"`
	`3`	`+TBB_INC <- "@TBB_INC@"`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 # These TBB libraries are copied in at configure time.
 /index.html
 +/oneapi
 /serial
 /tbb
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`
	`2`	`+library(Rcpp)`
	`3`	`+library(RUnit)`
	`4`	`+`
`2`	`5`	`sourceCpp(system.file("tests/cpp/innerproduct.cpp", package = "RcppParallel"))`
`3`	`6`
`4`	`7`	`test.innerproduct <- function() {`
`@@ -10,4 +13,5 @@ test.innerproduct <- function() {`
`10`	`13`	`innerProduct(x, y),`
`11`	`14`	`parallelInnerProduct(x, y)`
`12`	`15`	`)`
	`16`	`+`
`13`	`17`	`}`