summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjan.reininghaus <jan.reininghaus@8e3bb3c2-eed4-f18f-5264-0b6c94e6926d>2014-04-29 09:14:20 +0000
committerjan.reininghaus <jan.reininghaus@8e3bb3c2-eed4-f18f-5264-0b6c94e6926d>2014-04-29 09:14:20 +0000
commitfe4b78f9280469f9f99836a8c0c9c1ee140825c6 (patch)
tree999ab5182118fcac2f8f31cc4e5db783142285ee
parent7d7a7fbca61da76c423d2fb73857ad8f1c7abd56 (diff)
switched num chunks to num threads in chunk_reduction.h and spectral_sequence_reduction.h
git-svn-id: https://phat.googlecode.com/svn/trunk@162 8e3bb3c2-eed4-f18f-5264-0b6c94e6926d
-rw-r--r--include/phat/algorithms/chunk_reduction.h4
-rw-r--r--include/phat/algorithms/spectral_sequence_reduction.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/phat/algorithms/chunk_reduction.h b/include/phat/algorithms/chunk_reduction.h
index 51460c2..0e096b5 100644
--- a/include/phat/algorithms/chunk_reduction.h
+++ b/include/phat/algorithms/chunk_reduction.h
@@ -39,8 +39,8 @@ namespace phat {
std::vector < column_type > column_type( nr_columns, GLOBAL );
std::vector< char > is_active( nr_columns, false );
- const index chunk_size = (index) sqrt( (double)nr_columns );
- //const index chunk_size = nr_columns / omp_get_max_threads( );
+ //const index chunk_size = (index) sqrt( (double)nr_columns );
+ const index chunk_size = nr_columns / omp_get_max_threads( );
std::vector< index > chunk_boundaries;
for( index cur_boundary = 0; cur_boundary < nr_columns; cur_boundary += chunk_size )
diff --git a/include/phat/algorithms/spectral_sequence_reduction.h b/include/phat/algorithms/spectral_sequence_reduction.h
index 8a9500f..b0d4ec1 100644
--- a/include/phat/algorithms/spectral_sequence_reduction.h
+++ b/include/phat/algorithms/spectral_sequence_reduction.h
@@ -30,7 +30,7 @@ namespace phat {
const index nr_columns = boundary_matrix.get_num_cols();
std::vector< index > lowest_one_lookup( nr_columns, -1 );
- //const index num_stripes = sqrt( nr_columns );
+ //const index num_stripes = (index) sqrt( (double)nr_columns );
const index num_stripes = omp_get_max_threads();
index block_size = ( nr_columns % num_stripes == 0 ) ? nr_columns / num_stripes : block_size = nr_columns / num_stripes + 1;