Created
January 9, 2014 22:41
-
-
Save mgymrek/8343462 to your computer and use it in GitHub Desktop.
stuff to change in lobstr for Mac
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/configure.ac b/configure.ac | |
index 81249bd..c76f394 100644 | |
--- a/configure.ac | |
+++ b/configure.ac | |
@@ -24,10 +24,12 @@ AC_PROG_CXX | |
AC_PROG_INSTALL | |
AC_PROG_FC | |
AC_PROG_F77 | |
+#AC_F77_WRAPPERS | |
PKG_CHECK_MODULES([FFTW], [fftw3]) | |
AX_PTHREAD() | |
AX_CHECK_ZLIB() | |
+#PKG_CHECK_MODULES([BLAS], [blas]) | |
AX_BLAS() | |
if test "$ax_blas_ok" = "no"; then | |
AC_MSG_ERROR([ | |
@@ -42,6 +44,8 @@ try adding '--with-blas=<DIR>' (see ./configure --help). | |
------------------------------------------ | |
]) | |
fi | |
+ | |
+ | |
AX_BOOST_BASE([1.38.0]) | |
PKG_CHECK_MODULES([CPPUNIT],[cppunit]) | |
diff --git a/src/bwt.c b/src/bwt.c | |
index 10b838a..ec0205b 100644 | |
--- a/src/bwt.c | |
+++ b/src/bwt.c | |
@@ -87,7 +87,7 @@ static inline int __occ_aux(uint64_t y, int c) | |
return ((y + (y >> 4)) & 0xf0f0f0f0f0f0f0full) * 0x101010101010101ull >> 56; | |
} | |
-inline bwtint_t bwt_occ(const bwt_t *bwt, bwtint_t k, ubyte_t c) | |
+bwtint_t bwt_occ(const bwt_t *bwt, bwtint_t k, ubyte_t c) | |
{ | |
bwtint_t n, l, j; | |
uint32_t *p; | |
@@ -113,7 +113,7 @@ inline bwtint_t bwt_occ(const bwt_t *bwt, bwtint_t k, ubyte_t c) | |
} | |
// an analogy to bwt_occ() but more efficient, requiring k <= l | |
-inline void bwt_2occ(const bwt_t *bwt, bwtint_t k, bwtint_t l, ubyte_t c, bwtint_t *ok, bwtint_t *ol) | |
+void bwt_2occ(const bwt_t *bwt, bwtint_t k, bwtint_t l, ubyte_t c, bwtint_t *ok, bwtint_t *ol) | |
{ | |
bwtint_t _k, _l; | |
if (k == l) { | |
@@ -154,7 +154,7 @@ inline void bwt_2occ(const bwt_t *bwt, bwtint_t k, bwtint_t l, ubyte_t c, bwtint | |
((bwt)->cnt_table[(b)&0xff] + (bwt)->cnt_table[(b)>>8&0xff] \ | |
+ (bwt)->cnt_table[(b)>>16&0xff] + (bwt)->cnt_table[(b)>>24]) | |
-inline void bwt_occ4(const bwt_t *bwt, bwtint_t k, bwtint_t cnt[4]) | |
+void bwt_occ4(const bwt_t *bwt, bwtint_t k, bwtint_t cnt[4]) | |
{ | |
bwtint_t l, j, x; | |
uint32_t *p; | |
@@ -174,7 +174,7 @@ inline void bwt_occ4(const bwt_t *bwt, bwtint_t k, bwtint_t cnt[4]) | |
} | |
// an analogy to bwt_occ4() but more efficient, requiring k <= l | |
-inline void bwt_2occ4(const bwt_t *bwt, bwtint_t k, bwtint_t l, bwtint_t cntk[4], bwtint_t cntl[4]) | |
+void bwt_2occ4(const bwt_t *bwt, bwtint_t k, bwtint_t l, bwtint_t cntk[4], bwtint_t cntl[4]) | |
{ | |
bwtint_t _k, _l; | |
if (k == l) { | |
diff --git a/src/bwt.h b/src/bwt.h | |
index 4aef38d..79745c2 100644 | |
--- a/src/bwt.h | |
+++ b/src/bwt.h | |
@@ -86,14 +86,14 @@ extern "C" { | |
void bwt_bwtupdate_core(bwt_t *bwt); | |
- inline bwtint_t bwt_occ(const bwt_t *bwt, bwtint_t k, ubyte_t c); | |
- inline void bwt_occ4(const bwt_t *bwt, bwtint_t k, bwtint_t cnt[4]); | |
+ bwtint_t bwt_occ(const bwt_t *bwt, bwtint_t k, ubyte_t c); | |
+ void bwt_occ4(const bwt_t *bwt, bwtint_t k, bwtint_t cnt[4]); | |
bwtint_t bwt_sa(const bwt_t *bwt, bwtint_t k); | |
// more efficient version of bwt_occ/bwt_occ4 for retrieving two close Occ values | |
void bwt_gen_cnt_table(bwt_t *bwt); | |
- inline void bwt_2occ(const bwt_t *bwt, bwtint_t k, bwtint_t l, ubyte_t c, bwtint_t *ok, bwtint_t *ol); | |
- inline void bwt_2occ4(const bwt_t *bwt, bwtint_t k, bwtint_t l, bwtint_t cntk[4], bwtint_t cntl[4]); | |
+ void bwt_2occ(const bwt_t *bwt, bwtint_t k, bwtint_t l, ubyte_t c, bwtint_t *ok, bwtint_t *ol); | |
+ void bwt_2occ4(const bwt_t *bwt, bwtint_t k, bwtint_t l, bwtint_t cntk[4], bwtint_t cntl[4]); | |
int bwt_match_exact(const bwt_t *bwt, int len, const ubyte_t *str, bwtint_t *sa_begin, bwtint_t *sa_end); | |
int bwt_match_exact_alt(const bwt_t *bwt, int len, const ubyte_t *str, bwtint_t *k0, bwtint_t *l0); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fdafdsaf |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment