Skip to content

Commit fd849c4

Browse files
committed
fix merge for hash:bf:bin
1 parent fadfe6b commit fd849c4

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

‎include/kmtricks/task_scheduler.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,11 @@ class TaskScheduler
218218
{
219219
spdlog::debug("[push] - HashVecCountTask - S={}, P={}", sid, p);
220220
path = KmDir::get().get_count_part_path(
221-
sid, p, m_opt->lz4, KM_FILE::VECTOR);
222-
task = std::make_shared<HashVecCountTask<MAX_K, MAX_C, SuperKStorageReader>>(
223-
path, m_config, sk_storage, pinfos, p, iid,
224-
m_hw.get_window_size_bits(), m_config._kmerSize, a_min, m_opt->lz4,
225-
get_hist_clone(m_hists[iid]), !m_opt->keep_tmp);
221+
sid, p, this->m_opt->lz4, KM_FILE::HASH);
222+
task = std::make_shared<HashCountTask<MAX_K, MAX_C, SuperKStorageReader>>(
223+
path, m_config, sk_storage, pinfos, p, iid,
224+
m_hw.get_window_size_bits(), m_config._kmerSize, a_min, m_opt->lz4,
225+
get_hist_clone(this->m_hists[iid]), !this->m_opt->keep_tmp);
226226
}
227227
if (m_is_info) task->set_callback([this](){ this->m_dyn[1].tick(); });
228228

@@ -294,11 +294,11 @@ class TaskScheduler
294294
{
295295
spdlog::debug("[push] - HashVecCountTask - S={}, P={}", sid, p);
296296
path = KmDir::get().get_count_part_path(
297-
sid, p, false, KM_FILE::VECTOR);
298-
task = std::make_shared<HashVecCountTask<MAX_K, MAX_C, SuperKStorageReader>>(
299-
path, this->m_config, sk_storage, pinfos, p, iid,
300-
this->m_hw.get_window_size_bits(), this->m_config._kmerSize, a_min, false,
301-
get_hist_clone(this->m_hists[iid]), !this->m_opt->keep_tmp);
297+
sid, p, this->m_opt->lz4, KM_FILE::HASH);
298+
task = std::make_shared<HashCountTask<MAX_K, MAX_C, SuperKStorageReader>>(
299+
path, m_config, sk_storage, pinfos, p, iid,
300+
m_hw.get_window_size_bits(), m_config._kmerSize, a_min, m_opt->lz4,
301+
get_hist_clone(this->m_hists[iid]), !this->m_opt->keep_tmp);
302302
}
303303
if (m_is_info)
304304
{

0 commit comments

Comments
 (0)