Commit 7389664a authored by Andreas Marek's avatar Andreas Marek

Fix make distcheck

parent b17f11c9
...@@ -204,16 +204,16 @@ endif ...@@ -204,16 +204,16 @@ endif
if WITH_REAL_SPARC64_BLOCK2_KERNEL if WITH_REAL_SPARC64_BLOCK2_KERNEL
libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_sparc64_2hv_double_precision.c libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_sparc64_2hv_double_precision.c
if WANT_SINGLE_PRECISION_REAL #if WANT_SINGLE_PRECISION_REAL
libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_sparc64_2hv_single_precision.c # libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_sparc64_2hv_single_precision.c
endif #endif
endif endif
if WITH_REAL_VSX_BLOCK2_KERNEL if WITH_REAL_VSX_BLOCK2_KERNEL
libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_vsx_2hv_double_precision.c libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_vsx_2hv_double_precision.c
if WANT_SINGLE_PRECISION_REAL #if WANT_SINGLE_PRECISION_REAL
libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_vsx_2hv_single_precision.c # libelpa@SUFFIX@_private_la_SOURCES += src/elpa2/kernels/real_vsx_2hv_single_precision.c
endif #endif
endif endif
if WITH_REAL_SSE_BLOCK2_KERNEL if WITH_REAL_SSE_BLOCK2_KERNEL
...@@ -686,6 +686,7 @@ EXTRA_DIST = \ ...@@ -686,6 +686,7 @@ EXTRA_DIST = \
src/elpa2/kernels/real_avx512_2hv_template.c \ src/elpa2/kernels/real_avx512_2hv_template.c \
src/elpa2/kernels/real_avx512_4hv_template.c \ src/elpa2/kernels/real_avx512_4hv_template.c \
src/elpa2/kernels/real_avx512_6hv_template.c \ src/elpa2/kernels/real_avx512_6hv_template.c \
src/elpa2/kernels/real_vsx_2hv_template.c \
src/elpa2/kernels/real_sse_2hv_template.c \ src/elpa2/kernels/real_sse_2hv_template.c \
src/elpa2/kernels/real_sse_4hv_template.c \ src/elpa2/kernels/real_sse_4hv_template.c \
src/elpa2/kernels/real_sse_6hv_template.c \ src/elpa2/kernels/real_sse_6hv_template.c \
......
...@@ -394,9 +394,7 @@ matrix_size = { ...@@ -394,9 +394,7 @@ matrix_size = {
MPI_TASKS=2 MPI_TASKS=2
# sorted(gpu.keys()), for cc, fc, m, o, p, a, b, g, cov, instr, addr, na in product(
#for cc, fc, m, o, p, a, b, g, cov, instr, addr, na in product(
for cc, fc, m, o, p, a, b, cov, instr, addr, na in product(
sorted(c_compiler.keys()), sorted(c_compiler.keys()),
sorted(fortran_compiler.keys()), sorted(fortran_compiler.keys()),
sorted(mpi.keys()), sorted(mpi.keys()),
...@@ -404,6 +402,7 @@ for cc, fc, m, o, p, a, b, cov, instr, addr, na in product( ...@@ -404,6 +402,7 @@ for cc, fc, m, o, p, a, b, cov, instr, addr, na in product(
sorted(precision.keys()), sorted(precision.keys()),
sorted(assumed_size.keys()), sorted(assumed_size.keys()),
sorted(band_to_full_blocking.keys()), sorted(band_to_full_blocking.keys()),
sorted(gpu.keys()),
sorted(coverage.keys()), sorted(coverage.keys()),
sorted(instruction_set.keys()), sorted(instruction_set.keys()),
sorted(address_sanitize_flag.keys()), sorted(address_sanitize_flag.keys()),
...@@ -412,7 +411,9 @@ for cc, fc, m, o, p, a, b, cov, instr, addr, na in product( ...@@ -412,7 +411,9 @@ for cc, fc, m, o, p, a, b, cov, instr, addr, na in product(
nev = 150 nev = 150
nblk = 16 nblk = 16
g = "no-gpu"
if (instr != "power8" and g == "with-gpu"):
continue
# do not all combinations with all compilers # do not all combinations with all compilers
# especially - use pgi only on minskys for now # especially - use pgi only on minskys for now
......
...@@ -56,8 +56,8 @@ module elpa2_utilities ...@@ -56,8 +56,8 @@ module elpa2_utilities
implicit none implicit none
public public
integer(kind=c_int), parameter :: number_of_real_kernels = ELPA_2STAGE_NUMBER_OF_REAL_KERNELS integer(kind=c_int), parameter :: number_of_real_kernels = ELPA_2STAGE_NUMBER_OF_REAL_KERNELS - 6
integer(kind=c_int), parameter :: number_of_complex_kernels = ELPA_2STAGE_NUMBER_OF_COMPLEX_KERNELS integer(kind=c_int), parameter :: number_of_complex_kernels = ELPA_2STAGE_NUMBER_OF_COMPLEX_KERNELS - 4
#ifdef WITH_REAL_GENERIC_KERNEL #ifdef WITH_REAL_GENERIC_KERNEL
integer(kind=c_int), parameter :: REAL_ELPA_KERNEL_GENERIC = ELPA_2STAGE_REAL_GENERIC integer(kind=c_int), parameter :: REAL_ELPA_KERNEL_GENERIC = ELPA_2STAGE_REAL_GENERIC
......
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