diff --git a/kmer_counter/first_dispatch.h b/kmer_counter/first_dispatch.h index 00ab446..afa38a3 100644 --- a/kmer_counter/first_dispatch.h +++ b/kmer_counter/first_dispatch.h @@ -21,6 +21,7 @@ Date : 2017-01-28 #include "defs.h" #include "timer.h" #include +#include #include "asmlib_wrapper.h" #include "intr_copy.h" @@ -101,7 +102,7 @@ class CRangeQueue template void pierwsze_kolko_etap1(uint32_t th_id, KMER_T *kmers, uint64 n_recs, uint32_t n_threads, // uint64_t per_thread, std::vector &histos, - uint64_t per_thread, std::vector &histos, + uint64_t per_thread, std::vector> &histos, uint32 byte, CRangeQueue& rq) //(std::thread([th_id, kmers, n_recs, n_threads, per_thread, &histos, byte] { @@ -197,10 +198,10 @@ template void pierwsze_kolko_etap2(uint32_t th_id, KMER_T *kmers, KMER_T* tmp, uint64 n_recs, uint32_t n_threads, uint64_t per_thread, uint32 byte, // std::vector &histos, - std::vector &histos, + std::vector> &histos, std::vector &_raw_buffers, // std::vector &threads_histos, - std::vector &threads_histos, + std::vector> &threads_histos, CMemoryPool* pmm_radix_buf, CRangeQueue& rq) //std::thread([th_id, kmers, tmp, n_recs, n_threads, per_thread, byte, @@ -379,10 +380,10 @@ template void pierwsze_kolko_etap3(uint32_t th_id, KMER_T *kmers, KMER_T* tmp, uint64 n_recs, uint32_t n_threads, uint64_t per_thread, uint32 byte, // std::vector &histos, - std::vector &histos, + std::vector> &histos, std::vector &_raw_buffers, // std::vector &threads_histos, - std::vector &threads_histos, + std::vector> &threads_histos, CMemoryPool* pmm_radix_buf, CRangeQueue& rq) diff --git a/kmer_counter/radix.h b/kmer_counter/radix.h index f492ba9..d772fb5 100644 --- a/kmer_counter/radix.h +++ b/kmer_counter/radix.h @@ -489,7 +489,7 @@ namespace RadixSort uint64 per_thread = n_recs / n_threads; std::vector threads; - std::vector histos(n_threads); + std::vector> histos(n_threads); ALIGN_ARRAY COUNTER_TYPE globalHisto[256] = {}; for (uint32_t th_id = 0; th_id < n_threads; ++th_id) { @@ -577,7 +577,7 @@ namespace RadixSort } std::vector _raw_buffers(n_threads); - std::vector threads_histos(n_threads); + std::vector> threads_histos(n_threads); for (uint32_t th_id = 0; th_id < n_threads; ++th_id) { diff --git a/kmer_counter/raduls_impl.h b/kmer_counter/raduls_impl.h index 84b25a4..8b38e65 100644 --- a/kmer_counter/raduls_impl.h +++ b/kmer_counter/raduls_impl.h @@ -545,7 +545,7 @@ namespace RadulsSort std::vector threads; // std::vector histos(MAGIC_NUMBER * n_threads); - std::vector histos(MAGIC_NUMBER * n_threads); + std::vector> histos(MAGIC_NUMBER * n_threads); ALIGN_ARRAY COUNTER_TYPE globalHisto[256] = {}; for (uint32_t th_id = 0; th_id < n_threads; ++th_id) { @@ -596,7 +596,7 @@ namespace RadulsSort std::vector _raw_buffers(MAGIC_NUMBER * n_threads); // std::vector threads_histos(MAGIC_NUMBER * n_threads); - std::vector threads_histos(MAGIC_NUMBER * n_threads); + std::vector> threads_histos(MAGIC_NUMBER * n_threads); for (uint32_t th_id = 0; th_id < n_threads; ++th_id) { diff --git a/kmer_counter/x64/Release/kmer.obj b/kmer_counter/x64/Release/kmer.obj deleted file mode 100644 index 168a62e..0000000 Binary files a/kmer_counter/x64/Release/kmer.obj and /dev/null differ