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

OpenMPTarget: Block unit tests that do not pass with the nvidia compiler. #3839

Merged
merged 11 commits into from
Mar 17, 2021

Conversation

rgayatri23
Copy link
Contributor

The PR blocks unit tests that do not pass with the nvidia-compiler based on the compiler-id.

@rgayatri23 rgayatri23 changed the title OpenMPTarget: Block unit tests to pass with the nvidia compiler. OpenMPTarget: Block unit tests that do not pass with the nvidia compiler. Mar 9, 2021
dalg24
dalg24 previously requested changes Mar 10, 2021
algorithms/unit_tests/CMakeLists.txt Outdated Show resolved Hide resolved
core/CMakeLists.txt Outdated Show resolved Hide resolved
core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp Outdated Show resolved Hide resolved
core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp Outdated Show resolved Hide resolved
core/unit_test/CMakeLists.txt Outdated Show resolved Hide resolved
core/unit_test/CMakeLists.txt Outdated Show resolved Hide resolved
core/unit_test/CMakeLists.txt Outdated Show resolved Hide resolved
algorithms/unit_tests/CMakeLists.txt Outdated Show resolved Hide resolved
core/CMakeLists.txt Outdated Show resolved Hide resolved
@@ -7,7 +7,11 @@ IF (NOT Kokkos_INSTALL_TESTING)
ENDIF()

KOKKOS_ADD_TEST_DIRECTORIES(unit_test)

# FIXME_OPENMPTARGET - the nvidia compiler in the OpenMPTarget backend does not pass the perf_tests.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# FIXME_OPENMPTARGET - the nvidia compiler in the OpenMPTarget backend does not pass the perf_tests.
# FIXME_OPENMPTARGET - the PGI compiler in the OpenMPTarget backend does not pass the perf_tests.

Copy link
Member

Choose a reason for hiding this comment

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

PGI is not a thing anymore

Copy link
Contributor

Choose a reason for hiding this comment

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

Then let's rename everything to NVHPC.

core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp Outdated Show resolved Hide resolved
core/src/OpenMPTarget/Kokkos_OpenMPTarget_Parallel.hpp Outdated Show resolved Hide resolved
core/unit_test/CMakeLists.txt Outdated Show resolved Hide resolved
core/unit_test/CMakeLists.txt Outdated Show resolved Hide resolved
core/unit_test/CMakeLists.txt Outdated Show resolved Hide resolved
core/unit_test/CMakeLists.txt Outdated Show resolved Hide resolved
@rgayatri23 rgayatri23 removed the [WIP] label Mar 15, 2021
@masterleinad
Copy link
Contributor

Retest this please.

core/CMakeLists.txt Outdated Show resolved Hide resolved
core/unit_test/CMakeLists.txt Outdated Show resolved Hide resolved
endif()

# FIXME_OPENMPTARGET - Comment non-passing tests with the NVIDIA HPC compiler nvc++
if(KOKKOS_ENABLE_OPENMPTARGET AND KOKKOS_CXX_COMPILER_ID STREQUAL "PGI")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if(KOKKOS_ENABLE_OPENMPTARGET AND KOKKOS_CXX_COMPILER_ID STREQUAL "PGI")
if(KOKKOS_ENABLE_OPENMPTARGET AND
(KOKKOS_CXX_COMPILER_ID STREQUAL PGI OR KOKKOS_CXX_COMPILER_ID STREQUAL NVHPC))

for CMake 3.20 (https://cmake.org/cmake/help/v3.20/variable/CMAKE_LANG_COMPILER_ID.html#variable:CMAKE__COMPILER_ID).

core/CMakeLists.txt Outdated Show resolved Hide resolved
core/unit_test/CMakeLists.txt Outdated Show resolved Hide resolved
Co-authored-by: Daniel Arndt <arndtd@ornl.gov>
Copy link
Contributor

@masterleinad masterleinad left a comment

Choose a reason for hiding this comment

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

LGTM.

@dalg24 dalg24 dismissed their stale review March 17, 2021 14:17

I applied the changes requested

@crtrott crtrott merged commit ae6df4d into kokkos:develop Mar 17, 2021
Comment on lines +12 to +16
IF(KOKKOS_ENABLE_OPENMPTARGET
AND NOT KOKKOS_CXX_COMPILER_ID STREQUAL PGI
AND NOT KOKKOS_CXX_COMPILER_ID STREQUAL NVHPC)
KOKKOS_ADD_TEST_DIRECTORIES(perf_test)
ENDIF()
Copy link
Member

Choose a reason for hiding this comment

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

Uhhhhh

dalg24 added a commit to dalg24/kokkos that referenced this pull request Mar 30, 2021
These had been inadvertently disbaled in kokkos#3839

Co-Authored-By: Nick Curtis <nicholas.curtis@amd.com>
Co-Authored-By: Bruno Turcksin <bruno.turcksin@gmail.com>
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.

None yet

4 participants