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

Remove include for nonexistent directory #581

Merged
merged 1 commit into from
Feb 5, 2020
Merged

Remove include for nonexistent directory #581

merged 1 commit into from
Feb 5, 2020

Conversation

sethrj
Copy link
Contributor

@sethrj sethrj commented Jan 28, 2020

When building a Fortran code that links against Kokkos as part of the same TriBITS project, the compiler complains because the Kokkos logic references a nonexistent directory. This PR simply removes the offending include command.

f951: Warning: Nonexistent include directory ‘/home/s3j/.local/src/scale/Trilinos/packages/kokkos-kernels/src/batched/impl’ [-Wmissing-include-dirs]

See trilinos/Trilinos#6669

@sethrj sethrj requested a review from crtrott January 28, 2020 15:34
Copy link
Contributor

@srajama1 srajama1 left a comment

Choose a reason for hiding this comment

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

Thanks @sethrj

@sethrj sethrj removed the request for review from crtrott January 29, 2020 11:55
@srajama1
Copy link
Contributor

@sethrj Are you a Sandian ? Then you can follow the spot-check process, if not one of us will have to do the spot check ?

@sethrj
Copy link
Contributor Author

sethrj commented Jan 31, 2020

@srajama1 I interned at SNL 15 years ago 😆 but no, I'm at ORNL. Could one of you please take care of it?

@srajama1
Copy link
Contributor

@sethrj Thanks ! We will run the spot-check.

@ndellingwood
Copy link
Contributor

ndellingwood commented Feb 4, 2020

These changes were made against kokkos-kernels master branch, but it in develop with the updated CMake it looks like there is still a line like this:
LIST(APPEND KK_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/batched/impl)

@sethrj would you like to update your PR (and direct merge into develop) or would you like us to issue a new PR?

@sethrj
Copy link
Contributor Author

sethrj commented Feb 5, 2020

@ndellingwood I'll update the PR, I clearly didn't follow the rabbit hole deep enough (we use a mirror of trilinos, which uses a snapshot of kokkos master, which ....)

@sethrj sethrj changed the base branch from master to develop February 5, 2020 02:56
@sethrj
Copy link
Contributor Author

sethrj commented Feb 5, 2020

@ndellingwood OK should be good to go now.

@ndellingwood
Copy link
Contributor

Thanks @sethrj , running spot-check tests now. Since you're building through Trilinos we'll patch this into Trilinos as well.

@ndellingwood
Copy link
Contributor

Spot-check passes on kokkos-dev-2 (no surprise), thanks for the contribution @sethrj !

Repository Status:  8d8005c9df50f39268780e921604742370b45fe1 Remove include for nonexistent directory


Going to test compilers:  gcc/7.3.0 gcc/8.3.0 gcc/9.1 intel/18.0.5 clang/8.0 cuda/10.1
Testing compiler gcc/7.3.0
  Starting job gcc-7.3.0-OpenMP-release
kokkos options: 
kokkos devices: OpenMP
kokkos cxx: -O3 -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wignored-qualifiers -Wempty-body -Wclobbered -Wuninitialized 
  PASSED gcc-7.3.0-OpenMP-release
Testing compiler gcc/8.3.0
  Starting job gcc-7.3.0-Pthread-release
kokkos options: 
kokkos devices: Pthread
kokkos cxx: -O3 -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wignored-qualifiers -Wempty-body -Wclobbered -Wuninitialized 
  PASSED gcc-7.3.0-Pthread-release
Testing compiler gcc/9.1
  Starting job gcc-8.3.0-Serial-release
kokkos options: 
kokkos devices: Serial
kokkos cxx: -O3 -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wignored-qualifiers -Wempty-body -Wclobbered -Wuninitialized 
  PASSED gcc-8.3.0-Serial-release
  Starting job gcc-9.1-OpenMP-release
kokkos options: 
kokkos devices: OpenMP
kokkos cxx: -O3 -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wignored-qualifiers -Wempty-body -Wclobbered -Wuninitialized 
  PASSED gcc-9.1-OpenMP-release
Testing compiler intel/18.0.5
  Starting job gcc-9.1-Serial-release
kokkos options: 
kokkos devices: Serial
kokkos cxx: -O3 -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wignored-qualifiers -Wempty-body -Wclobbered -Wuninitialized 
  PASSED gcc-9.1-Serial-release
Testing compiler clang/8.0
  Starting job intel-18.0.5-OpenMP-release
kokkos options: 
kokkos devices: OpenMP
kokkos cxx: -O3 -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wuninitialized 
  PASSED intel-18.0.5-OpenMP-release
  Starting job clang-8.0-Cuda_OpenMP-release
kokkos options: 
kokkos devices: Cuda,OpenMP
kokkos cxx: -O3 -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wuninitialized -Wno-pass-failed 
  PASSED clang-8.0-Cuda_OpenMP-release
Testing compiler cuda/10.1
  Starting job clang-8.0-Pthread_Serial-release
kokkos options: 
kokkos devices: Pthread,Serial
kokkos cxx: -O3 -Wall -Wshadow -pedantic -Werror -Wsign-compare -Wtype-limits -Wuninitialized -Wno-pass-failed 
  PASSED clang-8.0-Pthread_Serial-release
  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
#######################################################
clang-8.0-Cuda_OpenMP-release build_time=116 run_time=151
clang-8.0-Pthread_Serial-release build_time=48 run_time=154
cuda-10.1-Cuda_OpenMP-release build_time=152 run_time=142
gcc-7.3.0-OpenMP-release build_time=42 run_time=47
gcc-7.3.0-Pthread-release build_time=39 run_time=77
gcc-8.3.0-Serial-release build_time=40 run_time=71
gcc-9.1-OpenMP-release build_time=51 run_time=46
gcc-9.1-Serial-release build_time=45 run_time=72
intel-18.0.5-OpenMP-release build_time=122 run_time=45

@ndellingwood ndellingwood merged commit 55275a1 into kokkos:develop Feb 5, 2020
@sethrj sethrj deleted the fix-include-directories branch February 5, 2020 18:42
ndellingwood added a commit to trilinos/Trilinos that referenced this pull request Feb 5, 2020
@ndellingwood
Copy link
Contributor

@sethrj I put in the matching patch to trilinos in PR trilinos/Trilinos#6757

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