remove conda

Author: traversc

.github/workflows/linux.yml

@@ -68,3 +68,52 @@ jobs:
         env:
           QS_EXTENDED_TESTS: "1"
         run: ctest --test-dir build --output-on-failure -V
+
+  rcppparallel-flow-compat:
+    name: Ubuntu (RcppParallel ${{ matrix.label }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - label: classic TBB
+            variant: classic
+            expected_api: source_node
+            install_system_tbb: "false"
+          - label: system oneTBB
+            variant: onetbb
+            expected_api: input_node
+            install_system_tbb: "true"
+
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Install system oneTBB
+        if: matrix.install_system_tbb == 'true'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y pkg-config libtbb-dev
+
+      - name: Export system TBB paths
+        if: matrix.install_system_tbb == 'true'
+        run: |
+          echo "TBB_INC=$(pkg-config --variable=includedir tbb)" >> "$GITHUB_ENV"
+          echo "TBB_LIB=$(pkg-config --variable=libdir tbb)" >> "$GITHUB_ENV"
+
+      - name: Set up R
+        uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - name: Install Rcpp and RcppParallel
+        run: Rscript tests/rcpp/install_rcppparallel.R "${{ matrix.variant }}"
+
+      - name: Run flow-graph compatibility probe
+        run: |
+          Rscript tests/rcpp/tbb_flow_compat.R \
+            "${{ matrix.expected_api }}"

.gitignore

@@ -39,5 +39,3 @@ perf.data*
 core
 core.*
 docs/tmp/*
-tests/rcpp/.conda-envs/
-tests/rcpp/.conda-pkgs/

CMakeLists.txt

@@ -121,20 +121,4 @@ if(QDATA_BUILD_TESTS)
                 $<TARGET_FILE:qdata_roundtrip_file>
                 $<TARGET_FILE:qdata_roundtrip_memory>
     )
-    find_program(CONDA_EXECUTABLE conda QUIET)
-    if(CONDA_EXECUTABLE)
-        set(QDATA_RCPP_TEST_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/tests/rcpp/run_flow_compat_test.sh)
-        add_test(
-            NAME qdata_rcppparallel_flow_compat
-            COMMAND bash
-                    ${QDATA_RCPP_TEST_SCRIPT}
-                    ${CONDA_EXECUTABLE}
-        )
-        set_tests_properties(
-            PROPERTIES
-            TIMEOUT 1800
-        )
-    else()
-        message(STATUS "conda not found; skipping RcppParallel conda-backed tests")
-    endif()
 endif()

Makefile

@@ -7,7 +7,6 @@ QS_EXTENDED_TESTS ?= 1
 ROWS ?=
 REPS ?=
 LICENSE_DIR ?= LICENSES
-RCPP_TEST_ENVS_DIR ?= tests/rcpp/.conda-envs
 
 BENCH_ARGS :=
 ifneq ($(strip $(ROWS)),)
@@ -17,7 +16,7 @@ ifneq ($(strip $(REPS)),)
 BENCH_ARGS += $(REPS)
 endif
 
-.PHONY: all configure example bench benchmark benchmark-build test test-extended test-rcpp-parallel get-license-files clean distclean
+.PHONY: all configure example bench benchmark benchmark-build test test-extended get-license-files clean distclean
 
 all: configure
 	$(CMAKE) --build $(BUILD_DIR)
@@ -43,10 +42,6 @@ test-extended: configure
 	$(CMAKE) --build $(BUILD_DIR)
 	QS_EXTENDED_TESTS=$(QS_EXTENDED_TESTS) $(CTEST) --test-dir $(BUILD_DIR) $(CTEST_FLAGS)
 
-test-rcpp-parallel: configure
-	$(CTEST) --test-dir $(BUILD_DIR) $(CTEST_FLAGS) -R '^qdata_rcppparallel_flow_compat$$'
-
-
 get-license-files:
 	@mkdir -p $(LICENSE_DIR)
 	curl -fsSL https://www.gnu.org/licenses/gpl-3.0.txt -o LICENSE
@@ -55,10 +50,6 @@ get-license-files:
 
 clean:
 	@if [ -d "$(BUILD_DIR)" ]; then $(CMAKE) --build $(BUILD_DIR) --target clean; fi
-	@if [ -d "$(RCPP_TEST_ENVS_DIR)" ]; then $(CMAKE) -E rm -rf "$(RCPP_TEST_ENVS_DIR)"; fi
-	@if [ -d "tests/rcpp/.conda-pkgs" ]; then $(CMAKE) -E rm -rf "tests/rcpp/.conda-pkgs"; fi
 
 distclean:
 	$(CMAKE) -E rm -rf $(BUILD_DIR)
-	$(CMAKE) -E rm -rf $(RCPP_TEST_ENVS_DIR)
-	$(CMAKE) -E rm -rf tests/rcpp/.conda-pkgs

README.md

@@ -42,6 +42,10 @@ int main() {
 The test suite is driven through `Rscript` and requires the `qs2`, `stringi`,
 and `stringfish` packages when `QDATA_BUILD_TESTS=ON`.
 
+The RcppParallel flow-graph compatibility probe runs in Linux CI only. It
+covers both the bundled classic TBB path and an external system oneTBB path
+configured through `TBB_INC` and `TBB_LIB`.
+
 ## Core qdata types
 
 qdata is built around a small set of data types:

environment.yml

@@ -0,0 +1,26 @@
+args <- commandArgs(TRUE)
+stopifnot(length(args) == 1L)
+
+variant <- args[[1]]
+repos <- c(CRAN = "https://cloud.r-project.org")
+ncpus <- max(1L, parallel::detectCores())
+
+if (identical(variant, "classic")) {
+  Sys.unsetenv(c("TBB", "TBB_ROOT", "TBB_INC", "TBB_LIB", "TBB_LINK_LIB", "TBB_AUTODETECT"))
+} else if (identical(variant, "onetbb")) {
+  Sys.unsetenv("TBB_AUTODETECT")
+  required <- c("TBB_INC", "TBB_LIB")
+  missing <- required[!nzchar(Sys.getenv(required))]
+  if (length(missing) > 0L) {
+    stop("Missing required environment variables: ", paste(missing, collapse = ", "))
+  }
+} else {
+  stop("Unknown variant: ", variant)
+}
+
+message("Installing RcppParallel variant: ", variant)
+install.packages("Rcpp", repos = repos, Ncpus = ncpus)
+install.packages("RcppParallel", repos = repos, type = "source", Ncpus = ncpus)
+
+pkgs <- c("Rcpp", "RcppParallel")
+stopifnot(all(vapply(pkgs, requireNamespace, logical(1), quietly = TRUE)))