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

KokkosSparse_spmv_struct_tuning: add lambda guard #641

Merged
merged 1 commit into from
Mar 5, 2020

Conversation

ndellingwood
Copy link
Contributor

Kokkos does not enable lambdas by default when Cuda is enabled.
This test was using lambdas without proper guards, this PR adds guard.
Detected during tpl spot-check nightly testing.

Kokkos does not enable lambdas by default when Cuda is enabled.
This test was using lambdas without proper guards, this PR adds guard.
Detected during tpl spot-check nightly testing.
@ndellingwood ndellingwood requested review from jjwilke and lucbv March 5, 2020 15:54
@ndellingwood
Copy link
Contributor Author

Failing cuda build now passes tpl spot-check

[ndellin@kokkos-dev-2 cmTestAllSandia-tpls]$ ../../scripts/cm_test_all_sandia cuda --spot-check-tpls
Running on machine: kokkos-dev-2
WARNING!! THE FOLLOWING CHANGES ARE UNCOMMITTED!! :
 M perf_test/sparse/KokkosSparse_spmv_struct_tuning.cpp
?? scripts/cm_test_all_sandia-backup

Repository Status:  04795922172fb988ad9141473fd95ab7933ad0de Merge pull request #637 from kokkos/testall-cudauvm


Going to test compilers:  cuda/10.1
Testing compiler cuda/10.1
  Starting job cuda-10.1-Cuda_OpenMP-release
kokkos options: 
kokkos devices: Cuda,OpenMP
kokkos cxx: -O3 -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wuninitialized 
  PASSED cuda-10.1-Cuda_OpenMP-release
#######################################################
PASSED TESTS
#######################################################
cuda-10.1-Cuda_OpenMP-release build_time=158 run_time=180

@ndellingwood
Copy link
Contributor Author

For reference, this addresses failures detected during testing of #554 and the failing nightly build https://jenkins-son.sandia.gov/job/KokkosKernels_KokkosDev2_SPOTCHECK_TPLS/1/consoleFull

@ndellingwood ndellingwood deleted the add-lambdaguard branch March 5, 2020 15:58
@lucbv
Copy link
Contributor

lucbv commented Mar 5, 2020

So it would have been nice to tell me this and not merge it immediately as I have this fix in my PR and I'm only waiting for bowman to finish to run the spot-check, already have kokkos-dev and white done. Now I need to rebase and rerun everything I guess...

@ndellingwood
Copy link
Contributor Author

@lucbv it's a oneline change, if you pattern match in your PR there should be no merge conflict and no need to rerun testing.

@lucbv
Copy link
Contributor

lucbv commented Mar 5, 2020

@ndellingwood my change actually fixes the issue by implementing a functor that avoids having to guard the test hence making it run on more configuration so we have better testing...

@ndellingwood
Copy link
Contributor Author

@lucbv has functor implementation within #618 , we talked and since this PR was a one line change simply ignoring this change when resolving potential merge conflicts in his PR should not require rerunning tests (as that will preserve his PR as-is, which he is testing)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants