diff --git a/packages/tpetra/core/src/Tpetra_Details_KokkosCounter.cpp b/packages/tpetra/core/src/Tpetra_Details_KokkosCounter.cpp index 912a0c532eda..cd8dadd24ed1 100644 --- a/packages/tpetra/core/src/Tpetra_Details_KokkosCounter.cpp +++ b/packages/tpetra/core/src/Tpetra_Details_KokkosCounter.cpp @@ -88,7 +88,11 @@ namespace Details { // Figure out what count bin to stick this in int idx = (int) eid.type; +#if KOKKOS_VERSION >= 40499 + if(eid.instance_id == int_for_synchronization_reason(SpecialSynchronizationCases::GlobalDeviceSynchronization)) +#else if(eid.instance_id == Impl::int_for_synchronization_reason(SpecialSynchronizationCases::GlobalDeviceSynchronization)) +#endif count_global[idx]++; else count_instance[idx]++; diff --git a/packages/tpetra/core/src/Tpetra_Details_KokkosTeuchosTimerInjection.cpp b/packages/tpetra/core/src/Tpetra_Details_KokkosTeuchosTimerInjection.cpp index e37c7a5b29a6..9379aaf0ce3a 100644 --- a/packages/tpetra/core/src/Tpetra_Details_KokkosTeuchosTimerInjection.cpp +++ b/packages/tpetra/core/src/Tpetra_Details_KokkosTeuchosTimerInjection.cpp @@ -42,11 +42,17 @@ namespace { else if (eid.type == DeviceType::OpenACC) device_label+="OpenACC"; else if (eid.type == DeviceType::Unknown) device_label+="Unknown"; else device_label+="Unknown to Tpetra"; - +#if KOKKOS_VERSION >= 40499 + if(eid.instance_id == int_for_synchronization_reason(SpecialSynchronizationCases::GlobalDeviceSynchronization)) + device_label += " All Instances)"; + else if(eid.instance_id == int_for_synchronization_reason(SpecialSynchronizationCases::DeepCopyResourceSynchronization)) + device_label += " DeepCopyResource)"; +#else if(eid.instance_id == Impl::int_for_synchronization_reason(SpecialSynchronizationCases::GlobalDeviceSynchronization)) device_label += " All Instances)"; else if(eid.instance_id == Impl::int_for_synchronization_reason(SpecialSynchronizationCases::DeepCopyResourceSynchronization)) device_label += " DeepCopyResource)"; +#endif else device_label += " Instance " + std::to_string(eid.instance_id) + ")";