Skip to content

Fixes bug with nested OpenMP, fixed task threshold, extended tests range #167

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 3 commits into from
Oct 4, 2024
Merged

Fixes bug with nested OpenMP, fixed task threshold, extended tests range #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13ea0fd
Added taskwait, fixed task threshold and extended tests
sterrettm2 Oct 1, 2024
dceb53b
Updated SPR-icpx CI workflow
sterrettm2 Oct 2, 2024
5cc9216
CI: use intel-ubuntu-24.04
Sep 6, 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
4 changes: 2 additions & 2 deletions .github/workflows/build-numpy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
np-multiarray-tgl:

if: github.repository == 'intel/x86-simd-sort'
runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- name: Checkout x86-simd-sort
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
np-multiarray-spr:

if: github.repository == 'intel/x86-simd-sort'
runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- name: Checkout x86-simd-sort
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/c-cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions: read-all
jobs:
SKL-gcc9:

runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:

SKX-gcc10:

runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:

TGL-gcc11:

runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:

SPR-gcc13:

runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:

SKX-SKL-openmp:

runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:

SPR-gcc13-special-cases:

runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:

manylinux-32bit:

runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -216,7 +216,7 @@ jobs:

SPR-icpx:

runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -226,8 +226,7 @@ jobs:
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
sudo add-apt-repository -y "deb https://apt.repos.intel.com/oneapi all main"
sudo apt update --allow-insecure-repositories
sudo apt --allow-unauthenticated -y install intel-oneapi-compiler-dpcpp-cpp libgtest-dev curl git python3-pip
sudo pip3 install meson ninja
sudo apt --allow-unauthenticated -y install intel-oneapi-compiler-dpcpp-cpp libgtest-dev curl git python3-pip meson

- name: Install Intel SDE
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions: read-all
jobs:
clang-format:

runs-on: intel-ubuntu-latest
runs-on: intel-ubuntu-24.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

name: Scorecard analysis
if: github.repository == 'intel/x86-simd-sort'
runs-on: ubuntu-latest
runs-on: intel-ubuntu-24.04
permissions:
# Needed to upload the results to code-scanning dashboard.
security-events: write
Expand Down
9 changes: 7 additions & 2 deletions src/xss-common-keyvaluesort.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,9 +559,14 @@ X86_SIMD_SORT_INLINE void xss_qsort_kv(
keys, indexes, 0, arrsize - 1, maxiters, task_threshold);
}
else {
kvsort_<keytype, valtype>(
keys, indexes, 0, arrsize - 1, maxiters, 0);
kvsort_<keytype, valtype>(keys,
indexes,
0,
arrsize - 1,
maxiters,
std::numeric_limits<arrsize_t>::max());
}
#pragma omp taskwait
#else
kvsort_<keytype, valtype>(keys, indexes, 0, arrsize - 1, maxiters, 0);
#endif
Expand Down
4 changes: 4 additions & 0 deletions tests/test-keyvalue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ class simdkvsort : public ::testing::Test {
simdkvsort()
{
std::iota(arrsize.begin(), arrsize.end(), 1);
arrsize.push_back(10'000);
arrsize.push_back(100'000);
arrsize.push_back(1'000'000);

arrtype = {"random",
"constant",
"sorted",
Expand Down
Loading