Permalink
Browse files

ebwt.h updated

  • Loading branch information...
1 parent 33fe3b0 commit 7a9ccf4f63fdc4dfdef13050fc9454f571f135ad @aidanreilly8 aidanreilly8 committed Jan 5, 2017
Showing with 7 additions and 1 deletion.
  1. +7 −1 ebwt.h
View
8 ebwt.h
@@ -454,6 +454,7 @@ class Ebwt {
int32_t offRate,
int32_t isaRate,
int32_t ftabChars,
+ int nthreads,
const string& file, // base filename for EBWT files
bool __fw,
bool useBlockwise,
@@ -513,6 +514,8 @@ class Ebwt {
refparams,
fout1,
fout2,
+ file,
+ nthreads,
useBlockwise,
bmax,
bmaxSqrtMult,
@@ -617,6 +620,8 @@ class Ebwt {
const RefReadInParams& refparams,
ofstream& out1,
ofstream& out2,
+ const string& outfile,
+ int nthreads,
bool useBlockwise,
TIndexOffU bmax,
TIndexOffU bmaxSqrtMult,
@@ -740,6 +745,7 @@ class Ebwt {
// constructing the DifferenceCoverSample
dcv <<= 1;
TIndexOffU sz = (TIndexOffU)DifferenceCoverSample<TStr>::simulateAllocs(s, dcv >> 1);
+ if(nthreads > 1) sz *= (nthreads + 1);
AutoArray<uint8_t> tmp(sz);
dcv >>= 1;
// Likewise with the KarkkainenBlockwiseSA
@@ -760,7 +766,7 @@ class Ebwt {
VMSG_NL("");
}
VMSG_NL("Constructing suffix-array element generator");
- KarkkainenBlockwiseSA<TStr> bsa(s, bmax, dcv, seed, _sanity, _passMemExc, _verbose);
+ KarkkainenBlockwiseSA<TStr> bsa(s, bmax, nthreads, dcv, seed, _sanity, _passMemExc, _verbose, outfile);
assert(bsa.suffixItrIsReset());
assert_eq(bsa.size(), length(s)+1);
VMSG_NL("Converting suffix-array elements to index image");

0 comments on commit 7a9ccf4

Please sign in to comment.