Skip to content

Commit 7824df5

Browse files
committed
fix bug
1 parent a067d1b commit 7824df5

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
m2drift mountainsort2_drift_01.pipeline --num_time_segment_threads=20 --num_basic_sort_threads=2
2+
pip1 mountainsort2_drift_01.pipeline --num_time_segment_threads=1 --num_basic_sort_threads=1

packages/mountainsort2/algs/basic_sort.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ exports.run=function(opts,callback) {
200200
console.log('****** '+console_prefix+'BASIC SORT STEP '+(ii+1)+' of '+steps.length +' ******');
201201
var timer=new Date();
202202
step(function(result) {
203+
if (!result) result={};
203204
console.log ('Elapsed time ['+(result.processor_name||'')+'] (sec): '+get_elapsed_sec(timer));
204205
cb();
205206
});

packages/mountainsort2/src/mountainsort2_main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,9 @@ int main(int argc, char* argv[])
189189

190190
if (CLP.named_parameters.contains("_request_num_threads")) {
191191
int num_threads = CLP.named_parameters.value("_request_num_threads", 0).toInt();
192-
if (num_threads)
192+
if (num_threads) {
193193
omp_set_num_threads(num_threads);
194+
}
194195
}
195196

196197
if (arg1 == "mountainsort.extract_neighborhood_timeseries") {

packages/mountainsort2/src/p_bandpass_filter.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ void define_kernel(int N, double* kernel, double samplefreq, double freq_min, do
289289

290290
Mda32 bandpass_filter_kernel(Mda32& X, double samplerate, double freq_min, double freq_max, double freq_wid)
291291
{
292+
QTime timer; timer.start();
292293
long M = X.N1();
293294
long N = X.N2();
294295
long MN = M * N;
@@ -309,6 +310,10 @@ Mda32 bandpass_filter_kernel(Mda32& X, double samplerate, double freq_min, doubl
309310
free(kernel0);
310311
free(Xhat);
311312

313+
double sec=timer.elapsed()*1.0/1000;
314+
double rate=X.totalSize()/sec;
315+
printf("bandpass filter rate: %g numbers/sec\n",rate);
316+
312317
return Y;
313318
}
314319
}

0 commit comments

Comments
 (0)