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

bartlettroscoe · 2023-04-24T15:21:20Z

CC: @trilinos/compadre, @trilinos/intrepid2, @trilinos/kokkos-kernels, @trilinos/kokkos, @trilinos/muelu, @trilinos/panzer, @trilinos/phalanx, @trilinos/sacado, @trilinos/shylu, @trilinos/stk, @trilinos/stokhos, @trilinos/teuchos, @trilinos/tpetra, @trilinos/trilinoscouplings, @trilinos/xpetra

Description

This PR takes a straightforward approach to remove the usage of subpackages from the TriBITS build of Kokkos.

Some of the more significant changes made in this PR include:

No more Kokkos subpackages Core, Containers, Algorithms, or Simd (and all of the associated changes that go with that).
When enabling Kokkos, all four of the subpackage/subdirectories core, containers, algorithms, and simd are always enabled all the time as well as all of their targets and tests.
Names of many of the Kokkos tests changed from Kokkos<Subpkg>_XXX to Kokkos_<Subpkg>XXX.
All downstream Dependencies.cmake files now list Kokkos and not KokkosCore, KokkosContainers, etc.
All optional dependency vars <Package>_ENABLE_Kokkos<Spkg> are now just one var <Package>_ENABLE_Kokkos (and all of the changes associated with that including user cache vars <Package>_ENABLE_Kokkos<Spkg> now becoming <Package>_ENABLE_Kokkos).
All macros in configured <Package>_Confg.h[.in] files with the suffixes _KOKKOSCORE, _KOKKOSCONTAINERS, etc. are now just _KOKKOS and this change is propagated to all C++ source files as well. (This touched a lot of source files.)
The names of disabled Kokkos tests by the Trilinos GenConfig files, ATDM Trilinos, and other files are updated (performed by a script).

Any of the above could break backward compatibility for downstream software depending on what they depend on. Below are some cases where this PR breaks backward compatibility for Trilinos customers:

The user configuring Trilinos has Kokkos enabled but has disabled support for KokkosContainers in Muelu by passing in MueLu_ENABLE_KokkosContainers=OFF. That can be fixed by changing it to MueLu_ENABLE_Kokkos=OFF
Downstream (even non-CMake-based) software depends on the #define macros coming from Trilinos configured header files. For example, if downstream C++ software had ifndefs like #ifdef HAVE_SACADO_KOKKOSCORE, then that code would be broken. That would be fixed by changing it to #ifdef HAVE_SACADO_KOKKOS

See the commit log messages for more details.

NOTES:

The refactorings in the Kokkos package itself was all done manually but the bulk of the other refactorings were done using scripts provided in this email. (Will provide more detailed notes later.)
There is some more cleanup that could be performed in the various packages to remove duplication and redundant code (as will be obvious if you look over the changes carefully) but the code as is should work correctly.
This technically breaks backward comparability for both downstream TriBITS packages and downstream non-TriBITS cmake projects. But it is likely that most downstream non-TriBITS CMake projects likely will not notice any changes since they likely just call find_package(Kokkos) or find_package(Trilinos) and, for example, to contents of the configured file KokkosCore_Config.h are unchanged after this refactoring.
It is possible to provide for a little more backward compatibility like maintaining the macro suffixes _KOKKOSCORE, _KOKKOSCONTAINERS, etc. that would not require changes to source files in Trilinos or source files in downstream projects (through included <Package>_Config.h files) but this would require a lot of manual CMake code in the impacted <packageDir>/CMakeLists.txt files.

Tasks

Wait for the snapshot of Kokkos and KokkosKernels for release-candidate-4.0.01 (see Remove usage of subpackages from TriBITS Kokkos build and downstream Trilinos packages (#11545) #11808 (comment)) ... PR Kokkos + KokkosKernels Promotion To 4.0.01 #11817 is merged.
Rebase this PR branch on top of 'develop'
Create PRs for the Kokkos and KokkosKernels changes to their external repos on 'develop' branches:
- See Kokkos: Remove TriBITS Kokkos subpackages (trilinos/Trilinos#11545) kokkos/kokkos#6104
- See KokkosKernels: Remove TriBITS Kokkos subpackages (trilinos/Trilinos#11545) kokkos/kokkos-kernels#1817
Get Trilinos developers to review all of the changes and note the breaks in backward compatibility
Merge related PRs at same time:
- Merge this PR Remove usage of subpackages from TriBITS Kokkos build and downstream Trilinos packages (#11545) #11808 to Trilinos 'develop'
- ~~[ ] Merge https://gitlab-ex.sandia.gov/trilinos-devops-consolidation/code/GenConfig/-/merge_requests/92 (test name changes)~~ ... Skipped, see below
- ~~[ ] Merge https://gitlab-ex.sandia.gov/trilinos-project/son-ini-files/-/merge_requests/3 (test name changes)~~ ... Skipped, see below
Get feedback from Trilinos customers that do daily testing against 'develop' to see if they get any breakages

trilinos-autotester · 2023-04-24T15:25:24Z

Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request.

trilinos-autotester · 2023-04-24T15:27:56Z

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: Trilinos_PR_gcc-8.3.0

Build Num: 2140
Status: STARTED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-gnu-8.3.0-openmpi-1.10.1-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	trilinos-any
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-serial

Build Num: 671
Status: STARTED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-v2-gnu-8.3.0-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	trilinos-any
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-debug

Build Num: 666
Status: STARTED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-gnu-8.3.0-openmpi-1.10.1-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	trilinos-any
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_clang-11.0.1

Build Num: 666
Status: STARTED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-clang-11.0.1-openmpi-1.10.1-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	trilinos-any
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_python3

Build Num: 1903
Status: STARTED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-gnu-7.2.0-anaconda3-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_pr-framework
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	ascic
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_cuda-11.4.2-uvm-off

Build Num: 1668
Status: STARTED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	GPU
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_intel-2021.3

Build Num: 306
Status: STARTED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-intel-2021.3-sems-openmpi-4.0.5_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	trilinos-any
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Using Repos:

Repo: TRILINOS (trilinos/Trilinos)

Pull Request Author: bartlettroscoe

trilinos-autotester · 2023-04-24T19:12:12Z

Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED

Pull Request Auto Testing has PASSED (click to expand)

Build Information

Test Name: Trilinos_PR_gcc-8.3.0

Build Num: 2140
Status: PASSED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-gnu-8.3.0-openmpi-1.10.1-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	trilinos-any
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-serial

Build Num: 671
Status: PASSED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-v2-gnu-8.3.0-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	trilinos-any
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-debug

Build Num: 666
Status: PASSED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-gnu-8.3.0-openmpi-1.10.1-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	trilinos-any
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_clang-11.0.1

Build Num: 666
Status: PASSED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-clang-11.0.1-openmpi-1.10.1-serial_release-debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	trilinos-any
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_python3

Build Num: 1903
Status: PASSED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-gnu-7.2.0-anaconda3-serial_debug_shared_no-kokkos-arch_no-asan_no-complex_no-fpic_no-mpi_no-pt_no-rdc_no-uvm_deprecated-on_pr-framework
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	ascic
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_cuda-11.4.2-uvm-off

Build Num: 1668
Status: PASSED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.0.5_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	GPU
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

Build Information

Test Name: Trilinos_PR_intel-2021.3

Build Num: 306
Status: PASSED

Jenkins Parameters

Parameter Name	Value
FORCE_CLEAN	true
GENCONFIG_BUILD_NAME	rhel7_sems-intel-2021.3-sems-openmpi-4.0.5_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
PR_LABELS	type: enhancement;pkg: Kokkos;pkg: Tpetra;pkg: MueLu;pkg: STK;pkg: Xpetra;pkg: Teuchos;pkg: Phalanx;pkg: Panzer;pkg: Intrepid2;pkg: Moertel;pkg: Sacado;pkg: Stokhos;pkg: TrilinosCouplings;pkg: KokkosKernels;pkg: minitensor;pkg: Tempus;pkg: Compadre
PULLREQUESTNUM	11808
PULLREQUEST_CDASH_TRACK	Pull Request
TEST_REPO_ALIAS	TRILINOS
TRILINOS_NODE_LABEL	trilinos-any
TRILINOS_SOURCE_BRANCH	11545-kokkos-no-subpkgs
TRILINOS_SOURCE_REPO	https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA	`5eeb6f6`
TRILINOS_SRN_CONFIG	true
TRILINOS_TARGET_BRANCH	develop
TRILINOS_TARGET_REPO	https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA	`3349b2c`

CDash Test Results for PR# 11808.

trilinos-autotester · 2023-04-24T19:12:29Z

Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
WARNING: NO REVIEWERS HAVE BEEN REQUESTED FOR THIS PULL REQUEST!

trilinos-autotester · 2023-04-24T19:12:35Z

All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur...

lucbv

The changes made to Kokkos Kernels and MueLu look good to me!

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

CC: @ccober6, @crtrott, @srajama1, @jwillenbring

@trilinos/compadre, @trilinos/intrepid2, @trilinos/kokkos-kernels, @trilinos/kokkos, @trilinos/muelu, @trilinos/panzer, @trilinos/phalanx, @trilinos/sacado, @trilinos/shylu, @trilinos/stk, @trilinos/stokhos, @trilinos/teuchos, @trilinos/tpetra, @trilinos/trilinoscouplings, @trilinos/xpetra,

There are changes in the PR to your packages related to the refactoring to remove subpackages from Kokkos. This technically breaks the backward compatibility of your packages but it unlikely there are any customers that would experience any breakages (see comments above).

NOTE: @lucbv has already approved this PR so I could just merge it but I wanted to give other developers a chance to take a look before I merge this. But I am happy to back out this merge if we discover if downstream customers experience problems with this.

alanw0 · 2023-04-24T22:45:07Z

@bartlettroscoe thanks for the heads-up. It looks good to me, I'll bring the stk changes to the sierra repository.

trilinos-autotester · 2023-04-24T22:58:19Z

Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ lucbv ]!

trilinos-autotester · 2023-05-08T22:10:47Z

Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ ndellingwood ]!

trilinos-autotester · 2023-05-08T22:10:54Z

Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR...

The issues with Kokkos were resolved with the merge of kokkos/kokkos#6104 which are duplicated in this PR

bartlettroscoe · 2023-05-09T15:07:26Z

Kokkos and KokkosKernels changes were reviewed, approved, and have merged to their resp. repos

Thanks @ndellingwood!

@bartlettroscoe I haven't heard back on any further concerns for the kokkos and kokkos-kernels changes, and the corresponding PRs have merged to their resp. repositories, so I'll go ahead and approve for the kokkos and and kokkos-kernels updates (I can't vouch for other packages)

I will go ahead and merge and then we can address any lingering issues in a follow-on PR. Mostly we need to see if close SNL customers will have anything break from these changes.

bartlettroscoe · 2023-05-09T22:41:01Z

NOTE: I just noticed that:

gitlab-ex.sandia.gov/trilinos-devops-consolidation/code/GenConfig/-/merge_requests/92 (test name changes)
gitlab-ex.sandia.gov/trilinos-project/son-ini-files/-/merge_requests/3 (test name changes)

are just changing the names of tests of the GenConfig tool and don't need to match what is currently in Trilinos.

Therefore, it is not needed to merge these MRs to the GenConfig system.

…rilinos#11545, trilinos#11808) These are renamings that should have happened as part of PR trilinos#11808 but somehow got missed. This commit also removes enables for the pakages KokkosContainers and KokkosCore which don't exist anymore.

…s:develop' (ab899a0). * trilinos-develop: (22 commits) Remove non-existant subdir kokkos-kernels/common/common (trilinos#11921, trilinos#11863) Teuchos: Fixing cmake logic Teuchos: Fixing catch() issues with C++ language drift TrilinosSS: include <omp.h> (Fix trilinos#11867) MueLu hierarchical: Fix build error Tpetra: Changes to StaticView for Kokkos PTHREAD to THREADS change Teuchos: Automatically enabling Tecuhos_ENABLE_THREAD_SAFE if you have Kokkos THREADS or OPENMP for the host Stokhos: Add missing KOKKOS_INLINE_FUNCTION to fix build errors on HIP Phalanx: Remove usage of undefined var Kokkos_INCLUDE_DIRS (trilinos#11545) Kokkos: Mark HWLOC as a TriBITS TPL as well (trilinos#11938) Update for removal of Kokkos subpackages and Kokkos test renamings (trilinos#11545, trilinos#11808) KokkosKernels: Remove non-existent common/src/[impl,tpls] include dirs (trilinos#11545) Add test simpleBuildAgainstTrilinos_by_package_build_tree_name (trilinos#11545) Pass in and define compilers before calling find_package(Trilinos) (trilinos#11545) Add `Kokkos::all_libs` alias target for compatibility with TriBITS/Trilinos (trilinos#6157) Export Kokkos_ENABLE_<OPTION> that are relevant Do not append to Kokkos_OPTIONS variables those in the do not export list Expand list of kokkos options not to export with cmake Tpetra: Don't use std::binary_function Tpetra: Fixing missing HIP tesT ...

…s:develop' (ab899a0). * trilinos-develop: (23 commits) Remove non-existant subdir kokkos-kernels/common/common (trilinos#11921, trilinos#11863) Teuchos: Fixing cmake logic Teuchos: Fixing catch() issues with C++ language drift fastilu: Fix memory leak. TrilinosSS: include <omp.h> (Fix trilinos#11867) MueLu hierarchical: Fix build error Tpetra: Changes to StaticView for Kokkos PTHREAD to THREADS change Teuchos: Automatically enabling Tecuhos_ENABLE_THREAD_SAFE if you have Kokkos THREADS or OPENMP for the host Stokhos: Add missing KOKKOS_INLINE_FUNCTION to fix build errors on HIP Phalanx: Remove usage of undefined var Kokkos_INCLUDE_DIRS (trilinos#11545) Kokkos: Mark HWLOC as a TriBITS TPL as well (trilinos#11938) Update for removal of Kokkos subpackages and Kokkos test renamings (trilinos#11545, trilinos#11808) KokkosKernels: Remove non-existent common/src/[impl,tpls] include dirs (trilinos#11545) Add test simpleBuildAgainstTrilinos_by_package_build_tree_name (trilinos#11545) Pass in and define compilers before calling find_package(Trilinos) (trilinos#11545) Add `Kokkos::all_libs` alias target for compatibility with TriBITS/Trilinos (trilinos#6157) Export Kokkos_ENABLE_<OPTION> that are relevant Do not append to Kokkos_OPTIONS variables those in the do not export list Expand list of kokkos options not to export with cmake Tpetra: Don't use std::binary_function ...

) Noticed this while cleaning up from the removal of Kokkos subpackages (See PR

…os#11545, trilinos#11808) This duplication resulted from running a simple automated script that created a commit in PR trilinos#11808.

) Noticed this while cleaning up from the removal of Kokkos subpackages (See PR

…os#11545, trilinos#11808) This duplication resulted from running a simple automated script that created a commit in PR trilinos#11808.

) Noticed this while cleaning up from the removal of Kokkos subpackages (See PR

…os#11545, trilinos#11808) This duplication resulted from running a simple automated script that created a commit in PR trilinos#11808.

bartlettroscoe mentioned this pull request Apr 24, 2023

Build and install downstream Trilinos packages against pre-installed Kokkos using native CMake build system #11545

Closed

6 tasks

bartlettroscoe changed the title ~~Remove usage of subpackage from TriBITS Kokkos build and downstream Trilinos packages (#11545)~~ Remove usage of subpackages from TriBITS Kokkos build and downstream Trilinos packages (#11545) Apr 24, 2023

lucbv previously approved these changes Apr 24, 2023

View reviewed changes

bartlettroscoe added the AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed label May 9, 2023

bartlettroscoe merged commit cd2c0a1 into develop May 9, 2023

maartenarnst mentioned this pull request Jun 1, 2023

Tribits: PR#11808 breaks kokkos configure with TPL_ENABLE_HWLOC=ON #11938

Closed

bartlettroscoe mentioned this pull request Jun 1, 2023

Kokkos: Timing-based test Kokkos_CoreUnitTest_Default_MPI_1 randomly failing in CUDA PR builds #11940

Closed

bartlettroscoe added a commit to bartlettroscoe/Trilinos that referenced this pull request Jun 29, 2023

Moertel: Remove unnecessary include dirs (trilinos#11545, trilinos#11808

fac4427

) Noticed this while cleaning up from the removal of Kokkos subpackages (See PR

bartlettroscoe added a commit to bartlettroscoe/Trilinos that referenced this pull request Jul 7, 2023

Moertel: Remove unnecessary include dirs (trilinos#11545, trilinos#11808

a624fec

) Noticed this while cleaning up from the removal of Kokkos subpackages (See PR

bartlettroscoe mentioned this pull request Jul 13, 2023

Base CMakeLists.txt cleanup, reduced tarball testing, CI enable tweak, TriBITS update (#11545, #11976) #12044

Merged

JacobDomagala pushed a commit to NexGenAnalytics/Trilinos that referenced this pull request Aug 4, 2023

Moertel: Remove unnecessary include dirs (trilinos#11545, trilinos#11808

4c05a7b

) Noticed this while cleaning up from the removal of Kokkos subpackages (See PR

ccober6 deleted the 11545-kokkos-no-subpkgs branch March 6, 2024 17:02

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

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

Conversation

bartlettroscoe commented Apr 24, 2023 • edited Loading

Description

Tasks

trilinos-autotester commented Apr 24, 2023

trilinos-autotester commented Apr 24, 2023

Build Information

Test Name: Trilinos_PR_gcc-8.3.0

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-serial

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-debug

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_clang-11.0.1

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_python3

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_cuda-11.4.2-uvm-off

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_intel-2021.3

Jenkins Parameters

Using Repos:

trilinos-autotester commented Apr 24, 2023

Build Information

Test Name: Trilinos_PR_gcc-8.3.0

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-serial

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_gcc-8.3.0-debug

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_clang-11.0.1

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_python3

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_cuda-11.4.2-uvm-off

Jenkins Parameters

Build Information

Test Name: Trilinos_PR_intel-2021.3

Jenkins Parameters

trilinos-autotester commented Apr 24, 2023

trilinos-autotester commented Apr 24, 2023

lucbv left a comment

Choose a reason for hiding this comment

bartlettroscoe commented Apr 24, 2023

alanw0 commented Apr 24, 2023

trilinos-autotester commented Apr 24, 2023

trilinos-autotester commented May 8, 2023

trilinos-autotester commented May 8, 2023

bartlettroscoe commented May 9, 2023

bartlettroscoe commented May 9, 2023

bartlettroscoe commented Apr 24, 2023 •

edited

Loading