Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parallel build fix #43

Merged
merged 4 commits into from
Feb 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bonsai
Submodule bonsai updated 1 files
+1 −1 Makefile
2 changes: 1 addition & 1 deletion distmat
Submodule distmat updated 1 files
+12 −3 distmat.h
Binary file modified release/linux/dashing_s128.gz
Binary file not shown.
Binary file modified release/linux/dashing_s256.gz
Binary file not shown.
Binary file modified release/linux/dashing_s512.gz
Binary file not shown.
Binary file modified release/osx/dashing_s128.gz
Binary file not shown.
Binary file modified release/osx/dashing_s128.zst
Binary file not shown.
Binary file modified release/osx/dashing_s256.gz
Binary file not shown.
Binary file modified release/osx/dashing_s256.zst
Binary file not shown.
1 change: 1 addition & 0 deletions src/dashing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<mh::RangeMinHash<uint64_t>>(uint32_t ssarg, uint32_t nthreads, uint32_t wsz, uint32_t k, const Spacer &sp, const std::vector<std::string> &inpaths, const std::string &suffix, const std::string &prefix, std::vector<CountingSketch> &counting_sketches, EstimationMethod estim, JointEstimationMethod jestim, KSeqBufferHolder &kseqs, const std::vector<bool> &use_filter, const std::string &spacing, int sketch_flags, uint32_t mincount, EncodingType enct);
extern template void sketch_core<mh::CountingRangeMinHash<uint64_t>>(uint32_t ssarg, uint32_t nthreads, uint32_t wsz, uint32_t k, const Spacer &sp, const std::vector<std::string> &inpaths, const std::string &suffix, const std::string &prefix, std::vector<CountingSketch> &counting_sketches, EstimationMethod estim, JointEstimationMethod jestim, KSeqBufferHolder &kseqs, const std::vector<bool> &use_filter, const std::string &spacing, int sketch_flags, uint32_t mincount, EncodingType enct);
Expand Down
2 changes: 2 additions & 0 deletions src/dashing.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ struct GlobalArgs {
};

extern GlobalArgs gargs;
extern uint64_t global_hash_seed;

enum EmissionType {
MASH_DIST = 0,
JI = 1,
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down