File tree Expand file tree Collapse file tree 2 files changed +2
-6
lines changed Expand file tree Collapse file tree 2 files changed +2
-6
lines changed Original file line number Diff line number Diff line change @@ -28,10 +28,6 @@ loadTbbLibrary <- function(name) {
28
28
.tbbMallocDllInfo <<- loadTbbLibrary(" tbbmalloc" )
29
29
30
30
# load RcppParallel library if available
31
- # (work around https://github.com/r-lib/devtools/issues/2343)
32
- if (! file.exists(file.path(libname , pkgname , " lib" )))
33
- return ()
34
-
35
31
.dllInfo <<- library.dynam(" RcppParallel" , pkgname , libname )
36
32
37
33
}
@@ -49,5 +45,5 @@ loadTbbLibrary <- function(name) {
49
45
# unload tbb if we loaded it
50
46
if (! is.null(.tbbDllInfo ))
51
47
dyn.unload(.tbbDllInfo [[" path" ]])
52
-
48
+
53
49
}
Original file line number Diff line number Diff line change 11
11
12
12
# copy tbb
13
13
# TODO: use 'dest' library directory once rstan is updated
14
- tbbDest <- file.path( R_PACKAGE_DIR , " lib" , R_ARCH )
14
+ tbbDest <- paste0( " ../inst/ lib" , R_ARCH )
15
15
dir.create(tbbDest , recursive = TRUE , showWarnings = FALSE )
16
16
17
17
# check for bundled vs. system tbb
You can’t perform that action at this time.
0 commit comments