Skip to content
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.

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

Kokkos: fix Sort bug with empty bins #2476

Merged
merged 1 commit into from
Mar 29, 2018
Merged

Kokkos: fix Sort bug with empty bins #2476

merged 1 commit into from
Mar 29, 2018

Conversation

ibaned
Copy link
Contributor

@ibaned ibaned commented Mar 29, 2018

@trilinos/kokkos

Description

This fixes a bug in Kokkos where an access would be made out of bounds when sorting with empty bins.

Motivation and Context

This bug was causing test failures in the new ATDM builds with KOKKOS_ENABLE_DEBUG=ON, pushing the fix directly to Trilinos will help fix some of those failures.

Related Issues

How Has This Been Tested?

A custom build with KOKKOS_ENABLE_DEBUG passes the KokkosKernels test that used to fail.

See #2471 and kokkos/kokkos#1503
Out-of-bounds access when sorting
an empty bin.
@ibaned ibaned added type: bug The primary issue is a bug in Trilinos code or tests pkg: Kokkos labels Mar 29, 2018
@ibaned ibaned self-assigned this Mar 29, 2018
@ibaned ibaned changed the base branch from master to develop March 29, 2018 17:44
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3

  • Build Num: 411
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 2476
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH kokkos-sort-bug
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA 2305cfe
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA d4aa58e

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 128
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2476
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH kokkos-sort-bug
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA 2305cfe
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA d4aa58e

Using Repos:

Repo: TRILINOS (trilinos/Trilinos)
  • Branch: kokkos-sort-bug
  • SHA: 2305cfe
  • Mode: TEST_REPO

Pull Request Author: ibaned

Copy link
Member

@bartlettroscoe bartlettroscoe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks reasonable to me. If there is 1 or 0 elements, don't bother sorting.

The thing that would make this better is if there was a unit test in Kokkos itself for this test case. I don't want to hold up the merge of this PR (because we have failing tests submitting CDash error emails this will clean up) but could someone add a unit test in Kokkos itself for 0 and 1 sizes?

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED

Pull Request Auto Testing has PASSED (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3

  • Build Num: 411
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 2476
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH kokkos-sort-bug
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA 2305cfe
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA d4aa58e

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 128
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2476
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH kokkos-sort-bug
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA 2305cfe
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA d4aa58e

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ bartlettroscoe mndevec ]!

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Pull Request MUST BE MERGED MANUALLY BY Project Team - Master Automerge is disabled (in .cfg file)

@ibaned ibaned merged commit 6bbc3d6 into develop Mar 29, 2018
@ibaned ibaned deleted the kokkos-sort-bug branch April 24, 2018 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pkg: Kokkos type: bug The primary issue is a bug in Trilinos code or tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants