zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add patched openfst-1.4.1 and kaldi@c024e8 required by CNTK. (#3806)

Browse Source
This commit is contained in:
健美猫
2017-04-18 19:56:18 +08:00
committed by Adam J. Stewart
parent fc938962fa
commit 4e95525280
5 changed files with 321 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

227
var/spack/repos/builtin/packages/openfst/openfst-1.4.1.patch Normal file
View File

@@ -0,0 +1,227 @@
*** openfst-1.4.1/src/include/fst/minimize.h
***************
*** 134,140 ****
typedef typename A::Weight Weight;
typedef ReverseArc<A> RevA;
! CyclicMinimizer(const ExpandedFst<A>& fst) {
Initialize(fst);
Compute(fst);
}
--- 134,147 ----
typedef typename A::Weight Weight;
typedef ReverseArc<A> RevA;
! CyclicMinimizer(const ExpandedFst<A>& fst):
! // tell the Partition data-member to expect multiple repeated
! // calls to SplitOn with the same element if we are non-deterministic.
! P_(fst.Properties(kIDeterministic, true) == 0) {
! if(fst.Properties(kIDeterministic, true) == 0)
! CHECK(Weight::Properties() & kIdempotent); // this minimization
! // algorithm for non-deterministic FSTs can only work with idempotent
! // semirings.
Initialize(fst);
Compute(fst);
}
***************
*** 315,321 ****
typedef typename A::StateId ClassId;
typedef typename A::Weight Weight;
! AcyclicMinimizer(const ExpandedFst<A>& fst) {
Initialize(fst);
Refine(fst);
}
--- 322,334 ----
typedef typename A::StateId ClassId;
typedef typename A::Weight Weight;
! AcyclicMinimizer(const ExpandedFst<A>& fst):
! // tell the Partition data-member to expect multiple repeated
! // calls to SplitOn with the same element if we are non-deterministic.
! partition_(fst.Properties(kIDeterministic, true) == 0) {
! if(fst.Properties(kIDeterministic, true) == 0)
! CHECK(Weight::Properties() & kIdempotent); // minimization for
! // non-deterministic FSTs can only work with idempotent semirings.
Initialize(fst);
Refine(fst);
}
***************
*** 531,543 ****
void Minimize(MutableFst<A>* fst,
MutableFst<A>* sfst = 0,
float delta = kDelta) {
! uint64 props = fst->Properties(kAcceptor | kIDeterministic|
! kWeighted | kUnweighted, true);
! if (!(props & kIDeterministic)) {
! FSTERROR() << "FST is not deterministic";
! fst->SetProperties(kError, kError);
! return;
! }
if (!(props & kAcceptor)) { // weighted transducer
VectorFst< GallicArc<A, STRING_LEFT> > gfst;
--- 544,550 ----
void Minimize(MutableFst<A>* fst,
MutableFst<A>* sfst = 0,
float delta = kDelta) {
! uint64 props = fst->Properties(kAcceptor | kWeighted | kUnweighted, true);
if (!(props & kAcceptor)) { // weighted transducer
VectorFst< GallicArc<A, STRING_LEFT> > gfst;
*** openfst-1.4.1/src/include/fst/partition.h
***************
*** 43,50 ****
friend class PartitionIterator<T>;
struct Element {
! Element() : value(0), next(0), prev(0) {}
! Element(T v) : value(v), next(0), prev(0) {}
T value;
Element* next;
--- 43,50 ----
friend class PartitionIterator<T>;
struct Element {
! Element() : value(0), next(0), prev(0) {}
! Element(T v) : value(v), next(0), prev(0) {}
T value;
Element* next;
***************
*** 52,60 ****
};
public:
! Partition() {}
! Partition(T num_states) {
Initialize(num_states);
}
--- 52,62 ----
};
public:
! Partition(bool allow_repeated_split):
! allow_repeated_split_(allow_repeated_split) {}
! Partition(bool allow_repeated_split, T num_states):
! allow_repeated_split_(allow_repeated_split) {
Initialize(num_states);
}
***************
*** 137,152 ****
if (class_size_[class_id] == 1) return;
// first time class is split
! if (split_size_[class_id] == 0)
visited_classes_.push_back(class_id);
!
// increment size of split (set of element at head of chain)
split_size_[class_id]++;
!
// update split point
! if (class_split_[class_id] == 0)
! class_split_[class_id] = classes_[class_id];
! if (class_split_[class_id] == elements_[element_id])
class_split_[class_id] = elements_[element_id]->next;
// move to head of chain in same class
--- 139,154 ----
if (class_size_[class_id] == 1) return;
// first time class is split
! if (split_size_[class_id] == 0) {
visited_classes_.push_back(class_id);
! class_split_[class_id] = classes_[class_id];
! }
// increment size of split (set of element at head of chain)
split_size_[class_id]++;
!
// update split point
! if (class_split_[class_id] != 0
! && class_split_[class_id] == elements_[element_id])
class_split_[class_id] = elements_[element_id]->next;
// move to head of chain in same class
***************
*** 157,180 ****
// class indices of the newly created class. Returns the new_class id
// or -1 if no new class was created.
T SplitRefine(T class_id) {
// only split if necessary
! if (class_size_[class_id] == split_size_[class_id]) {
! class_split_[class_id] = 0;
split_size_[class_id] = 0;
return -1;
} else {
-
T new_class = AddClass();
size_t remainder = class_size_[class_id] - split_size_[class_id];
if (remainder < split_size_[class_id]) { // add smaller
- Element* split_el = class_split_[class_id];
classes_[new_class] = split_el;
- class_size_[class_id] = split_size_[class_id];
- class_size_[new_class] = remainder;
split_el->prev->next = 0;
split_el->prev = 0;
} else {
- Element* split_el = class_split_[class_id];
classes_[new_class] = classes_[class_id];
class_size_[class_id] = remainder;
class_size_[new_class] = split_size_[class_id];
--- 159,189 ----
// class indices of the newly created class. Returns the new_class id
// or -1 if no new class was created.
T SplitRefine(T class_id) {
+
+ Element* split_el = class_split_[class_id];
// only split if necessary
! //if (class_size_[class_id] == split_size_[class_id]) {
! if(split_el == NULL) { // we split on everything...
split_size_[class_id] = 0;
return -1;
} else {
T new_class = AddClass();
+
+ if(allow_repeated_split_) { // split_size_ is possibly
+ // inaccurate, so work it out exactly.
+ size_t split_count; Element *e;
+ for(split_count=0,e=classes_[class_id];
+ e != split_el; split_count++, e=e->next);
+ split_size_[class_id] = split_count;
+ }
size_t remainder = class_size_[class_id] - split_size_[class_id];
if (remainder < split_size_[class_id]) { // add smaller
classes_[new_class] = split_el;
split_el->prev->next = 0;
split_el->prev = 0;
+ class_size_[class_id] = split_size_[class_id];
+ class_size_[new_class] = remainder;
} else {
classes_[new_class] = classes_[class_id];
class_size_[class_id] = remainder;
class_size_[new_class] = split_size_[class_id];
***************
*** 245,254 ****
--- 254,269 ----
vector<T> class_size_;
// size of split for each class
+ // in the nondeterministic case, split_size_ is actually an upper
+ // bound on the size of split for each class.
vector<T> split_size_;
// set of visited classes to be used in split refine
vector<T> visited_classes_;
+
+ // true if input fst was deterministic: we can make
+ // certain assumptions in this case that speed up the algorithm.
+ bool allow_repeated_split_;
};

28
var/spack/repos/builtin/packages/openfst/openfst_gcc41up.patch Normal file
View File

@@ -0,0 +1,28 @@
*** openfst-1.4.1/src/include/fst/lock.h
***************
*** 78,85 ****
RefCounter() : count_(1) {}
int count() const { return count_; }
! int Incr() const { return ++count_; }
! int Decr() const { return --count_; }
private:
mutable int count_;
--- 78,93 ----
RefCounter() : count_(1) {}
int count() const { return count_; }
!
! // below lines are modifications of openfst for multi-thrads support,
! // from tools/extras/openfst_gcc41up.patch, applied by tools/Makefile,
! // applicable to gcc 4.1 or above
! // int Incr() const { return ++count_; }
! // int Decr() const { return --count_; }
!
! int Incr() const { return __sync_add_and_fetch(&count_, 1); }
! int Decr() const { return __sync_sub_and_fetch(&count_, 1); }
! // end modifications
private:
mutable int count_;

7
var/spack/repos/builtin/packages/openfst/package.py
View File

@@ -42,8 +42,15 @@ class Openfst(AutotoolsPackage):
version('1.5.2', 'e9d43874f7cadf791394caab3925eee4')
version('1.5.1', '8869e44c5a4af65409ae78b9f482b40e')
version('1.5.0', 'a24fee5ffe28744c6fb7b1a49e0006c4')
version('1.4.1-patch', 'ca8f1730b9b9b281e515611fa9ae23c0',
url='http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-1.4.1.tar.gz')
version('1.4.1', 'ca8f1730b9b9b281e515611fa9ae23c0')
version('1.4.0', '662367ec91084ffab48ee9b5716de39c')
conflicts('%intel@16:')
conflicts('%gcc@6:')
# Patch openfst-1.4.1 for kaldi@c024e8
# See https://github.com/kaldi-asr/kaldi/blob/c024e8aa0a727bf76c91a318f76a1f8b0b59249e/tools/Makefile#L82-L88
patch('openfst-1.4.1.patch', when='@1.4.1-patch')
patch('openfst_gcc41up.patch', when='@1.4.1-patch')