Commit e405cfa9 authored by Andreas Marek's avatar Andreas Marek
Browse files

Rename test programs to fix issue with the parallel builds

Obviously, recent versions of automake decided to filter out
an "test_" string which led to some surprises
parent 206868b3
...@@ -617,52 +617,40 @@ endif ...@@ -617,52 +617,40 @@ endif
#include test_programs_manual.am #include test_programs_manual.am
noinst_PROGRAMS += double_instance@SUFFIX@ noinst_PROGRAMS += validate_double_instance@SUFFIX@
check_SCRIPTS += double_instance@SUFFIX@_default.sh check_SCRIPTS += validate_double_instance@SUFFIX@_default.sh
double_instance@SUFFIX@_SOURCES = test/Fortran/elpa2/double_instance.F90 validate_double_instance@SUFFIX@_SOURCES = test/Fortran/elpa2/double_instance.F90
double_instance@SUFFIX@_LDADD = $(test_program_ldadd) validate_double_instance@SUFFIX@_LDADD = $(test_program_ldadd)
double_instance@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules validate_double_instance@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
noinst_PROGRAMS += real_2stage_banded@SUFFIX@ noinst_PROGRAMS += validate_real_2stage_banded@SUFFIX@
check_SCRIPTS += real_2stage_banded@SUFFIX@_default.sh check_SCRIPTS += validate_real_2stage_banded@SUFFIX@_default.sh
real_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/real_2stage_banded.F90 validate_real_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/real_2stage_banded.F90
real_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd) validate_real_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
real_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules validate_real_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
noinst_PROGRAMS += complex_2stage_banded@SUFFIX@ noinst_PROGRAMS += validate_complex_2stage_banded@SUFFIX@
check_SCRIPTS += complex_2stage_banded@SUFFIX@_default.sh check_SCRIPTS += validate_complex_2stage_banded@SUFFIX@_default.sh
complex_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/complex_2stage_banded.F90 validate_complex_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/complex_2stage_banded.F90
complex_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd) validate_complex_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
complex_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules validate_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 += validate_single_real_2stage_banded@SUFFIX@
check_SCRIPTS += single_real_2stage_banded@SUFFIX@_default.sh check_SCRIPTS += validate_single_real_2stage_banded@SUFFIX@_default.sh
single_real_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/single_real_2stage_banded.F90 validate_single_real_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/single_real_2stage_banded.F90
single_real_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd) validate_single_real_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
single_real_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules validate_single_real_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
endif endif
if WANT_SINGLE_PRECISION_COMPLEX if WANT_SINGLE_PRECISION_COMPLEX
noinst_PROGRAMS += single_complex_2stage_banded@SUFFIX@ noinst_PROGRAMS += validate_single_complex_2stage_banded@SUFFIX@
check_SCRIPTS += single_complex_2stage_banded@SUFFIX@_default.sh check_SCRIPTS += validate_single_complex_2stage_banded@SUFFIX@_default.sh
single_complex_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/single_complex_2stage_banded.F90 validate_single_complex_2stage_banded@SUFFIX@_SOURCES = test/Fortran/elpa2/single_complex_2stage_banded.F90
single_complex_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd) validate_single_complex_2stage_banded@SUFFIX@_LDADD = $(test_program_ldadd)
single_complex_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules validate_single_complex_2stage_banded@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
endif endif
#noinst_PROGRAMS += test_c_bindings@SUFFIX@
#check_SCRIPTS += test_c_bindings@SUFFIX@_default.sh
#test_c_bindings@SUFFIX@_SOURCES = test/Fortran/elpa_generalized/test_bindings.F90
#test_c_bindings@SUFFIX@_LDADD = $(test_program_ldadd) $(FCLIBS)
#test_c_bindings@SUFFIX@_FCFLAGS = $(AM_FCFLAGS) $(FC_MODINC)test_modules $(FC_MODINC)modules
#noinst_PROGRAMS += test_c_cannon@SUFFIX@
#check_SCRIPTS += test_c_cannon@SUFFIX@_default.sh
#test_c_cannon@SUFFIX@_SOURCES = test/C/elpa_generalized/test_cannon.c
#test_c_cannon@SUFFIX@_LDADD = $(test_program_ldadd) $(FCLIBS)
#test_c_cannon@SUFFIX@_CFLAGS = $(test_program_cflags)
# python wrapper # python wrapper
pyelpadir = $(pythondir)/pyelpa pyelpadir = $(pythondir)/pyelpa
if WITH_PYTHON if WITH_PYTHON
...@@ -742,7 +730,7 @@ CLEANFILES = \ ...@@ -742,7 +730,7 @@ CLEANFILES = \
clean-local: clean-local:
-rm -rf modules/* private_modules/* test_modules/* .fortran_dependencies/* -rm -rf modules/* private_modules/* test_modules/* .fortran_dependencies/*
-rm -rf test_*.sh -rm -rf validate_*.sh
-rm -rf legacy_*.sh -rm -rf legacy_*.sh
-rm -rf real_2stage*.sh -rm -rf real_2stage*.sh
-rm -rf complex_2stage*.sh -rm -rf complex_2stage*.sh
......
...@@ -179,7 +179,7 @@ for lang, m, g, q, t, p, d, s, lay, spl in product(sorted(language_flag.keys()), ...@@ -179,7 +179,7 @@ for lang, m, g, q, t, p, d, s, lay, spl in product(sorted(language_flag.keys()),
raise Exception("Oh no!") raise Exception("Oh no!")
endifs += 1 endifs += 1
name = "test{langsuffix}_{d}_{p}_{t}_{s}{kernelsuffix}_{gpusuffix}{qrsuffix}{m}{layoutsuffix}{spl}".format( name = "validate{langsuffix}_{d}_{p}_{t}_{s}{kernelsuffix}_{gpusuffix}{qrsuffix}{m}{layoutsuffix}{spl}".format(
langsuffix=language_flag[lang], langsuffix=language_flag[lang],
d=d, p=p, t=t, s=s, d=d, p=p, t=t, s=s,
kernelsuffix="" if kernel == "nokernel" else "_" + kernel, kernelsuffix="" if kernel == "nokernel" else "_" + kernel,
...@@ -239,7 +239,7 @@ for lang, p, d in product(sorted(language_flag.keys()), sorted(prec_flag.keys()) ...@@ -239,7 +239,7 @@ for lang, p, d in product(sorted(language_flag.keys()), sorted(prec_flag.keys())
raise Exception("Oh no!") raise Exception("Oh no!")
endifs += 1 endifs += 1
name = "test_autotune{langsuffix}_{d}_{p}".format(langsuffix=language_flag[lang], d=d, p=p) name = "validate_autotune{langsuffix}_{d}_{p}".format(langsuffix=language_flag[lang], d=d, p=p)
print("if ENABLE_AUTOTUNING") print("if ENABLE_AUTOTUNING")
print("check_SCRIPTS += " + name + "_extended.sh") print("check_SCRIPTS += " + name + "_extended.sh")
...@@ -263,7 +263,7 @@ for lang, p, d in product(sorted(language_flag.keys()), sorted(prec_flag.keys()) ...@@ -263,7 +263,7 @@ for lang, p, d in product(sorted(language_flag.keys()), sorted(prec_flag.keys())
print("endif\n" * endifs) print("endif\n" * endifs)
print("endif") print("endif")
name = "test_multiple_objs_real_double" name = "validate_multiple_objs_real_double"
print("if ENABLE_AUTOTUNING") print("if ENABLE_AUTOTUNING")
print("check_SCRIPTS += " + name + "_extended.sh") print("check_SCRIPTS += " + name + "_extended.sh")
print("noinst_PROGRAMS += " + name) print("noinst_PROGRAMS += " + name)
...@@ -275,7 +275,7 @@ print(" " + " \\\n ".join([ ...@@ -275,7 +275,7 @@ print(" " + " \\\n ".join([
prec_flag['double']])) prec_flag['double']]))
print("endif") print("endif")
name = "test_multiple_objs_real_double_c_version" name = "validate_multiple_objs_real_double_c_version"
print("if ENABLE_AUTOTUNING") print("if ENABLE_AUTOTUNING")
print("check_SCRIPTS += " + name + "_extended.sh") print("check_SCRIPTS += " + name + "_extended.sh")
print("noinst_PROGRAMS += " + name) print("noinst_PROGRAMS += " + name)
...@@ -287,7 +287,7 @@ print(" " + " \\\n ".join([ ...@@ -287,7 +287,7 @@ print(" " + " \\\n ".join([
prec_flag['double']])) prec_flag['double']]))
print("endif") print("endif")
name = "test_split_comm_real_double" name = "validate_split_comm_real_double"
print("check_SCRIPTS += " + name + "_extended.sh") print("check_SCRIPTS += " + name + "_extended.sh")
print("noinst_PROGRAMS += " + name) print("noinst_PROGRAMS += " + name)
print(name + "_SOURCES = test/Fortran/test_split_comm.F90") print(name + "_SOURCES = test/Fortran/test_split_comm.F90")
......
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