Kokkos: Remove TriBITS Kokkos subpackages (trilinos/Trilinos#11545) #6104

bartlettroscoe · 2023-05-04T22:24:04Z

These are the same commits for Kokkos as part of Trilinos PR:

Remove usage of subpackages from TriBITS Kokkos build and downstream Trilinos packages (#11545) trilinos/Trilinos#11808

Therefore, this PR must be merged before Kokkos is snapshotted into Trilinos again after the merge of trilinos/Trilinos#11808 to Trilinos 'develop'.

* Removed the listing of subpackages from kokkos/cmake/Dependencies.cmake * Remove the now-unused files kokkos/[core,containers,algorithms,simd]/cmake/Dependencies.cmake * Removed TriBITS macros for a package with subpackages and replace with those for a package with no subpackages. Also, removed all subpackage macros. * Changed kokkos_process_subpackage() to just call add_subdirectory(). * Added prefix 'Core' to several tests in kokkos/Core/unit_tests/CMakeLists.txt now that prefix is 'Kokkos_' * Added prefix 'Containers' to several tests in kokkos/containers/unit_tests/CMakeLists.txt and kokkos/containers/performance_tests/CMakeLists.txt now that prefix is 'Kokkos_' * Change name of the kokkos/containers/performance_tests/CMakeLists.txt file test 'PerformanceTest_XXX' to 'ContainersPerformanceTest_XXX'. * Added prefix 'Algorithms' to several tests in kokkos/algorithms/unit_tests/CMakeLists.txt now that prefix is 'Kokkos_' * Removed the usage of tribits_configure_file() and wrapper kokkos_configure_file() and just call configure_file(). The location of PACKAGE_SORUCE_DIR changed so the calls to tribits_configure_file() no longer worked. (Also, these X_config.h.in files were not using any of the TriBITS-supported features that needed the calling of tribits_configure_file() so there was no reason to not just call raw configure_file().) SQUASH AGINST: Kokkos: Remove TriBITS subpackages (#11545)

…nos#11545) This restores the building of the raw CMake build of Kokkos after the refactoring to remove TriBITS subpackages.

dalg24-jenkins · 2023-05-04T22:24:06Z

Can one of the admins verify this patch?

…os/Trilinos#11545) This gives a full passing build and tests with the Trilinos PR GenConfig clang-11.0.1 build configuration.

bartlettroscoe · 2023-05-04T23:53:48Z

Hum, some of these GHA jobs don't seem to be testing the correct version of the code. For example, looking at the job:

https://github.com/kokkos/kokkos/actions/runs/4888328263/jobs/8725881648?pr=6104

it shows the commit being tested as the merge commit 0690c1b here:

https://github.com/kokkos/kokkos/actions/runs/4888328263/jobs/8725881648?pr=6104#step:5:488

The job reports the failure:

-- Configuring done (6.7s)
CMake Error at core/unit_test/CMakeLists.txt:1129 (file):
  Error evaluating generator expression:

    $<TARGET_FILE_DIR:KokkosCore_UnitTest_DeviceAndThreads>

  No target "KokkosCore_UnitTest_DeviceAndThreads"


-- Generating done (0.3s)
CMake Generate step failed.  Build files cannot be regenerated correctly.
Error: Process completed with exit code 1.

at:

https://github.com/kokkos/kokkos/actions/runs/4888328263/jobs/8725881648?pr=6104#step:11:137

But if you look at that line of code core/unit_test/CMakeLists.txt:1129 for that commit it shows:

kokkos/core/unit_test/CMakeLists.txt

Lines 1129 to 1133 in 0690c1b

    
           file(GENERATE 
        
             OUTPUT $<TARGET_FILE_DIR:Kokkos_CoreUnitTest_DeviceAndThreads>/TestDeviceAndThreads.py 
        
             INPUT TestDeviceAndThreads.py 
        
             ${USE_SOURCE_PERMISSIONS_WHEN_SUPPORTED} 
        
           )

Where the heck is KokkosCore_UnitTest_DeviceAndThreads coming from?

Can someone please help to explain this?

dalg24 · 2023-05-05T14:03:50Z

We test the merge commit when there is no conflict but this is a red herring. I pulled your branch and it yields that error which I also don't understand at this time.

dalg24 · 2023-05-05T14:19:35Z

I fixed the issue.

This PR renames our targets and executable names

KokkosCore_UnitTest_Cuda                -> Kokkos_CoreUnitTest_Cuda
KokkosAlgorithms_UnitTest_RandomAndSort -> Kokkos_AlgorithmsUnitTest_RandomAndSort
etc.

Note that in the current version KokkosSimd_UnitTest_SIMD -> Kokkos_UnitTest_SIMD (Simd package name is dropped).

One thing that we need to discuss is that this currently implies a departure from the exe names produced by the makefiles.

crtrott

I am ok with the name change. I also don't see a pressing reason to change the Makefile System test names. All in all this gets rid of a bunch of cmake so that sounds good to me.

masterleinad

Apart from the question of renaming tests, this looks good to me.

bartlettroscoe · 2023-05-05T15:16:19Z

core/unit_test/TestDeviceAndThreads.py

+PREFIX = "$<TARGET_FILE_DIR:Kokkos_CoreUnitTest_DeviceAndThreads>"
+EXECUTABLE = "$<TARGET_FILE_NAME:Kokkos_CoreUnitTest_DeviceAndThreads>"


It does not seem like this change is important to bring back to the Trilinos copy of Kokkos. I can can use 'git format-patch' and 'git am' to bring it back just in case.

FYI: I went ahead and applied this commit on the Trilinos side in:

trilinos/Trilinos@df12adb

in PR:

Remove usage of subpackages from TriBITS Kokkos build and downstream Trilinos packages (#11545) trilinos/Trilinos#11808

dalg24 · 2023-05-05T16:24:02Z

OK to test

dalg24

Fine with it but want to wait for CI

dalg24 · 2023-05-05T20:54:46Z

ctest reports 100% of the tests passed in the SYCL build but it somehow reports failure. I will ignore.

ndellingwood · 2023-05-09T22:47:29Z

I added an entry to the CHANGELOG 4.1.0 on #5902 listed under

Build System Changes
Incompatibilities (i.e. breaking changes)

…okkos#6104) * Kokkos: Remove TriBITS subpackages (#11545) * Removed the listing of subpackages from kokkos/cmake/Dependencies.cmake * Remove the now-unused files kokkos/[core,containers,algorithms,simd]/cmake/Dependencies.cmake * Removed TriBITS macros for a package with subpackages and replace with those for a package with no subpackages. Also, removed all subpackage macros. * Changed kokkos_process_subpackage() to just call add_subdirectory(). * Added prefix 'Core' to several tests in kokkos/Core/unit_tests/CMakeLists.txt now that prefix is 'Kokkos_' * Added prefix 'Containers' to several tests in kokkos/containers/unit_tests/CMakeLists.txt and kokkos/containers/performance_tests/CMakeLists.txt now that prefix is 'Kokkos_' * Change name of the kokkos/containers/performance_tests/CMakeLists.txt file test 'PerformanceTest_XXX' to 'ContainersPerformanceTest_XXX'. * Added prefix 'Algorithms' to several tests in kokkos/algorithms/unit_tests/CMakeLists.txt now that prefix is 'Kokkos_' * Removed the usage of tribits_configure_file() and wrapper kokkos_configure_file() and just call configure_file(). The location of PACKAGE_SORUCE_DIR changed so the calls to tribits_configure_file() no longer worked. (Also, these X_config.h.in files were not using any of the TriBITS-supported features that needed the calling of tribits_configure_file() so there was no reason to not just call raw configure_file().) SQUASH AGINST: Kokkos: Remove TriBITS subpackages (#11545) * Fix native build of Kokkos after removing subpackages (trilinos/Trilinos#11545) This restores the building of the raw CMake build of Kokkos after the refactoring to remove TriBITS subpackages. * Kokkos: Remove last of subpackage stuff, fix for tests enable (trilinos/Trilinos#11545) This gives a full passing build and tests with the Trilinos PR GenConfig clang-11.0.1 build configuration. * Fixup update target name in python test script that gets configured --------- Co-authored-by: Damien L-G <dalg24@gmail.com>

bartlettroscoe added 2 commits May 4, 2023 16:12

Fix native build of Kokkos after removing subpackages (trilinos/Trili…

5b55679

…nos#11545) This restores the building of the raw CMake build of Kokkos after the refactoring to remove TriBITS subpackages.

bartlettroscoe mentioned this pull request May 4, 2023

Remove usage of subpackages from TriBITS Kokkos build and downstream Trilinos packages (#11545) trilinos/Trilinos#11808

Merged

7 tasks

dalg24 changed the title ~~Kokkos: Remove TriBITS subpackages (#11545)~~ Kokkos: Remove TriBITS subpackages (trilinos#11545) May 4, 2023

bartlettroscoe changed the title ~~Kokkos: Remove TriBITS subpackages (trilinos#11545)~~ Kokkos: Remove TriBITS Kokkos subpackages (trilinos/Trilinos#11545) May 4, 2023

Kokkos: Remove last of subpackage stuff, fix for tests enable (trilin…

469d46b

…os/Trilinos#11545) This gives a full passing build and tests with the Trilinos PR GenConfig clang-11.0.1 build configuration.

ndellingwood mentioned this pull request May 5, 2023

KokkosKernels: Remove TriBITS Kokkos subpackages (trilinos/Trilinos#11545) kokkos/kokkos-kernels#1817

Merged

Fixup update target name in python test script that gets configured

4c8215b

crtrott approved these changes May 5, 2023

View reviewed changes

masterleinad reviewed May 5, 2023

View reviewed changes

bartlettroscoe commented May 5, 2023

View reviewed changes

bartlettroscoe mentioned this pull request May 5, 2023

Kokkos: Avoid using TriBITS in Kokkos trilinos/Trilinos#11779

Draft

dalg24 approved these changes May 5, 2023

View reviewed changes

dalg24 merged commit 5fa72b5 into kokkos:develop May 5, 2023
27 of 28 checks passed

dalg24 mentioned this pull request May 5, 2023

Drop pointless Kokkos{Algorithms,Containers}_config.h files #6108

Merged

ndellingwood mentioned this pull request May 9, 2023

CHANGELOG: 4.1.0 #5902

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kokkos: Remove TriBITS Kokkos subpackages (trilinos/Trilinos#11545) #6104

Kokkos: Remove TriBITS Kokkos subpackages (trilinos/Trilinos#11545) #6104

bartlettroscoe commented May 4, 2023

dalg24-jenkins commented May 4, 2023

bartlettroscoe commented May 4, 2023

dalg24 commented May 5, 2023

dalg24 commented May 5, 2023

crtrott left a comment

masterleinad left a comment

bartlettroscoe May 5, 2023

bartlettroscoe May 5, 2023

dalg24 commented May 5, 2023

dalg24 left a comment

dalg24 commented May 5, 2023

ndellingwood commented May 9, 2023

		PREFIX = "$<TARGET_FILE_DIR:Kokkos_CoreUnitTest_DeviceAndThreads>"
		EXECUTABLE = "$<TARGET_FILE_NAME:Kokkos_CoreUnitTest_DeviceAndThreads>"

Kokkos: Remove TriBITS Kokkos subpackages (trilinos/Trilinos#11545) #6104

Kokkos: Remove TriBITS Kokkos subpackages (trilinos/Trilinos#11545) #6104

Conversation

bartlettroscoe commented May 4, 2023

dalg24-jenkins commented May 4, 2023

bartlettroscoe commented May 4, 2023

dalg24 commented May 5, 2023

dalg24 commented May 5, 2023

crtrott left a comment

Choose a reason for hiding this comment

masterleinad left a comment

Choose a reason for hiding this comment

bartlettroscoe May 5, 2023

Choose a reason for hiding this comment

bartlettroscoe May 5, 2023

Choose a reason for hiding this comment

dalg24 commented May 5, 2023

dalg24 left a comment

Choose a reason for hiding this comment

dalg24 commented May 5, 2023

ndellingwood commented May 9, 2023