Skip to content

Test performance regression for by with verbose set to TRUE #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Anirban166 merged 9 commits into from
Oct 3, 2024
Merged

Test performance regression for by with verbose set to TRUE #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fcaf5ee
Update tests.R
Anirban166 Jul 17, 2024
586c412
Update tests.R
Anirban166 Jul 18, 2024
6dd597e
Introduced the changes from #6296
Anirban166 Jul 18, 2024
1b3e2f3
Update tests.R
Anirban166 Jul 18, 2024
2dc2e49
Since by is an internal (not exported function)
Anirban166 Jul 18, 2024
9854be6
rm commit SHAs for Slow/Fast since the comment (https://github.com/Rd…
Anirban166 Jul 18, 2024
9cafc92
Wrote some comments, brought back 'Slow', and removed the other tests…
Anirban166 Jul 18, 2024
5c9ce3a
rm unnecessary quotes, fixed the commit SHA, added the missing comma
Anirban166 Jul 18, 2024
e59f716
Merge branch 'master' into test-by-verbose-arg-regression
Anirban166 Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .ci/atime/tests.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,16 @@ test.list <- atime::atime_test_list(
paste0('useDynLib(', new.Package_))
},

# Fixed in: https://github.com/Rdatatable/data.table/pull/5493 (off-branch)
# Merged to master in: https://github.com/Rdatatable/data.table/commit/2d1a0575f87cc50e90f64825c30d7a6cb6b05dd7
"transform improved in #5493" = atime::atime_test(
N = 10^seq(1, 20),
# Test case adapted from https://github.com/Rdatatable/data.table/issues/6286#issue-2412141289 which is where the issue was reported.
# Fixed in https://github.com/Rdatatable/data.table/pull/6296
"DT[by,verbose=TRUE] improved in #6296" = atime::atime_test(
setup = {
df <- data.frame(x = runif(N))
dt <- as.data.table(df)
dt = data.table(a = 1:N)
dt_mod <- copy(dt)
},
expr = data.table:::transform.data.table(dt, y = round(x)),
Slow = "0895fa247afcf6b38044bd5f56c0d209691ddb31",
Fast = "2d1a0575f87cc50e90f64825c30d7a6cb6b05dd7"),
expr = data.table:::`[.data.table`(dt_mod, , 1, by = a, verbose = TRUE),
Slow = "a01f00f7438daf4612280d6886e6929fa8c8f76e", # Parent of the first commit (https://github.com/Rdatatable/data.table/commit/fc0c1e76408c34a8482f16f7421d262c7f1bde32) in the PR (https://github.com/Rdatatable/data.table/pull/6296/commits) that fixes the issue
Fast = "f248bbe6d1204dfc8def62328788eaadcc8e17a1"), # Merge commit of the PR (https://github.com/Rdatatable/data.table/pull/6296) that fixes the issue

tests=extra.test.list)
# nolint end: undesirable_operator_linter.
3 changes: 3 additions & 0 deletions src/dogroups.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ SEXP dogroups(SEXP dt, SEXP dtcols, SEXP groups, SEXP grpcols, SEXP jiscols, SEX
int nprotect=0;
SEXP ans=NULL, jval, thiscol, BY, N, I, GRP, iSD, xSD, rownames, s, RHS, target, source;
Rboolean wasvector, firstalloc=FALSE, NullWarnDone=FALSE;

double tstart=0, tblock[10]={0}; int nblock[10]={0};

const bool verbose = LOGICAL(verboseArg)[0]==1;
const bool showProgress = LOGICAL(showProgressArg)[0]==1;
double tstart=0, tblock[10]={0}; int nblock[10]={0}; // For verbose printing, tstart is updated each block
Expand Down