Skip to content

Commit 6149954

Browse files
committed
Revert "Load the package library only if TBB is found"
This reverts commit 73b076e.
1 parent e4915a2 commit 6149954

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

R/hooks.R

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,15 @@ mallocDllInfo <- NULL
2222
}
2323
}
2424

25-
# load the package library if TBB library is found
26-
if (!is.null(dllInfo) | !is.null(mallocDllInfo)) {
27-
library.dynam("RcppParallel", pkgname, libname)
28-
} else {
29-
warning("Please install TBB library and reload the package!")
30-
}
25+
# load the package library
26+
library.dynam("RcppParallel", pkgname, libname)
27+
3128
}
3229

3330
.onUnload <- function(libpath) {
3431

3532
# unload the package library
36-
if (!is.null(dllInfo) | !is.null(mallocDllInfo))
37-
library.dynam.unload("RcppParallel", libpath)
33+
library.dynam.unload("RcppParallel", libpath)
3834

3935
# unload tbb if we loaded it
4036
if (!is.null(dllInfo))

0 commit comments

Comments
 (0)