Skip to content
Snippets Groups Projects
Commit 07349d00 authored by Pavel Kus's avatar Pavel Kus
Browse files

fixing errorneous rebase

parent 7260ea90
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 5 additions and 5 deletions
src/elpa_index.c
+ 5
− 5
View file @ 07349d00
...@@ -80,9 +80,9 @@ static int band_to_full_cardinality(elpa_index_t index); ...@@ -80,9 +80,9 @@ static int band_to_full_cardinality(elpa_index_t index);
static int band_to_full_enumerate(elpa_index_t index, int i); static int band_to_full_enumerate(elpa_index_t index, int i);
static int band_to_full_is_valid(elpa_index_t index, int n, int new_value); static int band_to_full_is_valid(elpa_index_t index, int n, int new_value);
static int elpa_omp_threads_cardinality(elpa_index_t index); static int omp_threads_cardinality(elpa_index_t index);
static int elpa_omp_threads_enumerate(elpa_index_t index, int i); static int omp_threads_enumerate(elpa_index_t index, int i);
static int elpa_omp_threads_is_valid(elpa_index_t index, int n, int new_value); static int omp_threads_is_valid(elpa_index_t index, int n, int new_value);
static int min_tile_size_cardinality(elpa_index_t index); static int min_tile_size_cardinality(elpa_index_t index);
...@@ -689,7 +689,7 @@ static int band_to_full_is_valid(elpa_index_t index, int n, int new_value) { ...@@ -689,7 +689,7 @@ static int band_to_full_is_valid(elpa_index_t index, int n, int new_value) {
return (1 <= new_value) && (new_value <= max_block); return (1 <= new_value) && (new_value <= max_block);
} }
static int elpa_omp_threads_cardinality(elpa_index_t index) { static int omp_threads_cardinality(elpa_index_t index) {
int max_threads; int max_threads;
#ifdef WITH_OPENMP #ifdef WITH_OPENMP
if (set_max_threads_glob == 0) { if (set_max_threads_glob == 0) {
...@@ -706,7 +706,7 @@ static int elpa_omp_threads_cardinality(elpa_index_t index) { ...@@ -706,7 +706,7 @@ static int elpa_omp_threads_cardinality(elpa_index_t index) {
return max_threads; return max_threads;
} }
static int elpa_omp_threads_enumerate(elpa_index_t index, int i) { static int omp_threads_enumerate(elpa_index_t index, int i) {
return i + 1; return i + 1;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment