experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issues with TypeIndex on Windows, i.e. hash on the type name where available since this otherwise causes problems when loading different shared libraries with RTLD_LOCAL.

Browse Source 
PiperOrigin-RevId: 353279508
Change-Id: I7e5aeb5d043efddf924228517dd9ec93eaaf6c6c
This commit is contained in:
Robert Neale 2021-01-22 11:13:51 -08:00 committed by TensorFlower Gardener
parent 3516dc97f3
commit e8dd848664
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tensorflow/core/framework/type_index.h
View File

@ -24,9 +24,9 @@ limitations under the License.
#include "tensorflow/core/platform/types.h" #include "tensorflow/core/platform/types.h"
#if defined(MACOS) || defined(TARGET_OS_MAC) #if defined(MACOS) || defined(TARGET_OS_MAC) || defined(PLATFORM_WINDOWS)
#include "tensorflow/core/platform/hash.h" #include "tensorflow/core/platform/hash.h"
#endif // defined(MACOS) || defined(TARGET_OS_MAC) #endif // defined(MACOS) || defined(TARGET_OS_MAC) || defined(PLATFORM_WINDOWS)
namespace tensorflow { namespace tensorflow {
@ -62,7 +62,7 @@ class TypeIndex {
#if defined(__GXX_RTTI) || defined(_CPPRTTI) #if defined(__GXX_RTTI) || defined(_CPPRTTI)
#if defined(MACOS) || defined(TARGET_OS_MAC) #if defined(MACOS) || defined(TARGET_OS_MAC) || defined(PLATFORM_WINDOWS)
// Use a hash based on the type name to avoid issues due to RTLD_LOCAL on // Use a hash based on the type name to avoid issues due to RTLD_LOCAL on
// MacOS (b/156979412). // MacOS (b/156979412).
return TypeIndex(Hash64(typeid(T).name()), typeid(T).name()); return TypeIndex(Hash64(typeid(T).name()), typeid(T).name());
@ -70,7 +70,7 @@ class TypeIndex {
// Use the real type name if we have RTTI. // Use the real type name if we have RTTI.
return TypeIndex(static_cast<uint64>(reinterpret_cast<intptr_t>(hash_bit)), return TypeIndex(static_cast<uint64>(reinterpret_cast<intptr_t>(hash_bit)),
typeid(T).name()); typeid(T).name());
#endif // defined(MACOS) || defined(TARGET_OS_MAC) #endif // defined(MACOS) || defined(TARGET_OS_MAC) || defined(PLATFORM_WINDOWS)
#else #else
#if TARGET_OS_OSX #if TARGET_OS_OSX