aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/lib/hash
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2018-03-14 17:08:35 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-03-14 17:15:52 -0700
commit53bad5a6eee61f7ac5f627640ff096266532f041 (patch)
treed2a703bc8ca941df821cad5ea22101ad340f813b /tensorflow/core/lib/hash
parentcbce7fd25c5f1bd109692ac1d5250fe1942d5dc0 (diff)
Automated g4 rollback of changelist 189060958
PiperOrigin-RevId: 189110935
Diffstat (limited to 'tensorflow/core/lib/hash')
-rw-r--r--tensorflow/core/lib/hash/hash.h1
-rw-r--r--tensorflow/core/lib/hash/hash_test.cc73
2 files changed, 0 insertions, 74 deletions
diff --git a/tensorflow/core/lib/hash/hash.h b/tensorflow/core/lib/hash/hash.h
index ca05e6346e..77b8031598 100644
--- a/tensorflow/core/lib/hash/hash.h
+++ b/tensorflow/core/lib/hash/hash.h
@@ -76,7 +76,6 @@ struct hash<StringPiece> {
return static_cast<size_t>(Hash64(sp.data(), sp.size()));
}
};
-using StringPieceHasher = ::tensorflow::hash<StringPiece>;
template <typename T, typename U>
struct hash<std::pair<T, U>> {
diff --git a/tensorflow/core/lib/hash/hash_test.cc b/tensorflow/core/lib/hash/hash_test.cc
index 7d58313132..0e5f6c6803 100644
--- a/tensorflow/core/lib/hash/hash_test.cc
+++ b/tensorflow/core/lib/hash/hash_test.cc
@@ -13,8 +13,6 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include <map>
-#include <unordered_map>
#include <vector>
#include "tensorflow/core/lib/hash/hash.h"
@@ -83,75 +81,4 @@ static void BM_Hash32(int iters, int len) {
}
BENCHMARK(BM_Hash32)->Range(1, 1024);
-TEST(StringPieceHasher, Equality) {
- StringPieceHasher hasher;
-
- StringPiece s1("foo");
- StringPiece s2("bar");
- StringPiece s3("baz");
- StringPiece s4("zot");
-
- EXPECT_TRUE(hasher(s1) != hasher(s2));
- EXPECT_TRUE(hasher(s1) != hasher(s3));
- EXPECT_TRUE(hasher(s1) != hasher(s4));
- EXPECT_TRUE(hasher(s2) != hasher(s3));
- EXPECT_TRUE(hasher(s2) != hasher(s4));
- EXPECT_TRUE(hasher(s3) != hasher(s4));
-
- EXPECT_TRUE(hasher(s1) == hasher(s1));
- EXPECT_TRUE(hasher(s2) == hasher(s2));
- EXPECT_TRUE(hasher(s3) == hasher(s3));
- EXPECT_TRUE(hasher(s4) == hasher(s4));
-}
-
-TEST(StringPieceHasher, HashMap) {
- string s1("foo");
- string s2("bar");
- string s3("baz");
-
- StringPiece p1(s1);
- StringPiece p2(s2);
- StringPiece p3(s3);
-
- std::unordered_map<StringPiece, int, StringPieceHasher> map;
-
- map.insert(std::make_pair(p1, 0));
- map.insert(std::make_pair(p2, 1));
- map.insert(std::make_pair(p3, 2));
- EXPECT_EQ(map.size(), 3);
-
- bool found[3] = {false, false, false};
- for (auto const& val : map) {
- int x = val.second;
- EXPECT_TRUE(x >= 0 && x < 3);
- EXPECT_TRUE(!found[x]);
- found[x] = true;
- }
- EXPECT_EQ(found[0], true);
- EXPECT_EQ(found[1], true);
- EXPECT_EQ(found[2], true);
-
- auto new_iter = map.find("zot");
- EXPECT_TRUE(new_iter == map.end());
-
- new_iter = map.find("bar");
- EXPECT_TRUE(new_iter != map.end());
-
- map.erase(new_iter);
- EXPECT_EQ(map.size(), 2);
-
- found[0] = false;
- found[1] = false;
- found[2] = false;
- for (const auto& iter : map) {
- int x = iter.second;
- EXPECT_TRUE(x >= 0 && x < 3);
- EXPECT_TRUE(!found[x]);
- found[x] = true;
- }
- EXPECT_EQ(found[0], true);
- EXPECT_EQ(found[1], false);
- EXPECT_EQ(found[2], true);
-}
-
} // namespace tensorflow