If `CMAKE_CXX_COMPILER_LAUNCHER` is set , do not enable `kokkos_launch_compiler` #4870

ajpowelsnl · 2022-03-11T19:37:46Z

This PR adds another condition in setting INTERNAL_USE_COMPILER_LAUNCHER to prevent interaction with
kokkos_launch_compiler when CMAKE_CXX_COMPILER_LAUNCHER is set. This change fixes #4821.

msimberg · 2022-03-14T08:18:31Z

Works for me, as in I get an error during CMake configuration suggesting to use nvcc_wrapper, clang, or kokkos_launch_compiler. However, since the last one is not actually an option I would maybe suggest to error out earlier with a message specific to CMAKE_CXX_COMPILER_LAUNCHER. Do you think that's reasonable?

ajpowelsnl · 2022-03-14T18:52:17Z

Works for me, as in I get an error during CMake configuration suggesting to use nvcc_wrapper, clang, or kokkos_launch_compiler. However, since the last one is not actually an option I would maybe suggest to error out earlier with a message specific to CMAKE_CXX_COMPILER_LAUNCHER. Do you think that's reasonable?

Hi @msimberg -- I've added the error condition you requested. Please let us know if we can do anything further to help.

masterleinad · 2022-03-14T18:54:33Z

core/src/Cuda/Kokkos_Cuda_Parallel_Team.hpp

+    m_scratch_locks =
+        m_policy.space().impl_internal_space_instance()->m_scratch_locks;


Neither this...

masterleinad · 2022-03-14T19:11:23Z

core/src/HIP/Kokkos_HIP_Parallel_Team.hpp

+    m_scratch_locks =
+        m_policy.space().impl_internal_space_instance()->m_scratch_locks;


...nor this...

masterleinad · 2022-03-14T19:11:37Z

core/unit_test/TestTeam.hpp

+
+    Kokkos::parallel_reduce(
+        team_exec.set_scratch_size(1, Kokkos::PerTeam(team_scratch_size),
+                                   Kokkos::PerThread(thread_scratch_size)),
+        Functor(), Kokkos::Sum<typename Functor::value_type>(error_count));
+    Kokkos::fence();
+    ASSERT_EQ(error_count, 0);


...or this should be in this pull request.

oh my...! I do not know how those changes got into this PR. Maybe in my rebasing ...? In any case, I'll remove this stuff. Thank you for catching that.

For all cases of files that shouldn't be in this PR, I've checked out the develop versions of these files, and there doesn't seem to be any difference between the versions. I will look back through the commits to see how these errant files ended up in this PR.

masterleinad · 2022-03-14T19:13:15Z

cmake/kokkos_compiler_id.cmake

+    # compiler AND `CMAKE_CXX_COMPILIER_LAUNCHER` is not set, set to use launcher. Will ensure CMAKE_CXX_COMPILER
    # is replaced by nvcc_wrapper


Suggested change

# compiler AND `CMAKE_CXX_COMPILIER_LAUNCHER` is not set, set to use launcher. Will ensure CMAKE_CXX_COMPILER

# is replaced by nvcc_wrapper

# compiler and `CMAKE_CXX_COMPILIER_LAUNCHER` is not set, set to use launcher.

# Will ensure CMAKE_CXX_COMPILER is replaced by nvcc_wrapper

masterleinad · 2022-03-14T19:14:20Z

cmake/kokkos_compiler_id.cmake

+    IF(Kokkos_COMPILE_LAUNCHER AND NOT INTERNAL_HAVE_COMPILER_NVCC AND NOT
+       CMAKE_CXX_COMPILER_LAUNCHER AND NOT KOKKOS_CXX_COMPILER_ID STREQUAL Clang)
+			MESSAGE(FATAL_ERROR "Cannot use CMAKE_CXX_COMPILER_LAUNCHER if the CMAKE_CXX_COMPILER is not able to compile CUDA code, i.e. nvcc_wrapper or
+clang++!")


Don't use tabs.

Suggested change

IF(Kokkos_COMPILE_LAUNCHER AND NOT INTERNAL_HAVE_COMPILER_NVCC AND NOT

CMAKE_CXX_COMPILER_LAUNCHER AND NOT KOKKOS_CXX_COMPILER_ID STREQUAL Clang)

MESSAGE(FATAL_ERROR "Cannot use CMAKE_CXX_COMPILER_LAUNCHER if the CMAKE_CXX_COMPILER is not able to compile CUDA code, i.e. nvcc_wrapper or

clang++!")

IF(Kokkos_COMPILE_LAUNCHER AND NOT INTERNAL_HAVE_COMPILER_NVCC AND NOT

CMAKE_CXX_COMPILER_LAUNCHER AND NOT KOKKOS_CXX_COMPILER_ID STREQUAL Clang)

MESSAGE(FATAL_ERROR "Cannot use CMAKE_CXX_COMPILER_LAUNCHER if the CMAKE_CXX_COMPILER is not able to compile CUDA code, i.e. nvcc_wrapper or

clang++!")

cmake/kokkos_compiler_id.cmake

`INTERNAL_USE_COMPILER_LAUNCHER` to prevent interaction with kokkos_launch_compiler when `CMAKE_CXX_COMPILER_LAUNCHER` is set

`CMAKE_CXX_COMPILER_LAUNCHER` is set, and the `CMAKE_CXX_COMPILER` cannot compile Cuda code

kokkos_compiler_id.cmake: Add another condition on setting `INTERNAL_USE_COMPILER_LAUNCHER` to prevent interaction with kokkos_launch_compiler when `CMAKE_CXX_COMPILER_LAUNCHER` is set

msimberg

Thanks @ajpowelsnl! This looks good to me now.

masterleinad · 2022-03-16T13:33:27Z

CUDA-9.2-NVCC failing in default_exec.overlap_mdrange_policy is spurious.

masterleinad · 2022-03-16T13:34:29Z

cmake/kokkos_compiler_id.cmake

    IF(Kokkos_COMPILE_LAUNCHER AND NOT INTERNAL_HAVE_COMPILER_NVCC AND NOT KOKKOS_CXX_COMPILER_ID STREQUAL Clang)
+      IF(CMAKE_CXX_COMPILER_LAUNCHER)
+      MESSAGE(FATAL_ERROR "Cannot use CMAKE_CXX_COMPILER_LAUNCHER if the CMAKE_CXX_COMPILER is not able to compile CUDA code, i.e. nvcc_wrapper or


Suggested change

MESSAGE(FATAL_ERROR "Cannot use CMAKE_CXX_COMPILER_LAUNCHER if the CMAKE_CXX_COMPILER is not able to compile CUDA code, i.e. nvcc_wrapper or

MESSAGE(FATAL_ERROR "Cannot use CMAKE_CXX_COMPILER_LAUNCHER if the CMAKE_CXX_COMPILER is not able to compile CUDA code, i.e. nvcc_wrapper or

ajpowelsnl · 2022-03-16T17:05:39Z

CUDA-9.2-NVCC failing in default_exec.overlap_mdrange_policy is spurious.

OK, thanks for the head's up.

…e space

ajpowelsnl · 2022-03-28T14:29:14Z

Hi @dalg24 - retest this, please.

masterleinad · 2022-03-28T17:17:31Z

Retest this please.

ajpowelsnl requested review from dalg24 and crtrott March 11, 2022 19:37

ajpowelsnl assigned ajpowelsnl and unassigned ajpowelsnl Mar 11, 2022

masterleinad linked an issue Mar 11, 2022 that may be closed by this pull request

Setting CMAKE_CXX_COMPILER_LAUNCHER breaks kokkos_launch_compiler #4821

Closed

crtrott approved these changes Mar 11, 2022

View reviewed changes

crtrott mentioned this pull request Mar 11, 2022

Setting CMAKE_CXX_COMPILER_LAUNCHER breaks kokkos_launch_compiler #4821

Closed

masterleinad reviewed Mar 14, 2022

View reviewed changes

msimberg reviewed Mar 15, 2022

View reviewed changes

cmake/kokkos_compiler_id.cmake Outdated Show resolved Hide resolved

ajpowelsnl added 4 commits March 15, 2022 15:59

kokkos_compiler_id.cmake: Add another condition on setting

8f59602

`INTERNAL_USE_COMPILER_LAUNCHER` to prevent interaction with kokkos_launch_compiler when `CMAKE_CXX_COMPILER_LAUNCHER` is set

cmake/kokkos_compiler_id.cmake: add fatal error message in the case that

f140857

`CMAKE_CXX_COMPILER_LAUNCHER` is set, and the `CMAKE_CXX_COMPILER` cannot compile Cuda code

Addressing PR comments: rm tabs, add user's suggestion

c8b2adc

kokkos_compiler_id.cmake: Add another condition on setting `INTERNAL_USE_COMPILER_LAUNCHER` to prevent interaction with kokkos_launch_compiler when `CMAKE_CXX_COMPILER_LAUNCHER` is set

kokkos_compiler_id.cmake: rm merge conflicts and additional files

db76c49

ajpowelsnl force-pushed the bug/4821 branch from e113603 to db76c49 Compare March 15, 2022 22:51

msimberg approved these changes Mar 16, 2022

View reviewed changes

masterleinad reviewed Mar 16, 2022

View reviewed changes

kokkos_compiler_id.cmake: addressing PR comment - indent MESSAGE on…

0f05312

…e space

crtrott merged commit 46ef54d into kokkos:develop Mar 30, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

If `CMAKE_CXX_COMPILER_LAUNCHER` is set , do not enable `kokkos_launch_compiler` #4870

If `CMAKE_CXX_COMPILER_LAUNCHER` is set , do not enable `kokkos_launch_compiler` #4870

ajpowelsnl commented Mar 11, 2022 •

edited

msimberg commented Mar 14, 2022

ajpowelsnl commented Mar 14, 2022

masterleinad Mar 14, 2022

masterleinad Mar 14, 2022

masterleinad Mar 14, 2022

ajpowelsnl Mar 15, 2022

ajpowelsnl Mar 15, 2022

masterleinad Mar 14, 2022

masterleinad Mar 14, 2022

msimberg left a comment

masterleinad commented Mar 16, 2022

masterleinad Mar 16, 2022

ajpowelsnl commented Mar 16, 2022

ajpowelsnl commented Mar 28, 2022 •

edited

masterleinad commented Mar 28, 2022

		m_scratch_locks =
		m_policy.space().impl_internal_space_instance()->m_scratch_locks;

		# compiler AND `CMAKE_CXX_COMPILIER_LAUNCHER` is not set, set to use launcher. Will ensure CMAKE_CXX_COMPILER
		# is replaced by nvcc_wrapper

	MESSAGE(FATAL_ERROR "Cannot use CMAKE_CXX_COMPILER_LAUNCHER if the CMAKE_CXX_COMPILER is not able to compile CUDA code, i.e. nvcc_wrapper or
	MESSAGE(FATAL_ERROR "Cannot use CMAKE_CXX_COMPILER_LAUNCHER if the CMAKE_CXX_COMPILER is not able to compile CUDA code, i.e. nvcc_wrapper or

If CMAKE_CXX_COMPILER_LAUNCHER is set , do not enable kokkos_launch_compiler #4870

If CMAKE_CXX_COMPILER_LAUNCHER is set , do not enable kokkos_launch_compiler #4870

Conversation

ajpowelsnl commented Mar 11, 2022 • edited

msimberg commented Mar 14, 2022

ajpowelsnl commented Mar 14, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

msimberg left a comment

Choose a reason for hiding this comment

masterleinad commented Mar 16, 2022

Choose a reason for hiding this comment

ajpowelsnl commented Mar 16, 2022

ajpowelsnl commented Mar 28, 2022 • edited

masterleinad commented Mar 28, 2022

If `CMAKE_CXX_COMPILER_LAUNCHER` is set , do not enable `kokkos_launch_compiler` #4870

If `CMAKE_CXX_COMPILER_LAUNCHER` is set , do not enable `kokkos_launch_compiler` #4870

ajpowelsnl commented Mar 11, 2022 •

edited

ajpowelsnl commented Mar 28, 2022 •

edited