Skip to content

Fix for Intel compiler bug #3648

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
merged 2 commits into from
Jun 19, 2019
Merged

Fix for Intel compiler bug #3648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99b2d26
proposal for #3647
hroptatyr Jun 18, 2019
b4e0981
tweak to fix, and news item
mattdowle Jun 19, 2019
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
3 changes: 2 additions & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
# TRUE
```


#### BUG FIXES

1. `first`, `last`, `head` and `tail` by group no longer error in some cases, [#2030](https://github.com/Rdatatable/data.table/issues/2030) [#3462](https://github.com/Rdatatable/data.table/issues/3462). Thanks to @franknarf1 for reporting.
Expand Down Expand Up @@ -189,6 +188,8 @@
# 2: 2 a
```

23. Incorrect sorting/grouping results due to a bug in Intel's `icc` compiler 2019 (Version 19.0.4.243 Build 20190416) has been worked around thanks to a report and fix by Sebastian Freundt, [#3647](https://github.com/Rdatatable/data.table/issues/3647). Please run `data.table::test.data.table()`. If that passes, your installation does not have the problem.

#### NOTES

1. `rbindlist`'s `use.names="check"` now emits its message for automatic column names (`"V[0-9]+"`) too, [#3484](https://github.com/Rdatatable/data.table/pull/3484). See news item 5 of v1.12.2 below.
Expand Down
10 changes: 6 additions & 4 deletions src/forder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,10 +900,12 @@ void radix_r(const int from, const int to, const int radix) {
TEND(10)
if (sortType!=0) {
// Always ascending sort here (even when sortType==-1) because descending was prepared in write_key
my_counts[my_key[0]] = 1;
int i=1;
while (skip && i<my_n) { my_counts[my_key[i]]++; skip=(my_key[i]>=my_key[i-1]); i++; }
while (i<my_n) { my_counts[my_key[i]]++; i++; } // as soon as not-ordered is detected (likely quickly when it isn't sorted), save the >= comparison
for (int i=0; i<my_n; ++i) my_counts[my_key[i]]++; // minimal branch-free loop first, #3647
for (int i=1; i<my_n; ++i) {
if (my_key[i]<my_key[i-1]) { skip=false; break; }
// stop early as soon as not-ordered is detected; likely quickly when it isn't sorted
// otherwise, it's worth checking if it is ordered because skip saves time later
}
TEND(11)
} else {
for (int i=0; i<my_n; i++) {
Expand Down