Refresh patches.
Debian Janitor
2 years ago
4 | 4 | makefile | 13 ++++++++++--- |
5 | 5 | 1 file changed, 10 insertions(+), 3 deletions(-) |
6 | 6 | |
7 | Index: kmc/makefile | |
8 | =================================================================== | |
7 | 9 | --- kmc.orig/makefile |
8 | 10 | +++ kmc/makefile |
9 | 11 | @@ -1,4 +1,4 @@ |
12 | 14 | |
13 | 15 | KMC_BIN_DIR = bin |
14 | 16 | KMC_MAIN_DIR = kmer_counter |
15 | @@ -9,6 +9,7 @@ | |
17 | @@ -9,6 +9,7 @@ PY_KMC_API_DIR = py_kmc_api | |
16 | 18 | |
17 | 19 | KMC_TOOLS_CXXFLAGS := $(CXXFLAGS) -Wall -O3 |
18 | 20 | KMC_TOOLS_LDFLAGS := $(LDFLAGS) -lm -O3 -lpthread -std=c++14 -lz -lbz2 |
20 | 22 | |
21 | 23 | CXXFLAGS += -Wall -O3 |
22 | 24 | LDFLAGS += -lm -O3 -lpthread -std=c++11 -lz -lbz2 |
23 | @@ -97,6 +98,10 @@ | |
25 | @@ -97,6 +98,10 @@ py_kmc_api: $(PY_KMC_API_OBJS) $(PY_KMC_ | |
24 | 26 | -I `python3 -c "import sysconfig;print(sysconfig.get_paths()['include'])"` \ |
25 | 27 | -o $(KMC_BIN_DIR)/$@`python3-config --extension-suffix` |
26 | 28 | |
31 | 33 | clean: |
32 | 34 | -rm -f $(KMC_MAIN_DIR)/*.o |
33 | 35 | -rm -f $(KMC_API_DIR)/*.o |
34 | @@ -105,3 +110,4 @@ | |
36 | @@ -105,3 +110,4 @@ clean: | |
35 | 37 | -rm -f $(PY_KMC_API_DIR)/*.o |
36 | 38 | -rm -f $(PY_KMC_API_DIR)/*.so |
37 | 39 | -rm -rf bin |
5 | 5 | Last-Update: 2020-12-10 |
6 | 6 | --- |
7 | 7 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
8 | Index: kmc/makefile | |
9 | =================================================================== | |
8 | 10 | --- kmc.orig/makefile |
9 | 11 | +++ kmc/makefile |
10 | 12 | @@ -1,4 +1,4 @@ |
4 | 4 | makefile | 10 +++++----- |
5 | 5 | 1 file changed, 5 insertions(+), 5 deletions(-) |
6 | 6 | |
7 | Index: kmc/makefile | |
8 | =================================================================== | |
7 | 9 | --- kmc.orig/makefile |
8 | 10 | +++ kmc/makefile |
9 | @@ -7,12 +7,11 @@ | |
11 | @@ -7,12 +7,11 @@ KMC_DUMP_DIR = kmc_dump | |
10 | 12 | KMC_TOOLS_DIR = kmc_tools |
11 | 13 | PY_KMC_API_DIR = py_kmc_api |
12 | 14 | |
23 | 25 | |
24 | 26 | KMC_OBJS = \ |
25 | 27 | $(KMC_MAIN_DIR)/kmer_counter.o \ |
26 | @@ -61,38 +60,38 @@ | |
28 | @@ -61,38 +60,38 @@ $(KMC_TOOLS_DIR)/fastq_writer.o \ | |
27 | 29 | $(KMC_TOOLS_DIR)/percent_progress.o |
28 | 30 | |
29 | 31 | $(KMC_OBJS) $(KMC_DUMP_OBJS) $(KMC_API_OBJS): %.o: %.cpp |
0 | 0 | Description: add required header for std::modf |
1 | 1 | Author: Sascha Steinbiss <sascha@steinbiss.name> |
2 | Index: kmc/kmc_dump/nc_utils.h | |
3 | =================================================================== | |
2 | 4 | --- kmc.orig/kmc_dump/nc_utils.h |
3 | 5 | +++ kmc/kmc_dump/nc_utils.h |
4 | 6 | @@ -11,6 +11,7 @@ |
0 | 0 | Author: Michael R. Crusoe <crusoe@debian.org> |
1 | 1 | Description: support non-x86 systems via libsimde-dev |
2 | Index: kmc/kmer_counter/cpu_info.cpp | |
3 | =================================================================== | |
2 | 4 | --- kmc.orig/kmer_counter/cpu_info.cpp |
3 | 5 | +++ kmc/kmer_counter/cpu_info.cpp |
4 | @@ -38,6 +38,7 @@ | |
6 | @@ -38,6 +38,7 @@ static struct CpuInfoImpl { | |
5 | 7 | string vendor, brand; |
6 | 8 | void cpuid(int *result, int function_id) const |
7 | 9 | { |
9 | 11 | #ifdef _MSC_VER |
10 | 12 | __cpuidex(result, function_id, 0); |
11 | 13 | |
12 | @@ -53,10 +54,12 @@ | |
14 | @@ -53,10 +54,12 @@ static struct CpuInfoImpl { | |
13 | 15 | __asm__("cpuid\n\t" |
14 | 16 | : "=a" (result[0]), "=b" (result[1]), "=c" (result[2]), "=d" (result[3]) : "0" (function_id), "c"(0)); |
15 | 17 | #endif |
22 | 24 | array<int, 4> cpui = { -1 }; |
23 | 25 | cpuid(cpui.data(), 0); |
24 | 26 | int nIds_ = cpui[0]; |
25 | @@ -90,6 +93,9 @@ | |
27 | @@ -90,6 +93,9 @@ static struct CpuInfoImpl { | |
26 | 28 | std::bitset<32> EBX = data_[7][1]; |
27 | 29 | avx2 = EBX[5]; |
28 | 30 | } |
32 | 34 | } |
33 | 35 | |
34 | 36 | const string& GetVendor() const |
35 | @@ -145,4 +151,4 @@ | |
37 | @@ -145,4 +151,4 @@ bool CCpuInfo::SSE42_Enabled() { return | |
36 | 38 | bool CCpuInfo::AVX_Enabled() { return cpu_info_impl.avx; } |
37 | 39 | bool CCpuInfo::AVX2_Enabled() { return cpu_info_impl.avx2; } |
38 | 40 | |
39 | 41 | -// ***** EOF |
40 | 42 | \ No newline at end of file |
41 | 43 | +// ***** EOF |
44 | Index: kmc/kmer_counter/intr_copy.h | |
45 | =================================================================== | |
42 | 46 | --- kmc.orig/kmer_counter/intr_copy.h |
43 | 47 | +++ kmc/kmer_counter/intr_copy.h |
44 | 48 | @@ -11,8 +11,8 @@ |
52 | 56 | |
53 | 57 | #ifndef WIN32 |
54 | 58 | typedef long long __int64; |
55 | @@ -27,7 +27,7 @@ | |
59 | @@ -27,7 +27,7 @@ inline void IntrCopy64fun(void *_dest, v | |
56 | 60 | __int64* src = (__int64 *)_src; |
57 | 61 | |
58 | 62 | for (unsigned i = 0; i < size; ++i) |
61 | 65 | } |
62 | 66 | |
63 | 67 | |
64 | @@ -41,7 +41,7 @@ | |
68 | @@ -41,7 +41,7 @@ template <unsigned SIZE> struct IntrCopy | |
65 | 69 | __int64* src = (__int64*)_src; |
66 | 70 | |
67 | 71 | for (unsigned i = 0; i < SIZE; ++i) |
70 | 74 | } |
71 | 75 | }; |
72 | 76 | |
73 | @@ -89,4 +89,4 @@ | |
77 | @@ -89,4 +89,4 @@ template <unsigned SIZE> struct IntrCopy | |
74 | 78 | |
75 | 79 | #endif |
76 | 80 | |
77 | 81 | -// ***** EOF |
78 | 82 | \ No newline at end of file |
79 | 83 | +// ***** EOF |
84 | Index: kmc/kmer_counter/kmc.h | |
85 | =================================================================== | |
80 | 86 | --- kmc.orig/kmer_counter/kmc.h |
81 | 87 | +++ kmc/kmer_counter/kmc.h |
82 | @@ -1112,6 +1112,8 @@ | |
88 | @@ -1113,6 +1113,8 @@ template <unsigned SIZE> bool CKMC<SIZE> | |
83 | 89 | #ifdef __APPLE__ |
84 | 90 | sort_func = RadixSort::RadixSortMSD<CKmer<SIZE>, SIZE>; |
85 | 91 | CSmallSort<SIZE>::Adjust(384); |
88 | 94 | #else |
89 | 95 | auto proc_name = CCpuInfo::GetBrand(); |
90 | 96 | bool is_intel = CCpuInfo::GetVendor() == "GenuineIntel"; |
97 | Index: kmc/makefile | |
98 | =================================================================== | |
91 | 99 | --- kmc.orig/makefile |
92 | 100 | +++ kmc/makefile |
93 | @@ -30,11 +30,16 @@ | |
101 | @@ -30,11 +30,16 @@ $(KMC_MAIN_DIR)/kb_storer.o \ | |
94 | 102 | $(KMC_MAIN_DIR)/kmer.o \ |
95 | 103 | $(KMC_MAIN_DIR)/splitter.o \ |
96 | 104 | $(KMC_MAIN_DIR)/kb_collector.o |
107 | 115 | |
108 | 116 | KMC_DUMP_OBJS = \ |
109 | 117 | $(KMC_DUMP_DIR)/nc_utils.o \ |
110 | @@ -66,6 +71,7 @@ | |
118 | @@ -66,6 +71,7 @@ $(KMC_OBJS) $(KMC_DUMP_OBJS) $(KMC_API_O | |
111 | 119 | $(KMC_TOOLS_OBJS): %.o: %.cpp |
112 | 120 | $(CXX) $(CPPFLAGS) $(KMC_TOOLS_CXXFLAGS) -c $< -o $@ |
113 | 121 | |
115 | 123 | $(KMC_MAIN_DIR)/raduls_sse2.o: $(KMC_MAIN_DIR)/raduls_sse2.cpp |
116 | 124 | $(CXX) $(CPPFLAGS) $(CXXFLAGS) -msse2 -c $< -o $@ |
117 | 125 | $(KMC_MAIN_DIR)/raduls_sse41.o: $(KMC_MAIN_DIR)/raduls_sse41.cpp |
118 | @@ -74,6 +80,10 @@ | |
126 | @@ -74,6 +80,10 @@ $(KMC_MAIN_DIR)/raduls_avx.o: $(KMC_MAIN | |
119 | 127 | $(CXX) $(CPPFLAGS) $(CXXFLAGS) -mavx -c $< -o $@ |
120 | 128 | $(KMC_MAIN_DIR)/raduls_avx2.o: $(KMC_MAIN_DIR)/raduls_avx2.cpp |
121 | 129 | $(CXX) $(CPPFLAGS) $(CXXFLAGS) -mavx2 -c $< -o $@ |
126 | 134 | |
127 | 135 | kmc: $(KMC_OBJS) $(RADULS_OBJS) |
128 | 136 | -mkdir -p $(KMC_BIN_DIR) |
137 | Index: kmc/kmer_counter/splitter.cpp | |
138 | =================================================================== | |
129 | 139 | --- kmc.orig/kmer_counter/splitter.cpp |
130 | 140 | +++ kmc/kmer_counter/splitter.cpp |
131 | @@ -350,7 +350,7 @@ | |
141 | @@ -363,7 +363,7 @@ bool CSplitter::GetSeq(char *seq, uint32 | |
132 | 142 | if (!both_strands && is_rev_comp) //if read is reversed and kmc was run to count all (not only canonical) kmers read must be transformed back |
133 | 143 | { |
134 | 144 | //static const char rev_maping[] = "=TGMCRSVAWYHKDBN"; |
137 | 147 | uint32 n_bytes = l_seq / 2; |
138 | 148 | uint64_t pos_after = pos + l_seq; |
139 | 149 | pos = pos_after; |
140 | @@ -369,7 +369,7 @@ | |
150 | @@ -382,7 +382,7 @@ bool CSplitter::GetSeq(char *seq, uint32 | |
141 | 151 | } |
142 | 152 | else |
143 | 153 | { |
146 | 156 | uint32 n_bytes = l_seq / 2; |
147 | 157 | for (uint32_t ii = 0; ii < n_bytes; ++ii) |
148 | 158 | { |
149 | @@ -956,4 +956,4 @@ | |
159 | @@ -991,4 +991,4 @@ template bool CSplitter::ProcessReadsSma | |
150 | 160 | template class CWSmallKSplitter<uint32>; |
151 | 161 | template class CWSmallKSplitter<uint64>; |
152 | 162 | |
153 | 163 | -// ***** EOF |
154 | 164 | \ No newline at end of file |
155 | 165 | +// ***** EOF |
166 | Index: kmc/kmer_counter/raduls.h | |
167 | =================================================================== | |
156 | 168 | --- kmc.orig/kmer_counter/raduls.h |
157 | 169 | +++ kmc/kmer_counter/raduls.h |
158 | @@ -23,7 +23,7 @@ | |
170 | @@ -23,7 +23,7 @@ namespace RadulsSort | |
159 | 171 | { |
160 | 172 | template<typename KMER_T> |
161 | 173 | void RadixSortMSD_SSE2(KMER_T* kmers, KMER_T* tmp, uint64 n_recs, uint32 byte, uint32 n_threads, CMemoryPool* pmm_radix_buf); |
164 | 176 | template<typename KMER_T> |
165 | 177 | void RadixSortMSD_SSE41(KMER_T* kmers, KMER_T* tmp, uint64 n_recs, uint32 byte, uint32 n_threads, CMemoryPool* pmm_radix_buf); |
166 | 178 | |
167 | @@ -32,8 +32,9 @@ | |
179 | @@ -32,8 +32,9 @@ namespace RadulsSort | |
168 | 180 | |
169 | 181 | template<typename KMER_T> |
170 | 182 | void RadixSortMSD_AVX2(KMER_T* kmers, KMER_T* tmp, uint64 n_recs, uint32 byte, uint32 n_threads, CMemoryPool* pmm_radix_buf); |
176 | 188 | -// ***** EOF |
177 | 189 | \ No newline at end of file |
178 | 190 | +// ***** EOF |
191 | Index: kmc/kmer_counter/raduls_impl.h | |
192 | =================================================================== | |
179 | 193 | --- kmc.orig/kmer_counter/raduls_impl.h |
180 | 194 | +++ kmc/kmer_counter/raduls_impl.h |
181 | @@ -730,7 +730,7 @@ | |
195 | @@ -730,7 +730,7 @@ namespace RadulsSort | |
182 | 196 | #define RADULS_RADIX_SORT_FUNNAME RadixSortMSD_AVX |
183 | 197 | #elif defined(__SSE4_1__) |
184 | 198 | #define RADULS_RADIX_SORT_FUNNAME RadixSortMSD_SSE41 |
187 | 201 | #define RADULS_RADIX_SORT_FUNNAME RadixSortMSD_SSE2 |
188 | 202 | #endif |
189 | 203 | |
190 | @@ -769,4 +769,4 @@ | |
204 | @@ -769,4 +769,4 @@ namespace RadulsSort | |
191 | 205 | |
192 | 206 | #endif |
193 | 207 |
3 | 3 | Last-Update: 2020-12-10 |
4 | 4 | --- |
5 | 5 | This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
6 | Index: kmc/kmc_tools/kmc2_db_reader.h | |
7 | =================================================================== | |
6 | 8 | --- kmc.orig/kmc_tools/kmc2_db_reader.h |
7 | 9 | +++ kmc/kmc_tools/kmc2_db_reader.h |
8 | @@ -1532,7 +1532,7 @@ | |
10 | @@ -1532,7 +1532,7 @@ desc(desc) | |
9 | 11 | my_fseek(kmc_pre, 4, SEEK_SET); |
10 | 12 | if (fread(LUTS, sizeof(uint64), lut_recs, kmc_pre) != lut_recs) |
11 | 13 | { |
14 | 16 | exit(1); |
15 | 17 | } |
16 | 18 | fclose(kmc_pre); |
17 | @@ -2026,7 +2026,7 @@ | |
19 | @@ -2026,7 +2026,7 @@ template<unsigned SIZE> CKMC2DbReader<SI | |
18 | 20 | db_reader_counters_only = std::make_unique<CKMC2DbReaderCountersOnly<SIZE>>(header, desc); |
19 | 21 | break; |
20 | 22 | default: //should never be here |
23 | 25 | exit(1); |
24 | 26 | } |
25 | 27 | } |
28 | Index: kmc/kmc_tools/parameters_parser.cpp | |
29 | =================================================================== | |
26 | 30 | --- kmc.orig/kmc_tools/parameters_parser.cpp |
27 | 31 | +++ kmc/kmc_tools/parameters_parser.cpp |
28 | @@ -150,7 +150,7 @@ | |
32 | @@ -150,7 +150,7 @@ void CParametersParser::read_input_fastq | |
29 | 33 | config.filtering_params.input_file_type = CFilteringParams::file_type::fastq; |
30 | 34 | break; |
31 | 35 | default: |
34 | 38 | exit(1); |
35 | 39 | break; |
36 | 40 | } |
37 | @@ -220,7 +220,7 @@ | |
41 | @@ -220,7 +220,7 @@ void CParametersParser::read_filter_para | |
38 | 42 | } |
39 | 43 | else |
40 | 44 | { |
43 | 47 | } |
44 | 48 | ++pos; |
45 | 49 | } |
46 | @@ -264,7 +264,7 @@ | |
50 | @@ -264,7 +264,7 @@ void CParametersParser::read_input_desc( | |
47 | 51 | } |
48 | 52 | else |
49 | 53 | { |
52 | 56 | exit(1); |
53 | 57 | } |
54 | 58 | } |
55 | @@ -534,7 +534,7 @@ | |
59 | @@ -534,7 +534,7 @@ bool CParametersParser::read_output_desc | |
56 | 60 | } |
57 | 61 | else |
58 | 62 | { |
61 | 65 | Usage(); |
62 | 66 | exit(1); |
63 | 67 | } |
64 | @@ -594,7 +594,7 @@ | |
68 | @@ -594,7 +594,7 @@ void CParametersParser::Parse() | |
65 | 69 | } |
66 | 70 | else |
67 | 71 | { |
70 | 74 | Usage(); |
71 | 75 | exit(1); |
72 | 76 | } |
73 | @@ -614,7 +614,7 @@ | |
77 | @@ -614,7 +614,7 @@ void CParametersParser::Parse() | |
74 | 78 | read_output_fastq_desc(); |
75 | 79 | if (config.filtering_params.use_float_value && config.filtering_params.filter_mode != CFilteringParams::FilterMode::normal) |
76 | 80 | { |
79 | 83 | exit(1); |
80 | 84 | } |
81 | 85 | } |
82 | @@ -851,4 +851,4 @@ | |
86 | @@ -851,4 +851,4 @@ void CParametersParser::SetThreads() | |
83 | 87 | |
84 | 88 | |
85 | 89 | |
86 | 90 | -// ***** EOF |
87 | 91 | \ No newline at end of file |
88 | 92 | +// ***** EOF |
93 | Index: kmc/kmc_tools/parser.cpp | |
94 | =================================================================== | |
89 | 95 | --- kmc.orig/kmc_tools/parser.cpp |
90 | 96 | +++ kmc/kmc_tools/parser.cpp |
91 | @@ -141,7 +141,7 @@ | |
97 | @@ -141,7 +141,7 @@ void CParser::parseInputLine(const std:: | |
92 | 98 | desc.cutoff_max = atoi(tmp.c_str() + 3); |
93 | 99 | continue; |
94 | 100 | } |
97 | 103 | exit(1); |
98 | 104 | } |
99 | 105 | |
100 | @@ -220,7 +220,7 @@ | |
106 | @@ -220,7 +220,7 @@ void CParser::parseOtuputParamsLine() | |
101 | 107 | config.output_desc.counter_max = atoi(tmp.c_str() + 3); |
102 | 108 | continue; |
103 | 109 | } |
106 | 112 | exit(1); |
107 | 113 | } |
108 | 114 | } |
109 | @@ -241,4 +241,4 @@ | |
115 | @@ -241,4 +241,4 @@ bool CParser::nextLine(std::string& line | |
110 | 116 | } |
111 | 117 | } |
112 | 118 |
5 | 5 | makefile | 8 ++------ |
6 | 6 | 2 files changed, 6 insertions(+), 10 deletions(-) |
7 | 7 | |
8 | Index: kmc/kmer_counter/fastq_reader.h | |
9 | =================================================================== | |
8 | 10 | --- kmc.orig/kmer_counter/fastq_reader.h |
9 | 11 | +++ kmc/kmer_counter/fastq_reader.h |
10 | 12 | @@ -16,8 +16,8 @@ |
18 | 20 | |
19 | 21 | using namespace std; |
20 | 22 | |
23 | Index: kmc/makefile | |
24 | =================================================================== | |
21 | 25 | --- kmc.orig/makefile |
22 | 26 | +++ kmc/makefile |
23 | @@ -36,10 +36,6 @@ | |
27 | @@ -36,10 +36,6 @@ $(KMC_MAIN_DIR)/raduls_sse41.o \ | |
24 | 28 | $(KMC_MAIN_DIR)/raduls_avx2.o \ |
25 | 29 | $(KMC_MAIN_DIR)/raduls_avx.o |
26 | 30 | |
31 | 35 | KMC_DUMP_OBJS = \ |
32 | 36 | $(KMC_DUMP_DIR)/nc_utils.o \ |
33 | 37 | $(KMC_DUMP_DIR)/kmc_dump.o |
34 | @@ -64,10 +60,6 @@ | |
38 | @@ -64,10 +60,6 @@ $(KMC_TOOLS_DIR)/fastq_reader.o \ | |
35 | 39 | $(KMC_TOOLS_DIR)/fastq_writer.o \ |
36 | 40 | $(KMC_TOOLS_DIR)/percent_progress.o |
37 | 41 | |
42 | 46 | $(KMC_OBJS) $(KMC_DUMP_OBJS) $(KMC_API_OBJS): %.o: %.cpp |
43 | 47 | $(CC) $(CFLAGS) -c $< -o $@ |
44 | 48 | |
49 | Index: kmc/kmc_tools/fastq_reader.h | |
50 | =================================================================== | |
45 | 51 | --- kmc.orig/kmc_tools/fastq_reader.h |
46 | 52 | +++ kmc/kmc_tools/fastq_reader.h |
47 | 53 | @@ -17,8 +17,8 @@ |
55 | 61 | |
56 | 62 | |
57 | 63 | using namespace std; |
58 | @@ -96,4 +96,4 @@ | |
64 | @@ -96,4 +96,4 @@ public: | |
59 | 65 | |
60 | 66 | #endif |
61 | 67 |