Skip to content

Commit d637cbe

Browse files
authored
clarify tbb install log messages (#259)
'no tbb libraries found' referred only to shared libraries eligible for copying, and read as contradicting the subsequent 'creating tbb stub library (from static tbb)' on toolchains providing only a static TBB. Say 'runtime libraries' for the copy step, and consistently refer to the stub as the 'tbb.dll stub', noting what it is built from.
1 parent b26d7cd commit d637cbe

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

src/install.libs.R

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
if (.Platform$OS.type == "windows" && TBB_ENABLED) {
8484
tbbDll <- file.path(tbbDest, "tbb.dll")
8585
if (file.exists(tbbDll)) {
86-
writeLines("** tbb.dll already exists; skipping tbb stub library")
86+
writeLines("** tbb.dll already exists; skipping tbb.dll stub")
8787
} else {
8888
buildTbbStub(tbbDest)
8989
}
@@ -108,17 +108,17 @@ buildTbbStub <- function(tbbDest) {
108108

109109
# with oneTBB, the stub provides the old TBB ABI's
110110
# task_scheduler_observer entry point on top of the new runtime
111-
writeLines("** creating tbb stub library")
111+
writeLines("** creating tbb.dll stub (wrapping the oneTBB runtime)")
112112
status <- system("R CMD SHLIB -o tbb-compat/tbb.dll tbb-compat/tbb-compat.cpp")
113113
if (status != 0)
114-
stop("error building tbb stub library")
114+
stop("error building tbb.dll stub")
115115

116116
} else {
117117

118118
# with older versions of TBB (e.g. Rtools42), tbb-compat.cpp cannot
119119
# build -- there is no oneTBB runtime to wrap -- but the static
120120
# library already provides the old ABI, so re-export it wholesale
121-
writeLines("** creating tbb stub library (from static tbb)")
121+
writeLines("** creating tbb.dll stub (re-exporting the static tbb library)")
122122

123123
tbbLib <- Sys.getenv("TBB_LIB")
124124
if (!nzchar(tbbLib))
@@ -137,7 +137,7 @@ buildTbbStub <- function(tbbDest) {
137137
writeLines(command)
138138
status <- system(command)
139139
if (status != 0)
140-
stop("error building tbb stub library")
140+
stop("error building tbb.dll stub")
141141

142142
}
143143

@@ -151,10 +151,10 @@ buildTbbStub <- function(tbbDest) {
151151
# provenance easy to spot in installation logs.
152152
logTbbLibraries <- function(tbbLibs, source) {
153153
if (length(tbbLibs)) {
154-
fmt <- "** copying tbb libraries from '%s' [%s]"
154+
fmt <- "** copying tbb runtime libraries from '%s' [%s]"
155155
writeLines(sprintf(fmt, source, paste(basename(tbbLibs), collapse = ", ")))
156156
} else {
157-
writeLines(sprintf("** no tbb libraries found in '%s'", source))
157+
writeLines(sprintf("** no tbb runtime libraries found in '%s'", source))
158158
}
159159
}
160160

0 commit comments

Comments
 (0)