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

Merge branch 'master' into ELPA_GPU

parents 2b6eb498 f0f38b0f
This diff is collapsed.
......@@ -509,6 +509,7 @@ EXTRA_elpa2_test_complex_gpu_version_single_precision@SUFFIX@_DEPENDENCIES = tes
endif
endif
# elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@.sh
check_SCRIPTS = \
elpa1_test_real@SUFFIX@.sh \
......@@ -517,11 +518,11 @@ check_SCRIPTS = \
elpa1_test_complex@SUFFIX@.sh \
elpa2_test_complex@SUFFIX@.sh \
elpa2_test_complex_default_kernel@SUFFIX@.sh \
elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@.sh \
elpa2_test_real_choose_kernel_with_api@SUFFIX@.sh \
elpa2_test_complex_choose_kernel_with_api@SUFFIX@.sh \
elpa2_print_kernels@SUFFIX@
if !WITH_OPENMP
check_SCRIPTS += \
elpa1_test_real_with_c@SUFFIX@.sh \
......@@ -572,8 +573,8 @@ else
endif
TESTS = $(check_SCRIPTS)
%.sh: %
echo '$(wrapper) ./$^ $$TEST_FLAGS' > $@
chmod +x $@
@echo $(wrapper) ./$^ '$$TEST_FLAGS' > $@
@chmod +x $@
# Preprocessed files (just used for manual inspection)
mod_precision.i: $(top_srcdir)/src/mod_precision.F90
......
#!/bin/bash
cov_dir=coverage_data
cov_file=$cov_dir/coverage_${CI_BUILD_REF}_${CI_BUILD_NAME}.info
mkdir -p $cov_dir/
lcov --capture \
$(find src/ -name "*.gcn[ao]" | xargs -n 1 dirname | sort -u | grep -v ftimings | xargs -n 1 echo --directory) \
--output-file $cov_file
lcov -r $cov_file "/usr/*" -o $cov_file
lcov -r $cov_file "/afs/*" -o $cov_file
lcov -r $cov_file "src/ftimings" -o $cov_file
#!/bin/bash
lcov $(for i in coverage_data/coverage_${CI_BUILD_REF}_*.info; do echo -a $i; done) -o coverage_data/coverage_${CI_BUILD_REF}.info
lcov --summary coverage_data/coverage_${CI_BUILD_REF}.info 2>&1 | \
awk '/lines|functions/ {
gsub(/\.*:$/, "", $1);
gsub(/^./, "", $3);
printf "%s: %s (%s of %s), ", $1, $2, $3, $5;
}
/branches/ {
print "";
}' | \
sed 's/^/__COVERAGE__:/; s/, $//;'
genhtml coverage_data/coverage_${CI_BUILD_REF}.info -o coverage_data
......@@ -983,7 +983,7 @@ if test x"${with_mpi}" = x"yes"; then
fi
else
if test x"${enable_openmp}" = x"yes"; then
SUFFIX="_onnode_openmp"
SUFFIX="_onenode_openmp"
else
SUFFIX="_onenode"
fi
......
......@@ -81,6 +81,12 @@ module mod_setup_mpi
call mpi_comm_rank(mpi_comm_world,myid,mpierr)
call mpi_comm_size(mpi_comm_world,nprocs,mpierr)
#ifdef WITH_MPI
if (nprocs <= 1) then
error stop "The test programs must be run with more than 1 task to ensure that usage with MPI is actually tested"
endif
#endif
end subroutine
......
......@@ -75,7 +75,6 @@ program test_real_example
use ELPA1
use elpa_utilities, only : error_unit
! use elpa_mpi
use iso_c_binding
implicit none
......
#/bin/bash
mkdir -p /data/elpa/gitlab/coverage/`git log | head -n 1 | sed -r s/commit\ // | cut -c1-16`
lcov -q --capture --directory src/.libs --directory src/elpa2_kernels --output-file coverage_all.info && lcov -q ./coverage_all.info /usr/lib64/\* -r ./coverage_all.info /afs/ipp-garching.mpg.de/common/soft/gcc/4.9.3/@sys/lib/gcc/x86_64-unknown-linux-gnu/4.9.3/include/* > ./coverage_all_cleaned_$(git log | head -n 1 | sed -r s/commit\ // | cut -c1-16)_"$(pidof pidof)".info
mv coverage_all_cleaned_* /data/elpa/gitlab/coverage/`git log | head -n 1 | sed -r s/commit\ // | cut -c1-16`
lcov $(for f in /data/elpa/gitlab/coverage/`git log | head -n 1 | sed -r s/commit\ // | cut -c1-16`/*; do echo "-a $f"; done) -o info.out
lcov --summary info.out 2>&1 | awk '/lines|functions/ {gsub(/\.*:$/, "", $1); gsub(/^./, "", $3); printf "%s: %s (%s of %s), ", $1, $2, $3, $5; } /branches/ {print "";}' | sed 's/^/__COVERAGE__:/; s/, $//;'
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