diff --git a/bonsai b/bonsai index 2878f0d..26ed33a 160000 --- a/bonsai +++ b/bonsai @@ -1 +1 @@ -Subproject commit 2878f0d1f01b7b6c5aa5dc3a2be2eb0d5871cdfe +Subproject commit 26ed33a264cc6b51c0f7e8e88edfc98b6487fdee diff --git a/distmat b/distmat index 36f341c..3d7f7f6 160000 --- a/distmat +++ b/distmat @@ -1 +1 @@ -Subproject commit 36f341c0231ef59ac546f5a6a37af74569884546 +Subproject commit 3d7f7f6753f0ec3ea0c4f6d37ce29f4819192dbd diff --git a/release/linux/dashing_s128.gz b/release/linux/dashing_s128.gz index 2aacf2e..679b468 100755 Binary files a/release/linux/dashing_s128.gz and b/release/linux/dashing_s128.gz differ diff --git a/release/linux/dashing_s256.gz b/release/linux/dashing_s256.gz index 1ffc5a1..006efac 100755 Binary files a/release/linux/dashing_s256.gz and b/release/linux/dashing_s256.gz differ diff --git a/release/linux/dashing_s512.gz b/release/linux/dashing_s512.gz index c6d7247..1dc93d2 100755 Binary files a/release/linux/dashing_s512.gz and b/release/linux/dashing_s512.gz differ diff --git a/release/osx/dashing_s128.gz b/release/osx/dashing_s128.gz index e0bc3d1..8f85fa7 100755 Binary files a/release/osx/dashing_s128.gz and b/release/osx/dashing_s128.gz differ diff --git a/release/osx/dashing_s128.zst b/release/osx/dashing_s128.zst index 13f8834..b6e07b0 100755 Binary files a/release/osx/dashing_s128.zst and b/release/osx/dashing_s128.zst differ diff --git a/release/osx/dashing_s256.gz b/release/osx/dashing_s256.gz index a3b2ba3..548b7b1 100755 Binary files a/release/osx/dashing_s256.gz and b/release/osx/dashing_s256.gz differ diff --git a/release/osx/dashing_s256.zst b/release/osx/dashing_s256.zst index 570ecbe..bc4633b 100755 Binary files a/release/osx/dashing_s256.zst and b/release/osx/dashing_s256.zst differ diff --git a/src/dashing.cpp b/src/dashing.cpp index c535dd8..5db02d2 100644 --- a/src/dashing.cpp +++ b/src/dashing.cpp @@ -6,6 +6,7 @@ using hll::hll_t; namespace bns { GlobalArgs gargs; +uint64_t global_hash_seed = 137; // sketch_core forward declaration extern template void sketch_core>(uint32_t ssarg, uint32_t nthreads, uint32_t wsz, uint32_t k, const Spacer &sp, const std::vector &inpaths, const std::string &suffix, const std::string &prefix, std::vector &counting_sketches, EstimationMethod estim, JointEstimationMethod jestim, KSeqBufferHolder &kseqs, const std::vector &use_filter, const std::string &spacing, int sketch_flags, uint32_t mincount, EncodingType enct); extern template void sketch_core>(uint32_t ssarg, uint32_t nthreads, uint32_t wsz, uint32_t k, const Spacer &sp, const std::vector &inpaths, const std::string &suffix, const std::string &prefix, std::vector &counting_sketches, EstimationMethod estim, JointEstimationMethod jestim, KSeqBufferHolder &kseqs, const std::vector &use_filter, const std::string &spacing, int sketch_flags, uint32_t mincount, EncodingType enct); diff --git a/src/dashing.h b/src/dashing.h index b90e7a5..fd43ce2 100644 --- a/src/dashing.h +++ b/src/dashing.h @@ -216,6 +216,8 @@ struct GlobalArgs { }; extern GlobalArgs gargs; +extern uint64_t global_hash_seed; + enum EmissionType { MASH_DIST = 0, JI = 1, diff --git a/src/main.cpp b/src/main.cpp index 5974b18..067363e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,7 +4,7 @@ using namespace bns; #if HAS_AVX_512 # pragma message("Building with AVX512 support") #elif __AVX2__ -# pragma message("Building with AV2 support") +# pragma message("Building with AVX2 support") #elif __SSE4_1__ # pragma message("Building with SSE4.1 support") #else