Commit 8dd66c78 authored by Andreas Marek's avatar Andreas Marek
Browse files

Merge branch 'soheil_backtrans' into 'master_pre_stage'

modify max_stored_rows

See merge request !66
parents b9099779 5a031cf2
......@@ -59,6 +59,7 @@
int max_threads_glob;
int set_max_threads_glob=0;
int const default_max_stored_rows = 256;
static int enumerate_identity(elpa_index_t index, int i);
static int cardinality_bool(elpa_index_t index);
......@@ -154,6 +155,7 @@ static int elpa_float_value_to_string(char *name, float value, const char **stri
static int elpa_double_string_to_value(char *name, char *string, double *value);
static int elpa_double_value_to_string(char *name, double value, const char **string);
#define BASE_ENTRY(option_name, option_description, once_value, readonly_value, print_flag_value) \
.base = { \
.name = option_name, \
......@@ -276,7 +278,7 @@ static const elpa_index_int_entry_t int_entries[] = {
INT_ENTRY("stripewidth_complex", "Stripewidth_complex, default 96. Must be a multiple of 8", 96, ELPA_AUTOTUNE_EXTENSIVE, ELPA_AUTOTUNE_DOMAIN_COMPLEX, \
stripewidth_complex_cardinality, stripewidth_complex_enumerate, stripewidth_complex_is_valid, NULL, PRINT_YES),
INT_ENTRY("max_stored_rows", "Maximum number of stored rows used in ELPA 1 backtransformation, default 63", 63, ELPA_AUTOTUNE_EXTENSIVE, ELPA_AUTOTUNE_DOMAIN_ANY, \
INT_ENTRY("max_stored_rows", "Maximum number of stored rows used in ELPA 1 backtransformation", default_max_stored_rows, ELPA_AUTOTUNE_EXTENSIVE, ELPA_AUTOTUNE_DOMAIN_ANY, \
max_stored_rows_cardinality, max_stored_rows_enumerate, max_stored_rows_is_valid, NULL, PRINT_YES),
#ifdef WITH_OPENMP_TRADITIONAL
INT_ENTRY("omp_threads", "OpenMP threads used in ELPA, default 1", 1, ELPA_AUTOTUNE_FAST, ELPA_AUTOTUNE_DOMAIN_ANY, \
......@@ -1125,28 +1127,20 @@ static int valid_with_gpu_elpa2(elpa_index_t index, int n, int new_value) {
}
static int max_stored_rows_cardinality(elpa_index_t index) {
return 8;
return 4;
}
static int max_stored_rows_enumerate(elpa_index_t index, int i) {
switch(i) {
case 0:
return 15;
case 1:
return 31;
case 2:
return 47;
case 3:
return 63;
case 4:
return 79;
case 5:
return 95;
case 6:
return 111;
case 7:
return 127;
}
switch(i) {
case 0:
return 64;
case 1:
return 128;
case 2:
return 256;
case 3:
return 512;
}
}
static int max_stored_rows_is_valid(elpa_index_t index, int n, int new_value) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment