Fix OpenMP+BLAS linking on macOS

Author: t-kalinowski

R/compiler.R

@@ -94,11 +94,13 @@ quickr_fcompiler_env <- function(
     quickr_env_is_true("QUICKR_PREFER_FLANG"),
   write_lines = writeLines,
   sysname = Sys.info()[["sysname"]],
-  use_openmp = FALSE
+  use_openmp = FALSE,
+  link_flags = character()
 ) {
   stopifnot(is.character(build_dir), length(build_dir) == 1L, nzchar(build_dir))
 
   use_openmp <- isTRUE(use_openmp)
+  link_flags <- link_flags[nzchar(link_flags)]
 
   flang <- ""
   flang_runtime <- character()
@@ -151,7 +153,10 @@ quickr_fcompiler_env <- function(
         }
       )
     },
-    if (use_openmp) openmp_makevars_lines()
+    if (use_openmp) openmp_makevars_lines(),
+    if (length(link_flags)) {
+      paste("PKG_LIBS +=", paste(link_flags, collapse = " "))
+    }
   )
   write_lines(
     makevars_lines,

R/quick.R

@@ -234,19 +234,21 @@ compile <- function(fsub, build_dir = tempfile(paste0(fsub@name, "-build-"))) {
   link_flags <- c(LAPACK_LIBS, BLAS_LIBS, FLIBS)
 
   suppressWarnings({
-    r_args <- c(
+    use_openmp <- isTRUE(attr(fsub@scope, "uses_openmp", exact = TRUE))
+    env <- quickr_fcompiler_env(
+      build_dir = build_dir,
+      use_openmp = use_openmp,
+      link_flags = link_flags
+    )
+    r_args_base <- c(
       "CMD SHLIB --use-LTO",
       "-o",
       dll_path,
       fsub_path,
-      c_wrapper_path,
-      link_flags
-    )
-    use_openmp <- isTRUE(attr(fsub@scope, "uses_openmp", exact = TRUE))
-    env <- quickr_fcompiler_env(
-      build_dir = build_dir,
-      use_openmp = use_openmp
+      c_wrapper_path
     )
+    r_args_libs <- c(r_args_base, link_flags)
+    r_args <- if (length(env)) r_args_base else r_args_libs
     result <- system2(
       R.home("bin/R"),
       r_args,
@@ -257,7 +259,7 @@ compile <- function(fsub, build_dir = tempfile(paste0(fsub@name, "-build-"))) {
     if (!is.null(attr(result, "status")) && length(env)) {
       result2 <- system2(
         R.home("bin/R"),
-        r_args,
+        r_args_libs,
         stdout = TRUE,
         stderr = TRUE
       )

tests/testthat/test-parallel-declare.R

@@ -161,3 +161,24 @@ test_that("parallel declarations do not cross control flow boundaries", {
     regexp = "parallel\\(\\)/omp\\(\\) must be followed by a for-loop or sapply\\(\\)"
   )
 })
+
+test_that("openmp functions that use BLAS load and run", {
+  openmp_supported_or_skip()
+
+  blas_parallel <- function(x, n) {
+    declare(
+      type(x = double(n, n)),
+      type(n = integer(1)),
+      type(out = double(n, n))
+    )
+    declare(parallel())
+    for (i in seq_len(1L)) {
+      out <- x %*% x
+    }
+    out
+  }
+
+  set.seed(123)
+  x <- matrix(runif(16), nrow = 4)
+  expect_quick_equal(blas_parallel, list(x, 4L))
+})