Skip to content
GitLab
Commit 0694eadb authored by Andreas Marek's avatar Andreas Marek
Browse files

Merge branch 'master_pre_stage' into loh/autotuning

parents 58003a59 e2fdf6c9
Expand all Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 0694eadb
This diff is collapsed.
Makefile.am
View file @ 0694eadb
......@@ -714,18 +714,30 @@ EXTRA_DIST = \
test/shared/test_check_correctness_template.F90 \
test/shared/test_prepare_matrix_template.F90 \
test/shared/test_analytic_template.F90 \
test_project/Makefile.am \
test_project/autogen.sh \
test_project/configure.ac \
test_project/fdep \
test_project/m4 \
test_project/src/test_real.F90 \
test_project_1stage/Makefile.am \
test_project_1stage/autogen.sh \
test_project_1stage/configure.ac \
test_project_1stage/fdep \
test_project_1stage/m4 \
test_project_1stage/src/test_real.F90 \
test_project_2stage/Makefile.am \
test_project_2stage/autogen.sh \
test_project_2stage/configure.ac \
test_project_2stage/fdep \
test_project_2stage/m4 \
test_project_2stage/src/test_real2.F90
test_project_2stage/src/test_real2.F90 \
test_project_1stage_legacy_api/Makefile.am \
test_project_1stage_legacy_api/autogen.sh \
test_project_1stage_legacy_api/configure.ac \
test_project_1stage_legacy_api/fdep \
test_project_1stage_legacy_api/m4 \
test_project_1stage_legacy_api/src/test_real.F90 \
test_project_2stage_legacy_api/Makefile.am \
test_project_2stage_legacy_api/autogen.sh \
test_project_2stage_legacy_api/configure.ac \
test_project_2stage_legacy_api/fdep \
test_project_2stage_legacy_api/m4 \
test_project_2stage_legacy_api/src/test_real2.F90
if ENABLE_LEGACY
EXTRA_DIST += \
......
generate_gitlab_ci_tests.py
View file @ 0694eadb
......@@ -279,46 +279,46 @@ compiler = {
"gnu" : "gnu",
"intel" : "intel"
}
#for comp, s, a in product(
# sorted(compiler.keys()),
# sorted(stage.keys()),
# sorted(api.keys())):
#
# print("# test_project_"+stage[s]+api[a]+"_"+compiler[comp])
# print("test_project_"+stage[s]+api[a]+"_"+compiler[comp]+":")
# print(" tags:")
# print(" - buildtest")
# print(" script:")
# print(" - mkdir build")
# print(" - pushd build")
# print(" - ../autogen.sh")
# if (comp == "intel"):
# print(" - ../configure --enable-option-checking=fatal FCFLAGS=\"-march=native\" CFLAGS=\"-march=native\" --disable-avx2 SCALAPACK_LDFLAGS=\"$MKL_INTEL_SCALAPACK_LDFLAGS_MPI_NO_OMP\" SCALAPACK_FCFLAGS=\"$MKL_INTEL_SCALAPACK_FCFLAGS_MPI_NO_OMP\" FC=mpiifort --prefix=$PWD/installdest --disable-avx2 || { cat config.log; exit 1; }")
# if (comp == "gnu"):
# print(" - ../configure --enable-option-checking=fatal FCFLAGS=\"-march=native\" CFLAGS=\"-march=native\" --disable-avx2 SCALAPACK_LDFLAGS=\"$MKL_GFORTRAN_SCALAPACK_LDFLAGS_MPI_NO_OMP\" SCALAPACK_FCFLAGS=\"$MKL_GFORTRAN_SCALAPACK_FCFLAGS_MPI_NO_OMP\" FC=mpif90 --prefix=$PWD/installdest --disable-avx2 || { cat config.log; exit 1; }")
# print(" - make -j 8")
# print(" - make install")
# print(" - popd")
# print(" - mkdir test_project_"+stage[s]+api[a]+"/build")
# print(" - pushd test_project_"+stage[s]+api[a]+"/build")
# print(" - ../autogen.sh")
# if (comp == "intel"):
# print(" - ../configure --enable-option-checking=fatal PKG_CONFIG_PATH=../../build/installdest/lib/pkgconfig FC=mpiifort || { cat config.log; exit 1; }")
# if (comp == "gnu"):
# print(" - ../configure --enable-option-checking=fatal PKG_CONFIG_PATH=../../build/installdest/lib/pkgconfig FC=mpif90 || { cat config.log; exit 1; }")
# print(" - make -j 8")
# print(" - export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH")
# if ( s == "1stage"):
# print(" - ./test_real")
# else:
# print(" - ./test_real2")
# print(" - make distclean")
# print(" - popd")
# print(" - pushd build")
# print(" - make distclean")
# print(" - rm -rf installdest")
# print(" - popd")
# print("\n\n")
for comp, s, a in product(
sorted(compiler.keys()),
sorted(stage.keys()),
sorted(api.keys())):
print("# test_project_"+stage[s]+api[a]+"_"+compiler[comp])
print("test_project_"+stage[s]+api[a]+"_"+compiler[comp]+":")
print(" tags:")
print(" - buildtest")
print(" script:")
print(" - mkdir build")
print(" - pushd build")
print(" - ../autogen.sh")
if (comp == "intel"):
print(" - ../configure --enable-option-checking=fatal FCFLAGS=\"-march=native\" CFLAGS=\"-march=native\" --disable-avx2 SCALAPACK_LDFLAGS=\"$MKL_INTEL_SCALAPACK_LDFLAGS_MPI_NO_OMP\" SCALAPACK_FCFLAGS=\"$MKL_INTEL_SCALAPACK_FCFLAGS_MPI_NO_OMP\" FC=mpiifort --prefix=$PWD/installdest --disable-avx2 || { cat config.log; exit 1; }")
if (comp == "gnu"):
print(" - ../configure --enable-option-checking=fatal FCFLAGS=\"-march=native\" CFLAGS=\"-march=native\" --disable-avx2 SCALAPACK_LDFLAGS=\"$MKL_GFORTRAN_SCALAPACK_LDFLAGS_MPI_NO_OMP\" SCALAPACK_FCFLAGS=\"$MKL_GFORTRAN_SCALAPACK_FCFLAGS_MPI_NO_OMP\" FC=mpif90 --prefix=$PWD/installdest --disable-avx2 || { cat config.log; exit 1; }")
print(" - make -j 8")
print(" - make install")
print(" - popd")
print(" - mkdir test_project_"+stage[s]+api[a]+"/build")
print(" - pushd test_project_"+stage[s]+api[a]+"/build")
print(" - ../autogen.sh")
if (comp == "intel"):
print(" - ../configure --enable-option-checking=fatal PKG_CONFIG_PATH=../../build/installdest/lib/pkgconfig FC=mpiifort || { cat config.log; exit 1; }")
if (comp == "gnu"):
print(" - ../configure --enable-option-checking=fatal PKG_CONFIG_PATH=../../build/installdest/lib/pkgconfig FC=mpif90 || { cat config.log; exit 1; }")
print(" - make -j 8")
print(" - export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH")
if ( s == "1stage"):
print(" - ./test_real")
else:
print(" - ./test_real2")
print(" - make distclean")
print(" - popd")
print(" - pushd build")
print(" - make distclean")
print(" - rm -rf installdest")
print(" - popd")
print("\n\n")
print("#The tests follow here")
......
Supports Markdown
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