Commit a8c5c927 authored by Andreas Marek's avatar Andreas Marek

Do "levels" of make check tests

- per default only some tests are run
- by setting CHECK_LEVEL=extended all test jobs are run
parent 3a0fb34f
...@@ -556,26 +556,26 @@ include legacy_test_programs.am ...@@ -556,26 +556,26 @@ include legacy_test_programs.am
endif endif
noinst_PROGRAMS += double_instance@SUFFIX@ noinst_PROGRAMS += double_instance@SUFFIX@
check_SCRIPTS += double_instance@SUFFIX@.sh check_SCRIPTS += double_instance@SUFFIX@_default.sh
double_instance@SUFFIX@_SOURCES = test/Fortran/elpa2/double_instance.F90 double_instance@SUFFIX@_SOURCES = test/Fortran/elpa2/double_instance.F90
double_instance@SUFFIX@_LDADD = $(test_program_ldadd) double_instance@SUFFIX@_LDADD = $(test_program_ldadd)
double_instance@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules double_instance@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
noinst_PROGRAMS += real_2stage_banded@SUFFIX@ noinst_PROGRAMS += real_2stage_banded@SUFFIX@
check_SCRIPTS += real_2stage_banded@SUFFIX@.sh check_SCRIPTS += real_2stage_banded@SUFFIX@_default.sh
real_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/real_2stage_banded.F90 real_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/real_2stage_banded.F90
real_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd) real_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
real_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules real_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
noinst_PROGRAMS += complex_2stage_banded@SUFFIX@ noinst_PROGRAMS += complex_2stage_banded@SUFFIX@
check_SCRIPTS += complex_2stage_banded@SUFFIX@.sh check_SCRIPTS += complex_2stage_banded@SUFFIX@_default.sh
complex_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/complex_2stage_banded.F90 complex_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/complex_2stage_banded.F90
complex_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd) complex_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
complex_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules complex_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
if WANT_SINGLE_PRECISION_REAL if WANT_SINGLE_PRECISION_REAL
noinst_PROGRAMS += single_real_2stage_banded@SUFFIX@ noinst_PROGRAMS += single_real_2stage_banded@SUFFIX@
check_SCRIPTS += single_real_2stage_banded@SUFFIX@.sh check_SCRIPTS += single_real_2stage_banded@SUFFIX@_default.sh
single_real_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/single_real_2stage_banded.F90 single_real_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/single_real_2stage_banded.F90
single_real_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd) single_real_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
single_real_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules single_real_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
...@@ -583,14 +583,14 @@ endif ...@@ -583,14 +583,14 @@ endif
if WANT_SINGLE_PRECISION_COMPLEX if WANT_SINGLE_PRECISION_COMPLEX
noinst_PROGRAMS += single_complex_2stage_banded@SUFFIX@ noinst_PROGRAMS += single_complex_2stage_banded@SUFFIX@
check_SCRIPTS += single_complex_2stage_banded@SUFFIX@.sh check_SCRIPTS += single_complex_2stage_banded@SUFFIX@_default.sh
single_complex_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/single_complex_2stage_banded.F90 single_complex_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/single_complex_2stage_banded.F90
single_complex_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd) single_complex_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
single_complex_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules single_complex_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
endif endif
# test scriptsT # test scripts
TASKS ?= 2 TASKS ?= 2
if WITH_MPI if WITH_MPI
wrapper=$(MPI_BINARY) -n $${TASKS:-$(TASKS)} wrapper=$(MPI_BINARY) -n $${TASKS:-$(TASKS)}
...@@ -598,7 +598,12 @@ else ...@@ -598,7 +598,12 @@ else
wrapper= wrapper=
endif endif
TESTS = $(check_SCRIPTS) TESTS = $(check_SCRIPTS)
%.sh: % %_extended.sh: %
@echo "#!/bin/bash" > $@
@echo 'if [ "$$CHECK_LEVEL" = "extended" ] ; then $(wrapper) ./$^ $$TEST_FLAGS ; else exit 77; fi' >> $@
@chmod +x $@
%_default.sh: %
@echo "#!/bin/bash" > $@ @echo "#!/bin/bash" > $@
@echo '$(wrapper)' ./$^ '$$TEST_FLAGS' >> $@ @echo '$(wrapper)' ./$^ '$$TEST_FLAGS' >> $@
@chmod +x $@ @chmod +x $@
......
...@@ -149,7 +149,12 @@ for lang, m, g, q, t, p, d, s, lay in product(sorted(language_flag.keys()), ...@@ -149,7 +149,12 @@ for lang, m, g, q, t, p, d, s, lay in product(sorted(language_flag.keys()),
print("noinst_PROGRAMS += " + name) print("noinst_PROGRAMS += " + name)
print("endif") print("endif")
print("check_SCRIPTS += " + name + ".sh") if lay == "square":
print("check_SCRIPTS += " + name + "_default.sh")
elif lay == "all_layouts":
print("check_SCRIPTS += " + name + "_extended.sh")
else:
raise Exception("Unknown layout {0}".format(lay))
if lang == "Fortran": if lang == "Fortran":
print(name + "_SOURCES = test/Fortran/test.F90") print(name + "_SOURCES = test/Fortran/test.F90")
...@@ -186,7 +191,7 @@ for lang, p, d in product(sorted(language_flag.keys()), sorted(prec_flag.keys()) ...@@ -186,7 +191,7 @@ for lang, p, d in product(sorted(language_flag.keys()), sorted(prec_flag.keys())
name = "test_autotune{langsuffix}_{d}_{p}".format(langsuffix=language_flag[lang], d=d, p=p) name = "test_autotune{langsuffix}_{d}_{p}".format(langsuffix=language_flag[lang], d=d, p=p)
print("check_SCRIPTS += " + name + ".sh") print("check_SCRIPTS += " + name + "_default.sh")
print("noinst_PROGRAMS += " + name) print("noinst_PROGRAMS += " + name)
if lang == "Fortran": if lang == "Fortran":
print(name + "_SOURCES = test/Fortran/test_autotune.F90") print(name + "_SOURCES = test/Fortran/test_autotune.F90")
......
...@@ -345,73 +345,73 @@ endif ...@@ -345,73 +345,73 @@ endif
endif endif
check_SCRIPTS += \ check_SCRIPTS += \
legacy_real_1stage@SUFFIX@.sh \ legacy_real_1stage@SUFFIX@_default.sh \
legacy_real_2stage@SUFFIX@.sh \ legacy_real_2stage@SUFFIX@_default.sh \
legacy_real_2stage_default@SUFFIX@.sh \ legacy_real_2stage_default@SUFFIX@_default.sh \
legacy_complex_1stage@SUFFIX@.sh \ legacy_complex_1stage@SUFFIX@_default.sh \
legacy_complex_2stage@SUFFIX@.sh \ legacy_complex_2stage@SUFFIX@_default.sh \
legacy_real_2stage_qr@SUFFIX@.sh \ legacy_real_2stage_qr@SUFFIX@_default.sh \
legacy_complex_2stage_default@SUFFIX@.sh \ legacy_complex_2stage_default@SUFFIX@_default.sh \
legacy_real_2stage_api@SUFFIX@.sh \ legacy_real_2stage_api@SUFFIX@_default.sh \
legacy_complex_2stage_api@SUFFIX@.sh \ legacy_complex_2stage_api@SUFFIX@_default.sh \
legacy_real_driver@SUFFIX@.sh \ legacy_real_driver@SUFFIX@_default.sh \
legacy_complex_driver@SUFFIX@.sh \ legacy_complex_driver@SUFFIX@_default.sh \
legacy_real_toeplitz@SUFFIX@.sh \ legacy_real_toeplitz@SUFFIX@_default.sh \
legacy_real_cholesky@SUFFIX@.sh \ legacy_real_cholesky@SUFFIX@_default.sh \
legacy_real_invert_trm@SUFFIX@.sh \ legacy_real_invert_trm@SUFFIX@_default.sh \
legacy_real_transpose_multiply@SUFFIX@.sh \ legacy_real_transpose_multiply@SUFFIX@_default.sh \
legacy_complex_cholesky@SUFFIX@.sh \ legacy_complex_cholesky@SUFFIX@_default.sh \
legacy_complex_invert_trm@SUFFIX@.sh \ legacy_complex_invert_trm@SUFFIX@_default.sh \
legacy_complex_transpose_multiply@SUFFIX@.sh \ legacy_complex_transpose_multiply@SUFFIX@_default.sh \
legacy_real_1stage_c_version@SUFFIX@.sh \ legacy_real_1stage_c_version@SUFFIX@_default.sh \
legacy_complex_1stage_c_version@SUFFIX@.sh \ legacy_complex_1stage_c_version@SUFFIX@_default.sh \
legacy_real_2stage_c_version@SUFFIX@.sh \ legacy_real_2stage_c_version@SUFFIX@_default.sh \
legacy_complex_2stage_c_version@SUFFIX@.sh \ legacy_complex_2stage_c_version@SUFFIX@_default.sh \
legacy_real_driver_c_version@SUFFIX@.sh \ legacy_real_driver_c_version@SUFFIX@_default.sh \
legacy_complex_driver_c_version@SUFFIX@.sh legacy_complex_driver_c_version@SUFFIX@_default.sh
if WANT_SINGLE_PRECISION_REAL if WANT_SINGLE_PRECISION_REAL
check_SCRIPTS += \ check_SCRIPTS += \
legacy_single_real_1stage@SUFFIX@.sh \ legacy_single_real_1stage@SUFFIX@_default.sh \
legacy_single_real_2stage@SUFFIX@.sh \ legacy_single_real_2stage@SUFFIX@_default.sh \
legacy_single_real_2stage_default@SUFFIX@.sh \ legacy_single_real_2stage_default@SUFFIX@_default.sh \
legacy_single_real_2stage_qr@SUFFIX@.sh \ legacy_single_real_2stage_qr@SUFFIX@_default.sh \
legacy_single_real_driver@SUFFIX@.sh \ legacy_single_real_driver@SUFFIX@_default.sh \
legacy_single_real_cholesky@SUFFIX@.sh \ legacy_single_real_cholesky@SUFFIX@_default.sh \
legacy_single_real_invert_trm@SUFFIX@.sh \ legacy_single_real_invert_trm@SUFFIX@_default.sh \
legacy_single_real_transpose_multiply@SUFFIX@.sh \ legacy_single_real_transpose_multiply@SUFFIX@_default.sh \
legacy_single_real_2stage_api@SUFFIX@.sh \ legacy_single_real_2stage_api@SUFFIX@_default.sh \
legacy_single_real_driver_c_version@SUFFIX@.sh legacy_single_real_driver_c_version@SUFFIX@_default.sh
endif endif
if WANT_SINGLE_PRECISION_COMPLEX if WANT_SINGLE_PRECISION_COMPLEX
check_SCRIPTS += \ check_SCRIPTS += \
legacy_single_complex_1stage@SUFFIX@.sh \ legacy_single_complex_1stage@SUFFIX@_default.sh \
legacy_single_complex_2stage@SUFFIX@.sh \ legacy_single_complex_2stage@SUFFIX@_default.sh \
legacy_single_complex_2stage_default@SUFFIX@.sh \ legacy_single_complex_2stage_default@SUFFIX@_default.sh \
legacy_single_complex_cholesky@SUFFIX@.sh \ legacy_single_complex_cholesky@SUFFIX@_default.sh \
legacy_single_complex_driver@SUFFIX@.sh \ legacy_single_complex_driver@SUFFIX@_default.sh \
legacy_single_complex_invert_trm@SUFFIX@.sh \ legacy_single_complex_invert_trm@SUFFIX@_default.sh \
legacy_single_complex_transpose_multiply@SUFFIX@.sh \ legacy_single_complex_transpose_multiply@SUFFIX@_default.sh \
legacy_single_complex_2stage_api@SUFFIX@.sh \ legacy_single_complex_2stage_api@SUFFIX@_default.sh \
legacy_single_complex_driver_c_version@SUFFIX@.sh legacy_single_complex_driver_c_version@SUFFIX@_default.sh
endif endif
if WITH_GPU_VERSION if WITH_GPU_VERSION
check_SCRIPTS += \ check_SCRIPTS += \
legacy_real_1stage_gpu@SUFFIX@.sh \ legacy_real_1stage_gpu@SUFFIX@_default.sh \
legacy_complex_1stage_gpu@SUFFIX@.sh \ legacy_complex_1stage_gpu@SUFFIX@_default.sh \
legacy_real_2stage_gpu@SUFFIX@.sh \ legacy_real_2stage_gpu@SUFFIX@_default.sh \
legacy_complex_2stage_gpu@SUFFIX@.sh legacy_complex_2stage_gpu@SUFFIX@_default.sh
if WANT_SINGLE_PRECISION_REAL if WANT_SINGLE_PRECISION_REAL
check_SCRIPTS += \ check_SCRIPTS += \
legacy_single_real_1stage_gpu@SUFFIX@.sh \ legacy_single_real_1stage_gpu@SUFFIX@_default.sh \
legacy_single_real_2stage_gpu@SUFFIX@.sh legacy_single_real_2stage_gpu@SUFFIX@_default.sh
endif endif
if WANT_SINGLE_PRECISION_COMPLEX if WANT_SINGLE_PRECISION_COMPLEX
check_SCRIPTS += \ check_SCRIPTS += \
legacy_single_complex_1stage_gpu@SUFFIX@.sh \ legacy_single_complex_1stage_gpu@SUFFIX@_default.sh \
legacy_single_complex_2stage_gpu@SUFFIX@.sh legacy_single_complex_2stage_gpu@SUFFIX@_default.sh
endif endif
endif endif
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