From d1db4ef8b3d1fe3ff3fdd1f450f8961554acc168 Mon Sep 17 00:00:00 2001 From: Allison Vacanti Date: Thu, 28 Feb 2019 13:15:27 -0500 Subject: [PATCH] Clarify intent of TypeString and TypeName functions. TypeName is used for logging, and is now TypeToString. TypeString is used for serialization, and is now SerializableTypeString. --- vtkm/cont/ArrayHandle.h | 5 +- vtkm/cont/ArrayHandleCartesianProduct.h | 10 ++-- vtkm/cont/ArrayHandleCast.h | 10 ++-- vtkm/cont/ArrayHandleCompositeVector.h | 8 ++-- vtkm/cont/ArrayHandleConcatenate.h | 10 ++-- vtkm/cont/ArrayHandleConstant.h | 8 ++-- vtkm/cont/ArrayHandleCounting.h | 8 ++-- vtkm/cont/ArrayHandleExtractComponent.h | 8 ++-- vtkm/cont/ArrayHandleGroupVec.h | 11 +++-- vtkm/cont/ArrayHandleGroupVecVariable.h | 10 ++-- vtkm/cont/ArrayHandleImplicit.h | 8 ++-- vtkm/cont/ArrayHandleIndex.h | 6 +-- vtkm/cont/ArrayHandlePermutation.h | 10 ++-- vtkm/cont/ArrayHandleReverse.h | 8 ++-- vtkm/cont/ArrayHandleSwizzle.h | 8 ++-- vtkm/cont/ArrayHandleTransform.h | 17 +++---- .../cont/ArrayHandleUniformPointCoordinates.h | 6 +-- vtkm/cont/ArrayHandleVirtual.h | 10 ++-- vtkm/cont/ArrayHandleVirtual.hxx | 12 ++--- vtkm/cont/ArrayHandleVirtualCoordinates.h | 15 +++--- vtkm/cont/ArrayHandleZip.h | 10 ++-- vtkm/cont/CMakeLists.txt | 2 +- vtkm/cont/CellSetExplicit.h | 11 +++-- vtkm/cont/CellSetPermutation.h | 6 +-- vtkm/cont/CellSetSingleType.h | 6 +-- vtkm/cont/CellSetStructured.h | 2 +- vtkm/cont/DynamicCellSet.h | 4 +- vtkm/cont/Logging.h | 26 +++++------ ...{TypeString.h => SerializableTypeString.h} | 46 +++++++++---------- vtkm/cont/Serialization.h | 2 +- vtkm/cont/StorageVirtual.h | 2 +- vtkm/cont/TryExecute.h | 2 +- vtkm/cont/VariantArrayHandle.h | 4 +- .../internal/VariantArrayHandleContainer.h | 8 ++-- .../tbb/internal/DeviceAdapterAlgorithmTBB.h | 10 ++-- .../UnitTestSerializationArrayHandle.cxx | 8 ++-- vtkm/filter/Filter.hxx | 4 +- vtkm/worklet/internal/DispatcherBase.h | 2 +- 38 files changed, 175 insertions(+), 168 deletions(-) rename vtkm/cont/{TypeString.h => SerializableTypeString.h} (71%) diff --git a/vtkm/cont/ArrayHandle.h b/vtkm/cont/ArrayHandle.h index 46cc20270..4915f2d15 100644 --- a/vtkm/cont/ArrayHandle.h +++ b/vtkm/cont/ArrayHandle.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -683,11 +684,11 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = "AH<" + TypeString::Get() + ">"; + static std::string name = "AH<" + SerializableTypeString::Get() + ">"; return name; } }; diff --git a/vtkm/cont/ArrayHandleCartesianProduct.h b/vtkm/cont/ArrayHandleCartesianProduct.h index edf7c5f56..727602847 100644 --- a/vtkm/cont/ArrayHandleCartesianProduct.h +++ b/vtkm/cont/ArrayHandleCartesianProduct.h @@ -438,21 +438,21 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = "AH_CartesianProduct<" + TypeString::Get() + "," + - TypeString::Get() + "," + TypeString::Get() + ">"; + static std::string name = "AH_CartesianProduct<" + SerializableTypeString::Get() + "," + + SerializableTypeString::Get() + "," + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString< +struct SerializableTypeString< vtkm::cont::ArrayHandle, vtkm::cont::internal::StorageTagCartesianProduct>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleCast.h b/vtkm/cont/ArrayHandleCast.h index fa904d446..05e4a3486 100644 --- a/vtkm/cont/ArrayHandleCast.h +++ b/vtkm/cont/ArrayHandleCast.h @@ -110,19 +110,19 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = - "AH_Cast_Functor<" + TypeString::Get() + "," + TypeString::Get() + ">"; + static std::string name = "AH_Cast_Functor<" + SerializableTypeString::Get() + "," + + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString> - : TypeString< +struct SerializableTypeString> + : SerializableTypeString< vtkm::cont::ArrayHandleTransform>> { }; diff --git a/vtkm/cont/ArrayHandleCompositeVector.h b/vtkm/cont/ArrayHandleCompositeVector.h index 69749052b..bf2e7a3f5 100644 --- a/vtkm/cont/ArrayHandleCompositeVector.h +++ b/vtkm/cont/ArrayHandleCompositeVector.h @@ -732,21 +732,21 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { static std::string name = - "AH_CompositeVector<" + internal::GetVariadicTypeString(AHs{}...) + ">"; + "AH_CompositeVector<" + internal::GetVariadicSerializableTypeString(AHs{}...) + ">"; return name; } }; template -struct TypeString>::ValueType, vtkm::cont::internal::StorageTagCompositeVector>>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleConcatenate.h b/vtkm/cont/ArrayHandleConcatenate.h index 2daedb8f2..b9b2b46c1 100644 --- a/vtkm/cont/ArrayHandleConcatenate.h +++ b/vtkm/cont/ArrayHandleConcatenate.h @@ -332,20 +332,20 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = - "AH_Concatenate<" + TypeString::Get() + "," + TypeString::Get() + ">"; + static std::string name = "AH_Concatenate<" + SerializableTypeString::Get() + "," + + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString< +struct SerializableTypeString< vtkm::cont::ArrayHandle>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleConstant.h b/vtkm/cont/ArrayHandleConstant.h index fdc10e565..ca015d198 100644 --- a/vtkm/cont/ArrayHandleConstant.h +++ b/vtkm/cont/ArrayHandleConstant.h @@ -93,18 +93,18 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = "AH_ConstantFunctor<" + TypeString::Get() + ">"; + static std::string name = "AH_ConstantFunctor<" + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString> - : TypeString>> +struct SerializableTypeString> + : SerializableTypeString>> { }; } diff --git a/vtkm/cont/ArrayHandleCounting.h b/vtkm/cont/ArrayHandleCounting.h index b78ee8ee7..d290aaa83 100644 --- a/vtkm/cont/ArrayHandleCounting.h +++ b/vtkm/cont/ArrayHandleCounting.h @@ -156,19 +156,19 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = "AH_Counting<" + TypeString::Get() + ">"; + static std::string name = "AH_Counting<" + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString< +struct SerializableTypeString< vtkm::cont::ArrayHandle::StorageTag>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleExtractComponent.h b/vtkm/cont/ArrayHandleExtractComponent.h index c659ec678..e7c024d44 100644 --- a/vtkm/cont/ArrayHandleExtractComponent.h +++ b/vtkm/cont/ArrayHandleExtractComponent.h @@ -318,20 +318,20 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = "AH_ExtractComponent<" + TypeString::Get() + ">"; + static std::string name = "AH_ExtractComponent<" + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString< +struct SerializableTypeString< vtkm::cont::ArrayHandle::ComponentType, vtkm::cont::StorageTagExtractComponent>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleGroupVec.h b/vtkm/cont/ArrayHandleGroupVec.h index e0a6bdd9d..281441686 100644 --- a/vtkm/cont/ArrayHandleGroupVec.h +++ b/vtkm/cont/ArrayHandleGroupVec.h @@ -374,20 +374,21 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { static std::string name = - "AH_GroupVec<" + TypeString::Get() + "," + std::to_string(NUM_COMPS) + ">"; + "AH_GroupVec<" + SerializableTypeString::Get() + "," + std::to_string(NUM_COMPS) + ">"; return name; } }; template -struct TypeString, - vtkm::cont::internal::StorageTagGroupVec>> - : TypeString> +struct SerializableTypeString< + vtkm::cont::ArrayHandle, + vtkm::cont::internal::StorageTagGroupVec>> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleGroupVecVariable.h b/vtkm/cont/ArrayHandleGroupVecVariable.h index 9353a092c..073d13c0a 100644 --- a/vtkm/cont/ArrayHandleGroupVecVariable.h +++ b/vtkm/cont/ArrayHandleGroupVecVariable.h @@ -514,21 +514,21 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = - "AH_GroupVecVariable<" + TypeString::Get() + "," + TypeString::Get() + ">"; + static std::string name = "AH_GroupVecVariable<" + SerializableTypeString::Get() + "," + + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString< +struct SerializableTypeString< vtkm::cont::ArrayHandle, vtkm::cont::internal::StorageTagGroupVecVariable>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleImplicit.h b/vtkm/cont/ArrayHandleImplicit.h index 833eb7792..f3d8bf9c1 100644 --- a/vtkm/cont/ArrayHandleImplicit.h +++ b/vtkm/cont/ArrayHandleImplicit.h @@ -154,20 +154,20 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = "AH_Implicit<" + TypeString::Get() + ">"; + static std::string name = "AH_Implicit<" + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString::ValueType, vtkm::cont::StorageTagImplicit>>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleIndex.h b/vtkm/cont/ArrayHandleIndex.h index 7c4562b51..29f787d39 100644 --- a/vtkm/cont/ArrayHandleIndex.h +++ b/vtkm/cont/ArrayHandleIndex.h @@ -70,14 +70,14 @@ namespace cont { template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string Get() { return "AH_IndexFunctor"; } }; template <> -struct TypeString - : TypeString> +struct SerializableTypeString + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandlePermutation.h b/vtkm/cont/ArrayHandlePermutation.h index 2470b33ae..46b6abe03 100644 --- a/vtkm/cont/ArrayHandlePermutation.h +++ b/vtkm/cont/ArrayHandlePermutation.h @@ -380,21 +380,21 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = - "AH_Permutation<" + TypeString::Get() + "," + TypeString::Get() + ">"; + static std::string name = "AH_Permutation<" + SerializableTypeString::Get() + "," + + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString< +struct SerializableTypeString< vtkm::cont::ArrayHandle>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleReverse.h b/vtkm/cont/ArrayHandleReverse.h index 62ed75e9b..a080f32c0 100644 --- a/vtkm/cont/ArrayHandleReverse.h +++ b/vtkm/cont/ArrayHandleReverse.h @@ -251,19 +251,19 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = "AH_Reverse<" + TypeString::Get() + ">"; + static std::string name = "AH_Reverse<" + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString< +struct SerializableTypeString< vtkm::cont::ArrayHandle>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleSwizzle.h b/vtkm/cont/ArrayHandleSwizzle.h index bdd8d16e2..72be449ae 100644 --- a/vtkm/cont/ArrayHandleSwizzle.h +++ b/vtkm/cont/ArrayHandleSwizzle.h @@ -406,21 +406,21 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { static std::string name = - "AH_Swizzle<" + TypeString::Get() + "," + std::to_string(NComps) + ">"; + "AH_Swizzle<" + SerializableTypeString::Get() + "," + std::to_string(NComps) + ">"; return name; } }; template -struct TypeString::ComponentType, NComps>, vtkm::cont::StorageTagSwizzle>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleTransform.h b/vtkm/cont/ArrayHandleTransform.h index ae0981658..03de01409 100644 --- a/vtkm/cont/ArrayHandleTransform.h +++ b/vtkm/cont/ArrayHandleTransform.h @@ -747,32 +747,33 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = "AH_Transform<" + TypeString::Get() + "," + - TypeString::Get() + "," + TypeString::Get() + ">"; + static std::string name = "AH_Transform<" + SerializableTypeString::Get() + "," + + SerializableTypeString::Get() + "," + SerializableTypeString::Get() + + ">"; return name; } }; template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = - "AH_Transform<" + TypeString::Get() + "," + TypeString::Get() + ">"; + static std::string name = "AH_Transform<" + SerializableTypeString::Get() + "," + + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString::ValueType, vtkm::cont::internal::StorageTagTransform>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/ArrayHandleUniformPointCoordinates.h b/vtkm/cont/ArrayHandleUniformPointCoordinates.h index 6b7a634ce..708408c12 100644 --- a/vtkm/cont/ArrayHandleUniformPointCoordinates.h +++ b/vtkm/cont/ArrayHandleUniformPointCoordinates.h @@ -70,16 +70,16 @@ namespace cont { template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string Get() { return "AH_UniformPointCoordinates"; } }; template <> -struct TypeString, vtkm::cont::StorageTagImplicit>> - : TypeString + : SerializableTypeString { }; } diff --git a/vtkm/cont/ArrayHandleVirtual.h b/vtkm/cont/ArrayHandleVirtual.h index 5b371ad24..36ffe5f05 100644 --- a/vtkm/cont/ArrayHandleVirtual.h +++ b/vtkm/cont/ArrayHandleVirtual.h @@ -393,7 +393,7 @@ private: std::true_type vtkmNotUsed(notFromArrayHandleVirtual)) const { VTKM_LOG_CAST_FAIL(*this, ArrayHandleType); - throwFailedDynamicCast("ArrayHandleVirtual", vtkm::cont::TypeName()); + throwFailedDynamicCast("ArrayHandleVirtual", vtkm::cont::TypeToString()); return ArrayHandleType{}; } @@ -402,7 +402,7 @@ private: std::false_type vtkmNotUsed(notFromArrayHandleVirtual)) const { VTKM_LOG_CAST_FAIL(*this, ArrayHandleType); - throwFailedDynamicCast("ArrayHandleVirtual", vtkm::cont::TypeName()); + throwFailedDynamicCast("ArrayHandleVirtual", vtkm::cont::TypeToString()); return ArrayHandleType{}; } @@ -417,7 +417,7 @@ private: if (!derived) { VTKM_LOG_CAST_FAIL(*this, ArrayHandleType); - throwFailedDynamicCast("ArrayHandleVirtual", vtkm::cont::TypeName()); + throwFailedDynamicCast("ArrayHandleVirtual", vtkm::cont::TypeToString()); } VTKM_LOG_CAST_SUCC(*this, derived); return *derived; @@ -492,11 +492,11 @@ void CastAndCall(vtkm::cont::ArrayHandleVirtual //============================================================================= // Specializations of serialization related classes template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = "AH_Virtual<" + TypeString::Get() + ">"; + static std::string name = "AH_Virtual<" + SerializableTypeString::Get() + ">"; return name; } }; diff --git a/vtkm/cont/ArrayHandleVirtual.hxx b/vtkm/cont/ArrayHandleVirtual.hxx index 09e4d07da..bdecce049 100644 --- a/vtkm/cont/ArrayHandleVirtual.hxx +++ b/vtkm/cont/ArrayHandleVirtual.hxx @@ -38,7 +38,7 @@ ArrayHandleType inline ArrayHandle::CastToType( if (!this->Storage) { VTKM_LOG_CAST_FAIL(*this, ArrayHandleType); - throwFailedDynamicCast("ArrayHandleVirtual", vtkm::cont::TypeName()); + throwFailedDynamicCast("ArrayHandleVirtual", vtkm::cont::TypeToString()); } using S = typename ArrayHandleType::StorageTag; const auto* any = this->Storage->template Cast>(); @@ -86,7 +86,7 @@ struct IntAnySerializer { if (obj.template IsType()) { - vtkmdiy::save(bb, vtkm::cont::TypeString::Get()); + vtkmdiy::save(bb, vtkm::cont::SerializableTypeString::Get()); using S = typename CountingType::StorageTag; const vtkm::cont::StorageVirtual* storage = obj.GetStorage(); @@ -95,7 +95,7 @@ struct IntAnySerializer } else if (obj.template IsType()) { - vtkmdiy::save(bb, vtkm::cont::TypeString::Get()); + vtkmdiy::save(bb, vtkm::cont::SerializableTypeString::Get()); using S = typename ConstantType::StorageTag; const vtkm::cont::StorageVirtual* storage = obj.GetStorage(); @@ -104,7 +104,7 @@ struct IntAnySerializer } else { - vtkmdiy::save(bb, vtkm::cont::TypeString::Get()); + vtkmdiy::save(bb, vtkm::cont::SerializableTypeString::Get()); vtkm::cont::internal::ArrayHandleDefaultSerialization(bb, obj); } } @@ -114,13 +114,13 @@ struct IntAnySerializer std::string typeString; vtkmdiy::load(bb, typeString); - if (typeString == vtkm::cont::TypeString::Get()) + if (typeString == vtkm::cont::SerializableTypeString::Get()) { CountingType array; vtkmdiy::load(bb, array); obj = std::move(vtkm::cont::ArrayHandleVirtual{ array }); } - else if (typeString == vtkm::cont::TypeString::Get()) + else if (typeString == vtkm::cont::SerializableTypeString::Get()) { ConstantType array; vtkmdiy::load(bb, array); diff --git a/vtkm/cont/ArrayHandleVirtualCoordinates.h b/vtkm/cont/ArrayHandleVirtualCoordinates.h index 94375a025..f7f0ae7f2 100644 --- a/vtkm/cont/ArrayHandleVirtualCoordinates.h +++ b/vtkm/cont/ArrayHandleVirtualCoordinates.h @@ -96,7 +96,7 @@ void CastAndCall(const vtkm::cont::ArrayHandleVirtualCoordinates& coords, template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string Get() { return "AH_VirtualCoordinates"; } }; @@ -132,7 +132,7 @@ public: using T = typename HandleType::ValueType; using S = typename HandleType::StorageTag; auto array = storage->Cast>(); - vtkmdiy::save(bb, vtkm::cont::TypeString::Get()); + vtkmdiy::save(bb, vtkm::cont::SerializableTypeString::Get()); vtkmdiy::save(bb, array->GetHandle()); } else if (obj.IsType()) @@ -141,12 +141,12 @@ public: using T = typename HandleType::ValueType; using S = typename HandleType::StorageTag; auto array = storage->Cast>(); - vtkmdiy::save(bb, vtkm::cont::TypeString::Get()); + vtkmdiy::save(bb, vtkm::cont::SerializableTypeString::Get()); vtkmdiy::save(bb, array->GetHandle()); } else { - vtkmdiy::save(bb, vtkm::cont::TypeString::Get()); + vtkmdiy::save(bb, vtkm::cont::SerializableTypeString::Get()); vtkm::cont::internal::ArrayHandleDefaultSerialization(bb, obj); } } @@ -156,19 +156,20 @@ public: std::string typeString; vtkmdiy::load(bb, typeString); - if (typeString == vtkm::cont::TypeString::Get()) + if (typeString == + vtkm::cont::SerializableTypeString::Get()) { vtkm::cont::ArrayHandleUniformPointCoordinates array; vtkmdiy::load(bb, array); obj = vtkm::cont::ArrayHandleVirtualCoordinates(array); } - else if (typeString == vtkm::cont::TypeString::Get()) + else if (typeString == vtkm::cont::SerializableTypeString::Get()) { RectilinearCoordsArrayType array; vtkmdiy::load(bb, array); obj = vtkm::cont::ArrayHandleVirtualCoordinates(array); } - else if (typeString == vtkm::cont::TypeString::Get()) + else if (typeString == vtkm::cont::SerializableTypeString::Get()) { BasicCoordsType array; vtkmdiy::load(bb, array); diff --git a/vtkm/cont/ArrayHandleZip.h b/vtkm/cont/ArrayHandleZip.h index f4e501fda..ade3ad4a4 100644 --- a/vtkm/cont/ArrayHandleZip.h +++ b/vtkm/cont/ArrayHandleZip.h @@ -392,21 +392,21 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = - "AH_Zip<" + TypeString::Get() + "," + TypeString::Get() + ">"; + static std::string name = "AH_Zip<" + SerializableTypeString::Get() + "," + + SerializableTypeString::Get() + ">"; return name; } }; template -struct TypeString< +struct SerializableTypeString< vtkm::cont::ArrayHandle, vtkm::cont::internal::StorageTagZip>> - : TypeString> + : SerializableTypeString> { }; } diff --git a/vtkm/cont/CMakeLists.txt b/vtkm/cont/CMakeLists.txt index b81e5f7fa..a10736d00 100644 --- a/vtkm/cont/CMakeLists.txt +++ b/vtkm/cont/CMakeLists.txt @@ -107,7 +107,7 @@ set(headers StorageVirtual.h Timer.h TryExecute.h - TypeString.h + SerializableTypeString.h VariantArrayHandle.h VirtualObjectHandle.h ) diff --git a/vtkm/cont/CellSetExplicit.h b/vtkm/cont/CellSetExplicit.h index 0bd2b3e8a..ba88d6ab2 100644 --- a/vtkm/cont/CellSetExplicit.h +++ b/vtkm/cont/CellSetExplicit.h @@ -350,15 +350,16 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString< + vtkm::cont::CellSetExplicit> { static VTKM_CONT const std::string& Get() { static std::string name = "CS_Explicit<" + - TypeString>::Get() + "_ST," + - TypeString>::Get() + "_ST," + - TypeString>::Get() + "_ST," + - TypeString>::Get() + "_ST>"; + SerializableTypeString>::Get() + "_ST," + + SerializableTypeString>::Get() + "_ST," + + SerializableTypeString>::Get() + "_ST," + + SerializableTypeString>::Get() + "_ST>"; return name; } diff --git a/vtkm/cont/CellSetPermutation.h b/vtkm/cont/CellSetPermutation.h index d0e40e679..d62916722 100644 --- a/vtkm/cont/CellSetPermutation.h +++ b/vtkm/cont/CellSetPermutation.h @@ -402,12 +402,12 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = - "CS_Permutation<" + TypeString::Get() + "," + TypeString::Get() + ">"; + static std::string name = "CS_Permutation<" + SerializableTypeString::Get() + "," + + SerializableTypeString::Get() + ">"; return name; } }; diff --git a/vtkm/cont/CellSetSingleType.h b/vtkm/cont/CellSetSingleType.h index 3d217612c..dd8e877d9 100644 --- a/vtkm/cont/CellSetSingleType.h +++ b/vtkm/cont/CellSetSingleType.h @@ -269,12 +269,12 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = - "CS_Single<" + TypeString>::Get() + "_ST>"; + static std::string name = "CS_Single<" + + SerializableTypeString>::Get() + "_ST>"; return name; } diff --git a/vtkm/cont/CellSetStructured.h b/vtkm/cont/CellSetStructured.h index 54af8e36a..3d1b04d36 100644 --- a/vtkm/cont/CellSetStructured.h +++ b/vtkm/cont/CellSetStructured.h @@ -132,7 +132,7 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { diff --git a/vtkm/cont/DynamicCellSet.h b/vtkm/cont/DynamicCellSet.h index 25d9ea2cc..fab65383e 100644 --- a/vtkm/cont/DynamicCellSet.h +++ b/vtkm/cont/DynamicCellSet.h @@ -375,7 +375,7 @@ struct DynamicCellSetSerializeFunctor template void operator()(const CellSetType& cs, BinaryBuffer& bb) const { - vtkmdiy::save(bb, vtkm::cont::TypeString::Get()); + vtkmdiy::save(bb, vtkm::cont::SerializableTypeString::Get()); vtkmdiy::save(bb, cs); } }; @@ -390,7 +390,7 @@ struct DynamicCellSetDeserializeFunctor bool& success, BinaryBuffer& bb) const { - if (!success && (typeString == vtkm::cont::TypeString::Get())) + if (!success && (typeString == vtkm::cont::SerializableTypeString::Get())) { CellSetType cs; vtkmdiy::load(bb, cs); diff --git a/vtkm/cont/Logging.h b/vtkm/cont/Logging.h index 8404ed0e4..0d99a3228 100644 --- a/vtkm/cont/Logging.h +++ b/vtkm/cont/Logging.h @@ -102,7 +102,7 @@ /// /// The helper functions vtkm::cont::GetHumanReadableSize and /// vtkm::cont::GetSizeString assist in formating byte sizes to a more readable -/// format. Similarly, the vtkm::cont::TypeName template functions provide RTTI +/// format. Similarly, the vtkm::cont::TypeToString template functions provide RTTI /// based type-name information. When logging is enabled, these use the logging /// backend to demangle symbol names on supported platforms. /// @@ -130,7 +130,7 @@ /// /// \code /// VTKM_LOG_S(vtkm::cont::LogLevel::Perf, -/// "Executed functor " << vtkm::cont::TypeName(functor) +/// "Executed functor " << vtkm::cont::TypeToString(functor) /// << " on device " << deviceId.GetName()); /// \endcode @@ -143,7 +143,7 @@ /// \code /// VTKM_LOG_F(vtkm::cont::LogLevel::Perf, /// "Executed functor %s on device %s", -/// vtkm::cont::TypeName(functor).c_str(), +/// vtkm::cont::TypeToString(functor).c_str(), /// deviceId.GetName().c_str()); /// \endcode @@ -161,7 +161,7 @@ /// { /// VTKM_LOG_SCOPE(vtkm::cont::LogLevel::Perf, /// "Executing filter %s", -/// vtkm::cont::TypeName(myFilter).c_str()); +/// vtkm::cont::TypeToString(myFilter).c_str()); /// myFilter.Execute(); /// } /// \endcode @@ -187,7 +187,7 @@ /// \brief Convenience macro for logging a TryExecute failure to the Error level. /// If logging is disabled, a message is still printed to stderr. /// \param errorMessage The error message detailing the failure. -/// \param functorName The name of the functor (see vtkm::cont::TypeName) +/// \param functorName The name of the functor (see vtkm::cont::TypeToString) /// \param deviceId The device tag / id for the device on which the functor /// failed. @@ -195,7 +195,7 @@ /// \brief Similar to VTKM_LOG_TRYEXECUTE_FAIL, but also informs the user /// that the device has been disable for future TryExecute calls. /// \param errorMessage The error message detailing the failure. -/// \param functorName The name of the functor (see vtkm::cont::TypeName) +/// \param functorName The name of the functor (see vtkm::cont::TypeToString) /// \param deviceId The device tag / id for the device on which the functor /// failed. @@ -219,18 +219,18 @@ #define VTKM_LOG_CAST_SUCC(inObj, outObj) \ VTKM_LOG_F(vtkm::cont::LogLevel::Cast, \ "Cast succeeded: %s (%p) --> %s (%p)", \ - vtkm::cont::TypeName(inObj).c_str(), \ + vtkm::cont::TypeToString(inObj).c_str(), \ &inObj, \ - vtkm::cont::TypeName(outObj).c_str(), \ + vtkm::cont::TypeToString(outObj).c_str(), \ &outObj) // Cast failure: #define VTKM_LOG_CAST_FAIL(inObj, outType) \ VTKM_LOG_F(vtkm::cont::LogLevel::Cast, \ "Cast failed: %s (%p) --> %s", \ - vtkm::cont::TypeName(inObj).c_str(), \ + vtkm::cont::TypeToString(inObj).c_str(), \ &inObj, \ - vtkm::cont::TypeName().c_str()) + vtkm::cont::TypeToString().c_str()) // TryExecute failure #define VTKM_LOG_TRYEXECUTE_FAIL(errorMessage, functorName, deviceId) \ @@ -427,7 +427,7 @@ std::string GetSizeString(vtkm::UInt64 bytes, int prec = 2); * @{ */ template -static inline VTKM_CONT std::string TypeName() +static inline VTKM_CONT std::string TypeToString() { #ifdef VTKM_ENABLE_LOGGING return loguru::demangle(typeid(T).name()).c_str(); @@ -437,9 +437,9 @@ static inline VTKM_CONT std::string TypeName() } template -static inline VTKM_CONT std::string TypeName(const T&) +static inline VTKM_CONT std::string TypeToString(const T&) { - return TypeName(); + return TypeToString(); } /**@}*/ } diff --git a/vtkm/cont/TypeString.h b/vtkm/cont/SerializableTypeString.h similarity index 71% rename from vtkm/cont/TypeString.h rename to vtkm/cont/SerializableTypeString.h index 9f09a95bc..9e6025078 100644 --- a/vtkm/cont/TypeString.h +++ b/vtkm/cont/SerializableTypeString.h @@ -17,8 +17,8 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtk_m_cont_TypeString_h -#define vtk_m_cont_TypeString_h +#ifndef vtk_m_cont_SerializableTypeString_h +#define vtk_m_cont_SerializableTypeString_h #include @@ -32,7 +32,7 @@ namespace cont /// \brief A traits class that gives a unique name for a type. This class /// should be specialized for every type that has to be serialized by diy. template -struct TypeString +struct SerializableTypeString #ifdef VTKM_DOXYGEN_ONLY { static VTKM_CONT const std::string& Get() @@ -48,21 +48,21 @@ namespace internal { template -std::string GetVariadicTypeString(const T&, const Ts&... ts) +std::string GetVariadicSerializableTypeString(const T&, const Ts&... ts) { - return TypeString::Get() + "," + GetVariadicTypeString(ts...); + return SerializableTypeString::Get() + "," + GetVariadicSerializableTypeString(ts...); } template -std::string GetVariadicTypeString(const T&) +std::string GetVariadicSerializableTypeString(const T&) { - return TypeString::Get(); + return SerializableTypeString::Get(); } } // internal template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string& Get() { @@ -72,7 +72,7 @@ struct TypeString }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string& Get() { @@ -82,7 +82,7 @@ struct TypeString }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string& Get() { @@ -92,7 +92,7 @@ struct TypeString }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string& Get() { @@ -102,7 +102,7 @@ struct TypeString }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string& Get() { @@ -112,7 +112,7 @@ struct TypeString }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string& Get() { @@ -122,7 +122,7 @@ struct TypeString }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string& Get() { @@ -132,7 +132,7 @@ struct TypeString }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string& Get() { @@ -142,7 +142,7 @@ struct TypeString }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string& Get() { @@ -152,7 +152,7 @@ struct TypeString }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string& Get() { @@ -162,27 +162,27 @@ struct TypeString }; template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { static std::string name = - "V<" + TypeString::Get() + "," + std::to_string(NumComponents) + ">"; + "V<" + SerializableTypeString::Get() + "," + std::to_string(NumComponents) + ">"; return name; } }; template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { - static std::string name = - "vtkm::Pair<" + TypeString::Get() + "," + TypeString::Get() + ">"; + static std::string name = "vtkm::Pair<" + SerializableTypeString::Get() + "," + + SerializableTypeString::Get() + ">"; return name; } }; } } // vtkm::cont -#endif // vtk_m_cont_TypeString_h +#endif // vtk_m_cont_SerializableTypeString_h diff --git a/vtkm/cont/Serialization.h b/vtkm/cont/Serialization.h index 434cf146e..6915ee4c1 100644 --- a/vtkm/cont/Serialization.h +++ b/vtkm/cont/Serialization.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_Serialization_h #define vtk_m_cont_Serialization_h -#include +#include #include diff --git a/vtkm/cont/StorageVirtual.h b/vtkm/cont/StorageVirtual.h index fab29a3d5..83855c483 100644 --- a/vtkm/cont/StorageVirtual.h +++ b/vtkm/cont/StorageVirtual.h @@ -120,7 +120,7 @@ public: if (!derived) { VTKM_LOG_CAST_FAIL(*this, DerivedStorage); - throwFailedDynamicCast("StorageVirtual", vtkm::cont::TypeName()); + throwFailedDynamicCast("StorageVirtual", vtkm::cont::TypeToString()); } VTKM_LOG_CAST_SUCC(*this, derived); return derived; diff --git a/vtkm/cont/TryExecute.h b/vtkm/cont/TryExecute.h index 4a3dde7f2..db1603008 100644 --- a/vtkm/cont/TryExecute.h +++ b/vtkm/cont/TryExecute.h @@ -53,7 +53,7 @@ inline bool TryExecuteIfValid(std::true_type, } catch (...) { - detail::HandleTryExecuteException(tag, tracker, vtkm::cont::TypeName()); + detail::HandleTryExecuteException(tag, tracker, vtkm::cont::TypeToString()); } } diff --git a/vtkm/cont/VariantArrayHandle.h b/vtkm/cont/VariantArrayHandle.h index 2e38f87a7..9387287e9 100644 --- a/vtkm/cont/VariantArrayHandle.h +++ b/vtkm/cont/VariantArrayHandle.h @@ -445,7 +445,7 @@ struct VariantArrayHandleSerializeFunctor template void operator()(const ArrayHandleType& ah, BinaryBuffer& bb) const { - vtkmdiy::save(bb, vtkm::cont::TypeString::Get()); + vtkmdiy::save(bb, vtkm::cont::SerializableTypeString::Get()); vtkmdiy::save(bb, ah); } }; @@ -461,7 +461,7 @@ struct VariantArrayHandleDeserializeFunctor { using ArrayHandleType = vtkm::cont::ArrayHandleVirtual; - if (!success && (typeString == vtkm::cont::TypeString::Get())) + if (!success && (typeString == vtkm::cont::SerializableTypeString::Get())) { ArrayHandleType ah; vtkmdiy::load(bb, ah); diff --git a/vtkm/cont/internal/VariantArrayHandleContainer.h b/vtkm/cont/internal/VariantArrayHandleContainer.h index 3564e70ab..53d098a13 100644 --- a/vtkm/cont/internal/VariantArrayHandleContainer.h +++ b/vtkm/cont/internal/VariantArrayHandleContainer.h @@ -164,8 +164,8 @@ struct VTKM_ALWAYS_EXPORT Caster if (!IsValueType(container)) { VTKM_LOG_CAST_FAIL(container, ArrayHandleType); - throwFailedDynamicCast(vtkm::cont::TypeName(container), - vtkm::cont::TypeName()); + throwFailedDynamicCast(vtkm::cont::TypeToString(container), + vtkm::cont::TypeToString()); } const auto* derived = static_cast*>(container); @@ -182,8 +182,8 @@ struct VTKM_ALWAYS_EXPORT Caster if (!IsValueType(container)) { VTKM_LOG_CAST_FAIL(container, vtkm::cont::ArrayHandleVirtual); - throwFailedDynamicCast(vtkm::cont::TypeName(container), - vtkm::cont::TypeName>()); + throwFailedDynamicCast(vtkm::cont::TypeToString(container), + vtkm::cont::TypeToString>()); } // Technically, this method returns a copy of the \c ArrayHandle. But diff --git a/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h b/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h index db9165641..419888db6 100644 --- a/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h +++ b/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h @@ -255,8 +255,9 @@ public: template VTKM_CONT static inline void Schedule(FunctorType functor, vtkm::Id numInstances) { - VTKM_LOG_SCOPE( - vtkm::cont::LogLevel::Perf, "Schedule TBB 1D: '%s'", vtkm::cont::TypeName(functor).c_str()); + VTKM_LOG_SCOPE(vtkm::cont::LogLevel::Perf, + "Schedule TBB 1D: '%s'", + vtkm::cont::TypeToString(functor).c_str()); vtkm::exec::tbb::internal::TaskTiling1D kernel(functor); ScheduleTask(kernel, numInstances); @@ -265,8 +266,9 @@ public: template VTKM_CONT static inline void Schedule(FunctorType functor, vtkm::Id3 rangeMax) { - VTKM_LOG_SCOPE( - vtkm::cont::LogLevel::Perf, "Schedule TBB 3D: '%s'", vtkm::cont::TypeName(functor).c_str()); + VTKM_LOG_SCOPE(vtkm::cont::LogLevel::Perf, + "Schedule TBB 3D: '%s'", + vtkm::cont::TypeToString(functor).c_str()); vtkm::exec::tbb::internal::TaskTiling3D kernel(functor); ScheduleTask(kernel, rangeMax); diff --git a/vtkm/cont/testing/UnitTestSerializationArrayHandle.cxx b/vtkm/cont/testing/UnitTestSerializationArrayHandle.cxx index 9debcffd2..1fede1254 100644 --- a/vtkm/cont/testing/UnitTestSerializationArrayHandle.cxx +++ b/vtkm/cont/testing/UnitTestSerializationArrayHandle.cxx @@ -535,24 +535,24 @@ namespace cont { template -struct TypeString> +struct SerializableTypeString> { static VTKM_CONT const std::string& Get() { static std::string name = - "TestArrayHandleImplicit::ImplicitFunctor<" + TypeString::Get() + ">"; + "TestArrayHandleImplicit::ImplicitFunctor<" + SerializableTypeString::Get() + ">"; return name; } }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string Get() { return "TestArrayHandleTransform::TransformFunctor"; } }; template <> -struct TypeString +struct SerializableTypeString { static VTKM_CONT const std::string Get() { diff --git a/vtkm/filter/Filter.hxx b/vtkm/filter/Filter.hxx index a9051925a..0fdc2c946 100644 --- a/vtkm/filter/Filter.hxx +++ b/vtkm/filter/Filter.hxx @@ -281,7 +281,7 @@ inline VTKM_CONT vtkm::cont::DataSet Filter::Execute( const vtkm::filter::PolicyBase& policy) { VTKM_LOG_SCOPE( - vtkm::cont::LogLevel::Perf, "Filter: '%s'", vtkm::cont::TypeName().c_str()); + vtkm::cont::LogLevel::Perf, "Filter: '%s'", vtkm::cont::TypeToString().c_str()); Derived* self = static_cast(this); vtkm::cont::MultiBlock output = self->Execute(vtkm::cont::MultiBlock(input), policy); @@ -301,7 +301,7 @@ inline VTKM_CONT vtkm::cont::MultiBlock Filter::Execute( { VTKM_LOG_SCOPE(vtkm::cont::LogLevel::Perf, "Filter (MultiBlock): '%s'", - vtkm::cont::TypeName().c_str()); + vtkm::cont::TypeToString().c_str()); Derived* self = static_cast(this); diff --git a/vtkm/worklet/internal/DispatcherBase.h b/vtkm/worklet/internal/DispatcherBase.h index 1b281b610..256bfa32b 100644 --- a/vtkm/worklet/internal/DispatcherBase.h +++ b/vtkm/worklet/internal/DispatcherBase.h @@ -667,7 +667,7 @@ public: { VTKM_LOG_SCOPE(vtkm::cont::LogLevel::Perf, "Invoking Worklet: '%s'", - vtkm::cont::TypeName().c_str()); + vtkm::cont::TypeToString().c_str()); this->StartInvoke(std::forward(args)...); }