From a056e26a5faa543aace9a4b748e84ea43064fda2 Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Wed, 21 Feb 2024 16:06:21 -0800 Subject: [PATCH] avoid boost --- moses2/ArcLists.h | 5 +++-- moses2/Phrase.h | 1 + moses2/SCFG/Misc.cpp | 7 ++++++- moses2/SCFG/Misc.h | 4 ++-- moses2/legacy/Bitmaps.h | 1 + moses2/legacy/FactorCollection.h | 4 ++-- 6 files changed, 15 insertions(+), 7 deletions(-) mode change 100644 => 100755 moses2/ArcLists.h mode change 100644 => 100755 moses2/SCFG/Misc.cpp mode change 100644 => 100755 moses2/SCFG/Misc.h mode change 100644 => 100755 moses2/legacy/Bitmaps.h mode change 100644 => 100755 moses2/legacy/FactorCollection.h diff --git a/moses2/ArcLists.h b/moses2/ArcLists.h old mode 100644 new mode 100755 index 742c9d9e2..b0269d8d8 --- a/moses2/ArcLists.h +++ b/moses2/ArcLists.h @@ -6,7 +6,8 @@ */ #pragma once #include -#include +#include +#include namespace Moses2 { @@ -31,7 +32,7 @@ public: std::string Debug(const System &system) const; protected: - typedef boost::unordered_map Coll; + typedef std::unordered_map Coll; Coll m_coll; ArcList &GetArcList(const HypothesisBase *hypo); diff --git a/moses2/Phrase.h b/moses2/Phrase.h index 639817ea0..5a55648d6 100755 --- a/moses2/Phrase.h +++ b/moses2/Phrase.h @@ -16,6 +16,7 @@ #include "TypeDef.h" #include "legacy/FactorCollection.h" #include "SCFG/Word.h" +#include namespace Moses2 { diff --git a/moses2/SCFG/Misc.cpp b/moses2/SCFG/Misc.cpp old mode 100644 new mode 100755 index 9a340928a..1fa3e378d --- a/moses2/SCFG/Misc.cpp +++ b/moses2/SCFG/Misc.cpp @@ -83,7 +83,12 @@ size_t SeenPosition::hash() const size_t ret = (size_t) &symbolBind; boost::hash_combine(ret, &tps); boost::hash_combine(ret, tpInd); - boost::hash_combine(ret, hypoIndColl); + + for (size_t i = 0; i < hypoIndColl.size(); ++i) { + size_t val = hypoIndColl[i]; + boost::hash_combine(ret, val); + } + return ret; } diff --git a/moses2/SCFG/Misc.h b/moses2/SCFG/Misc.h old mode 100644 new mode 100755 index 85c758440..2ced7813e --- a/moses2/SCFG/Misc.h +++ b/moses2/SCFG/Misc.h @@ -7,7 +7,7 @@ #pragma once #include #include -#include +#include #include "../HypothesisColl.h" #include "../Vector.h" #include "Hypothesis.h" @@ -60,7 +60,7 @@ public: protected: - typedef boost::unordered_set, UnorderedComparer > Coll; Coll m_coll; }; diff --git a/moses2/legacy/Bitmaps.h b/moses2/legacy/Bitmaps.h old mode 100644 new mode 100755 index c6061033d..235111565 --- a/moses2/legacy/Bitmaps.h +++ b/moses2/legacy/Bitmaps.h @@ -6,6 +6,7 @@ #include #include "Bitmap.h" #include "Util2.h" +#include namespace Moses2 { diff --git a/moses2/legacy/FactorCollection.h b/moses2/legacy/FactorCollection.h old mode 100644 new mode 100755 index 1b29dee69..fb6a646f4 --- a/moses2/legacy/FactorCollection.h +++ b/moses2/legacy/FactorCollection.h @@ -31,7 +31,7 @@ #endif #include "util/murmur_hash.hh" -#include +#include #include #include @@ -82,7 +82,7 @@ class FactorCollection return left.in.GetString() == right.in.GetString(); } }; - typedef boost::unordered_set Set; + typedef std::unordered_set Set; Set m_set; Set m_setNonTerminal;