Merge pull request #6102 from Rdatatable/use-atime-test-funs

use atime_test/atime_test_list to define performance tests
Rdatatable · Apr 30, 2024 · 0b081ae · 0b081ae
2 parents e04d801 + 77917ad
commit 0b081ae
Showing 1 changed file with 81 additions and 83 deletions.
diff --git a/.ci/atime/tests.R b/.ci/atime/tests.R
@@ -1,59 +1,3 @@
-# A function to customize R package metadata and source files to facilitate version-specific installation and testing.
-#
-# This is specifically tailored for handling data.table which requires specific changes in non-standard files (such as the object file name in Makevars and version checking code in onLoad.R)
-# to support testing across different versions (base and HEAD for PRs, commits associated with historical regressions, etc.) of the package.
-# It appends a SHA1 hash to the package name (PKG.SHA), ensuring each version can be installed and tested separately.
-#
-# @param old.Package Current name of the package.
-# @param new.Package New name of the package, including a SHA hash.
-# @param sha SHA1 hash used for differentiating versions.
-# @param new.pkg.path Path to the package files.
-#
-# @details
-# The function modifies:
-# - DESCRIPTION, updating the package name.
-# - Makevars, customizing the shared object file name and adjusting the build settings.
-# - R/onLoad.R, adapting custom version checking for package loading operations.
-# - NAMESPACE, changing namespace settings for dynamic linking.
-#
-# @examples
-# pkg.edit.fun("data.table", "data.table.some_SHA1_hash", "some_SHA1_hash", "/path/to/data.table")
-#
-# @return None (performs in-place file modifications)
-# @note This setup is typically unnecessary for most packages but essential for data.table due to its unique configuration.
-pkg.edit.fun = function(old.Package, new.Package, sha, new.pkg.path) {
-      pkg_find_replace <- function(glob, FIND, REPLACE) {
-        atime::glob_find_replace(file.path(new.pkg.path, glob), FIND, REPLACE)
-      }
-      Package_regex <- gsub(".", "_?", old.Package, fixed = TRUE)
-      Package_ <- gsub(".", "_", old.Package, fixed = TRUE)
-      new.Package_ <- paste0(Package_, "_", sha)
-      pkg_find_replace(
-        "DESCRIPTION",
-        paste0("Package:\\s+", old.Package),
-        paste("Package:", new.Package))
-      pkg_find_replace(
-        file.path("src", "Makevars.*in"),
-        Package_regex,
-        new.Package_)
-      pkg_find_replace(
-        file.path("R", "onLoad.R"),
-        Package_regex,
-        new.Package_)
-      pkg_find_replace(
-        file.path("R", "onLoad.R"),
-        sprintf('packageVersion\\("%s"\\)', old.Package),
-        sprintf('packageVersion\\("%s"\\)', new.Package))
-      pkg_find_replace(
-        file.path("src", "init.c"),
-        paste0("R_init_", Package_regex),
-        paste0("R_init_", gsub("[.]", "_", new.Package_)))
-      pkg_find_replace(
-        "NAMESPACE",
-        sprintf('useDynLib\\("?%s"?', Package_regex),
-        paste0('useDynLib(', new.Package_))
-    }
-
 # A list of performance tests.
 #
 # Each entry in this list corresponds to a performance test and contains a sublist with three mandatory arguments:
@@ -66,61 +10,115 @@ pkg.edit.fun = function(old.Package, new.Package, sha, new.pkg.path) {
 #
 # Optional parameters that may be useful to configure tests:
 # - times: Number of times each expression is evaluated (default is 10).
-# - seconds.limit: The maximum median timing (in seconds) of an expression. No timings for larger N are computed past that threshold.
-# - sha.vec: Named character vector or a list of vectors that specify data.table-specific commit SHAs for testing across those different git commit versions.
-#            For historical regressions, use 'Before', 'Regression', and 'Fixed' (otherwise something like 'Slow' or 'Fast' ideally).
+# - seconds.limit: The maximum median timing (in seconds) of an expression. No timings for larger N are computed past that threshold. Default of 0.01 seconds should be sufficient for most tests.
+# - Historical references (short version name = commit SHA1).
+#   For historical regressions, use version names 'Before', 'Regression', and 'Fixed'
+#   When there was no regression, use 'Slow' and 'Fast' 
 # @note Please check https://github.com/tdhock/atime/blob/main/vignettes/data.table.Rmd for more information.
 # nolint start: undesirable_operator_linter. ':::' needed+appropriate here.
-test.list <- list(
+test.list <- atime::atime_test_list(
+  # A function to customize R package metadata and source files to facilitate version-specific installation and testing.
+  #
+  # This is specifically tailored for handling data.table which requires specific changes in non-standard files (such as the object file name in Makevars and version checking code in onLoad.R)
+  # to support testing across different versions (base and HEAD for PRs, commits associated with historical regressions, etc.) of the package.
+  # It appends a SHA1 hash to the package name (PKG.SHA), ensuring each version can be installed and tested separately.
+  #
+  # @param old.Package Current name of the package.
+  # @param new.Package New name of the package, including a SHA hash.
+  # @param sha SHA1 hash used for differentiating versions.
+  # @param new.pkg.path Path to the package files.
+  #
+  # @details
+  # The function modifies:
+  # - DESCRIPTION, updating the package name.
+  # - Makevars, customizing the shared object file name and adjusting the build settings.
+  # - R/onLoad.R, adapting custom version checking for package loading operations.
+  # - NAMESPACE, changing namespace settings for dynamic linking.
+  #
+  # @examples
+  # pkg.edit.fun("data.table", "data.table.some_SHA1_hash", "some_SHA1_hash", "/path/to/data.table")
+  #
+  # @return None (performs in-place file modifications)
+  # @note This setup is typically unnecessary for most packages but essential for data.table due to its unique configuration.
+  pkg.edit.fun = function(old.Package, new.Package, sha, new.pkg.path) {
+    pkg_find_replace <- function(glob, FIND, REPLACE) {
+      atime::glob_find_replace(file.path(new.pkg.path, glob), FIND, REPLACE)
+    }
+    Package_regex <- gsub(".", "_?", old.Package, fixed = TRUE)
+    Package_ <- gsub(".", "_", old.Package, fixed = TRUE)
+    new.Package_ <- paste0(Package_, "_", sha)
+    pkg_find_replace(
+      "DESCRIPTION",
+      paste0("Package:\\s+", old.Package),
+      paste("Package:", new.Package))
+    pkg_find_replace(
+      file.path("src", "Makevars.*in"),
+      Package_regex,
+      new.Package_)
+    pkg_find_replace(
+      file.path("R", "onLoad.R"),
+      Package_regex,
+      new.Package_)
+    pkg_find_replace(
+      file.path("R", "onLoad.R"),
+      sprintf('packageVersion\\("%s"\\)', old.Package),
+      sprintf('packageVersion\\("%s"\\)', new.Package))
+    pkg_find_replace(
+      file.path("src", "init.c"),
+      paste0("R_init_", Package_regex),
+      paste0("R_init_", gsub("[.]", "_", new.Package_)))
+    pkg_find_replace(
+      "NAMESPACE",
+      sprintf('useDynLib\\("?%s"?', Package_regex),
+      paste0('useDynLib(', new.Package_))
+  },
+
   # Performance regression discussed in: https://github.com/Rdatatable/data.table/issues/4311
   # Fixed in: https://github.com/Rdatatable/data.table/pull/4440
-  "shallow regression fixed in #4440" = list(
-    pkg.edit.fun = pkg.edit.fun,
+  "shallow regression fixed in #4440" = atime::atime_test(
     N = 10^seq(3,8),
-    setup = quote({
+    setup = {
       set.seed(1L)
       dt <- data.table(a = sample.int(N))
       setindexv(dt, "a")
-    }),
-    expr = quote(data.table:::shallow(dt)),
+    },
+    expr = data.table:::shallow(dt),
     # Before = "", This needs to be updated later as there are two issues here: A) The source of regression (or the particular commit that led to it) is not clear; B) Older versions of data.table are having problems when being installed in this manner (This includes commits from before March 20 2020, when the issue that discovered or first mentioned the regression was created)
     Regression = "b1b1832b0d2d4032b46477d9fe6efb15006664f4", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/0f0e7127b880df8459b0ed064dc841acd22f5b73) in the PR (https://github.com/Rdatatable/data.table/pull/4440/commits) that fixes the regression
     Fixed = "9d3b9202fddb980345025a4f6ac451ed26a423be"), # Merge commit in the PR that fixed the regression (https://github.com/Rdatatable/data.table/pull/4440)
 
   # Test based on: https://github.com/Rdatatable/data.table/issues/5424
   # Performance regression introduced from a commit in: https://github.com/Rdatatable/data.table/pull/4491
   # Fixed in: https://github.com/Rdatatable/data.table/pull/5463
-  "memrecycle regression fixed in #5463" = list(
-    pkg.edit.fun = pkg.edit.fun,
+  "memrecycle regression fixed in #5463" = atime::atime_test(
     N = 10^seq(3, 8),
-    setup = quote({
+    setup = {
       n <- N/100
       set.seed(2L)
       dt <- data.table(
         g = sample(seq_len(n), N, TRUE),
         x = runif(N),
         key = "g")
       dt_mod <- copy(dt)
-    }),
-    expr = quote(data.table:::`[.data.table`(dt_mod, , N := .N, by = g)),
+    },
+    expr = data.table:::`[.data.table`(dt_mod, , N := .N, by = g),
     Before = "be2f72e6f5c90622fe72e1c315ca05769a9dc854", # Parent of the regression causing commit (https://github.com/Rdatatable/data.table/commit/e793f53466d99f86e70fc2611b708ae8c601a451) in the PR that introduced the issue (https://github.com/Rdatatable/data.table/pull/4491/commits)
     Regression = "e793f53466d99f86e70fc2611b708ae8c601a451", # Commit responsible for regression in the PR that introduced the issue (https://github.com/Rdatatable/data.table/pull/4491/commits)
     Fixed = "58409197426ced4714af842650b0cc3b9e2cb842"), # Last commit in the PR that fixed the regression (https://github.com/Rdatatable/data.table/pull/5463/commits)
 
   # Issue reported in: https://github.com/Rdatatable/data.table/issues/5426
   # To be fixed in: https://github.com/Rdatatable/data.table/pull/5427
-  "setDT improved in #5427" = list(
-  pkg.edit.fun = pkg.edit.fun,
-  N = 10^seq(1, 7),
-  setup = quote({
-    L <- replicate(N, 1, simplify = FALSE)
-    setDT(L)
-  }),
-  expr = quote({
-    data.table:::setattr(L, "class", NULL)
-    data.table:::setDT(L)
-  }),
-  Slow = "c4a2085e35689a108d67dacb2f8261e4964d7e12", # Parent of the first commit in the PR that fixes the issue (https://github.com/Rdatatable/data.table/commit/7cc4da4c1c8e568f655ab5167922dcdb75953801)
-  Fast = "1872f473b20fdcddc5c1b35d79fe9229cd9a1d15") # Last commit in the PR that fixes the issue (https://github.com/Rdatatable/data.table/pull/5427/commits)
+  "setDT improved in #5427" = atime::atime_test(
+    N = 10^seq(1, 7),
+    setup = {
+      L <- replicate(N, 1, simplify = FALSE)
+      setDT(L)
+    },
+    expr = {
+      data.table:::setattr(L, "class", NULL)
+      data.table:::setDT(L)
+    },
+    Slow = "c4a2085e35689a108d67dacb2f8261e4964d7e12", # Parent of the first commit in the PR that fixes the issue (https://github.com/Rdatatable/data.table/commit/7cc4da4c1c8e568f655ab5167922dcdb75953801)
+    Fast = "1872f473b20fdcddc5c1b35d79fe9229cd9a1d15") # Last commit in the PR that fixes the issue (https://github.com/Rdatatable/data.table/pull/5427/commits)
 )
 # nolint end: undesirable_operator_linter.