Skip to content

GitLab

elpa
elpa
Commit 7c8a5432 authored by Andreas Marek's avatar Andreas Marek
Browse files
Options

Merge branch 'master' of gitlab.mpcdf.mpg.de:elpa/elpa

parents 80093532 899155bf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 259 additions and 118 deletions
.gitlab-ci.yml
View file @ 7c8a5432
This diff is collapsed.
Makefile.am
View file @ 7c8a5432
......@@ -9,42 +9,45 @@ AM_LDFLAGS = $(SCALAPACK_LDFLAGS)
lib_LTLIBRARIES = libelpa@SUFFIX@.la
libelpa@SUFFIX@_la_LINK = $(FCLINK) $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
libelpa@SUFFIX@_la_SOURCES = src/mod_precision.f90 \
src/mod_mpi.F90 \
src/mod_mpi_stubs.F90 \
src/elpa2_kernels/mod_fortran_interfaces.F90 \
src/elpa_utilities.F90 \
src/elpa1_compute.F90 \
src/elpa1.F90 \
src/elpa2_utilities.F90 \
src/mod_pack_unpack_real.F90 \
src/elpa2_kernels/mod_single_hh_trafo_real.F90 \
src/mod_compute_hh_trafo_real.F90 \
src/mod_compute_hh_trafo_complex.F90 \
src/mod_pack_unpack_complex.F90 \
src/aligned_mem.F90 \
src/elpa2_compute.F90 \
src/elpa2.F90 \
src/elpa_c_interface.F90 \
src/elpa_qr/qr_utils.F90 \
src/elpa_qr/elpa_qrkernels.f90 \
src/elpa_qr/elpa_pdlarfb.F90 \
src/elpa_qr/elpa_pdgeqrf.F90
EXTRA_libelpa@SUFFIX@_la_DEPENDENCIES = src/elpa_reduce_add_vectors.X90 \
src/elpa_transpose_vectors.X90 \
src/redist_band.X90
libelpa@SUFFIX@_la_SOURCES = \
src/mod_precision.f90 \
src/mod_mpi.F90 \
src/mod_mpi_stubs.F90 \
src/elpa2_kernels/mod_fortran_interfaces.F90 \
src/elpa_utilities.F90 \
src/elpa1_compute.F90 \
src/elpa1.F90 \
src/elpa2_utilities.F90 \
src/mod_pack_unpack_real.F90 \
src/elpa2_kernels/mod_single_hh_trafo_real.F90 \
src/mod_compute_hh_trafo_real.F90 \
src/mod_compute_hh_trafo_complex.F90 \
src/mod_pack_unpack_complex.F90 \
src/aligned_mem.F90 \
src/elpa2_compute.F90 \
src/elpa2.F90 \
src/elpa_c_interface.F90 \
src/elpa_qr/qr_utils.F90 \
src/elpa_qr/elpa_qrkernels.f90 \
src/elpa_qr/elpa_pdlarfb.F90 \
src/elpa_qr/elpa_pdgeqrf.F90
EXTRA_libelpa@SUFFIX@_la_DEPENDENCIES = \
src/elpa_reduce_add_vectors.X90 \
src/elpa_transpose_vectors.X90 \
src/redist_band.X90
if HAVE_DETAILED_TIMINGS
libelpa@SUFFIX@_la_SOURCES += src/timer.F90 \
src/ftimings/ftimings.F90 \
src/ftimings/ftimings_type.F90 \
src/ftimings/ftimings_value.F90 \
src/ftimings/highwater_mark.c \
src/ftimings/resident_set_size.c \
src/ftimings/time.c \
src/ftimings/virtual_memory.c \
src/ftimings/papi.c
libelpa@SUFFIX@_la_SOURCES += \
src/timer.F90 \
src/ftimings/ftimings.F90 \
src/ftimings/ftimings_type.F90 \
src/ftimings/ftimings_value.F90 \
src/ftimings/highwater_mark.c \
src/ftimings/resident_set_size.c \
src/ftimings/time.c \
src/ftimings/virtual_memory.c \
src/ftimings/papi.c
endif
if !WITH_MPI
......@@ -126,12 +129,16 @@ if WITH_COMPLEX_AVX_BLOCK2_KERNEL
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_avx-avx2_2hv.c
endif
include generated_headers.am
BUILT_SOURCES = $(generated_headers)
# install any .mod files in the include/ dir
elpa_includedir = $(includedir)/elpa@SUFFIX@-@PACKAGE_VERSION@
nobase_elpa_include_HEADERS = $(wildcard modules/*)
nobase_elpa_include_HEADERS += elpa/elpa.h elpa/elpa_kernel_constants.h elpa/elpa_generated.h
man_MANS = man/solve_evp_real.3 \
dist_man_MANS = \
man/solve_evp_real.3 \
man/solve_evp_real_1stage.3 \
man/solve_evp_complex.3 \
man/solve_evp_complex_1stage.3 \
......@@ -225,7 +232,7 @@ endif
elpa1_test_real@SUFFIX@_SOURCES = test/fortran_test_programs/test_real.F90 $(shared_sources) $(redirect_sources)
elpa1_test_real@SUFFIX@_LDADD = $(build_lib)
EXTRA_elpa2_test_real@SUFFIX@_DEPENDENCIES = test/fortran_test_programs/elpa_test_programs_print_headers.X90
EXTRA_elpa1_test_real@SUFFIX@_DEPENDENCIES = test/fortran_test_programs/elpa_test_programs_print_headers.X90
elpa1_test_real_with_c@SUFFIX@_SOURCES = test/fortran_test_programs/test_real_with_c.F90 test/shared_sources/mod_from_c.F90 \
test/shared_sources/call_elpa1.c $(shared_sources) $(redirect_sources)
......@@ -297,62 +304,25 @@ check_SCRIPTS += \
elpa2_test_complex_c_version@SUFFIX@.sh
endif
TESTS = $(check_SCRIPTS)
elpa1_test_real@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa1_test_real@SUFFIX@ $$TEST_FLAGS' > elpa1_test_real@SUFFIX@.sh
chmod +x elpa1_test_real@SUFFIX@.sh
elpa1_test_real_with_c@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa1_test_real_with_c@SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_with_c@SUFFIX@.sh
chmod +x elpa1_test_real_with_c@SUFFIX@.sh
elpa2_test_real_c_version@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real_c_version@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_c_version@SUFFIX@.sh
chmod +x elpa2_test_real_c_version@SUFFIX@.sh
elpa2_test_complex_c_version@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_complex_c_version@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_c_version@SUFFIX@.sh
chmod +x elpa2_test_complex_c_version@SUFFIX@.sh
elpa1_test_real_c_version@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa1_test_real_c_version@SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_c_version@SUFFIX@.sh
chmod +x elpa1_test_real_c_version@SUFFIX@.sh
elpa1_test_complex_c_version@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa1_test_complex_c_version@SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex_c_version@SUFFIX@.sh
chmod +x elpa1_test_complex_c_version@SUFFIX@.sh
elpa2_test_real@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real@SUFFIX@.sh
chmod +x elpa2_test_real@SUFFIX@.sh
elpa2_test_real_default_kernel@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real_default_kernel@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_default_kernel@SUFFIX@.sh
chmod +x elpa2_test_real_default_kernel@SUFFIX@.sh
elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@' > elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@.sh
chmod +x elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@.sh
elpa2_test_real_choose_kernel_with_api@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real_choose_kernel_with_api@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_choose_kernel_with_api@SUFFIX@.sh
chmod +x elpa2_test_real_choose_kernel_with_api@SUFFIX@.sh
elpa1_test_complex@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa1_test_complex@SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex@SUFFIX@.sh
chmod +x elpa1_test_complex@SUFFIX@.sh
elpa2_test_complex@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_complex@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex@SUFFIX@.sh
chmod +x elpa2_test_complex@SUFFIX@.sh
# test scripts
if WITH_MPI
wrapper="mpiexec -n 2 "
else
wrapper=""
endif
TESTS = $(check_SCRIPTS)
%.sh: %
echo '$(wrapper)./$^ $$TEST_FLAGS' > $@
chmod +x $@
elpa2_test_complex_default_kernel@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_complex_default_kernel@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_default_kernel@SUFFIX@.sh
chmod +x elpa2_test_complex_default_kernel@SUFFIX@.sh
# this one does not want any arguments
elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@.sh:
echo '$(wrapper)./elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@' > $@
chmod +x $@
elpa2_test_complex_choose_kernel_with_api@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_complex_choose_kernel_with_api@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_choose_kernel_with_api@SUFFIX@.sh
chmod +x elpa2_test_complex_choose_kernel_with_api@SUFFIX@.sh
# Preprocessed files (just used for manual inspection)
elpa2_utilities.i: $(top_srcdir)/src/elpa2_utilities.F90
$(CPP) $(CPPFLAGS) -I$(top_builddir)/ -c $(top_srcdir)/src/elpa2_utilities.F90 -o $@
......@@ -382,13 +352,13 @@ CLEANFILES = \
clean-local:
-rm -rf modules/* .fortran_dependencies/*
-rm -rf $(generated_headers)
distclean-local:
-rm config-f90.h
-rm -rf ./src/elpa2_kernels/.deps
-rm -rf ./src/.deps
-rm -rf ./test/.deps
-rm -rf ./elpa/elpa_generated.h
-rmdir ./src/elpa2_kernels/
-rmdir ./src
-rmdir ./test
......@@ -404,13 +374,6 @@ EXTRA_DIST = \
src/elpa_transpose_vectors.X90 \
src/redist_band.X90
# Rules to re-generated the headers
elpa/elpa_generated.h: $(top_srcdir)/src/elpa_c_interface.F90
grep -h "^ *!c>" $^ | sed 's/^ *!c>//;' > $@ || { rm $@; exit 1; }
test/shared_sources/generated.h: $(wildcard $(top_srcdir)/test/shared_sources/*.F90)
grep -h "^ *!c>" $^ | sed 's/^ *!c>//;' > $@ || { rm $@; exit 1; }
LIBTOOL_DEPS = @LIBTOOL_DEPS@
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status libtool
......
configure.ac
View file @ 7c8a5432
......@@ -19,8 +19,6 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AM_SILENT_RULES([yes])
rm -rf config.h config-f90.h
# Set the libtool library version, see LIBRARY_INTERFACE
#
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
......@@ -879,26 +877,6 @@ AC_CONFIG_FILES([
AC_OUTPUT
if test -e config.h ; then
grep "^#define" config.h > config-f90.h
else
echo "Warning! No config.h was generated, check for errors and re-run configure!"
exit 1
fi
echo "Generating elpa/elpa_generated.h..."
mkdir -p elpa
grep -h "^ *!c>" $srcdir/src/elpa_c_interface.F90 | sed 's/^ *!c>//;' > elpa/elpa_generated.h || exit 1
echo "Generating Fortran interfaces for C kernels"
grep -h "^ *!f>" $srcdir/src/elpa2_kernels/*.c | sed 's/^ *!f>//;' > elpa/elpa_generated_fortran_interfaces.h || exit 1
#grep -h "^ *!f>" $srcdir/src/elpa2_kernels/*.cpp | sed 's/^ *!f>//;' >> elpa/elpa_generated_fortran_interfaces.h || exit 1
echo "Generating test/shared_sources/generated.h..."
mkdir -p test/shared_sources
grep -h "^ *!c>" $srcdir/test/shared_sources/*.F90 | sed 's/^ *!c>//;' > test/shared_sources/generated.h || exit 1
if test "${can_compile_avx}" = "no" ; then
# if test x"${want_avx}" = x"yes" ; then
AC_MSG_WARN([Could not compile AVX instructions])
......@@ -910,3 +888,4 @@ if test "${can_compile_avx2}" = "no" ; then
# fi
fi
make -f $srcdir/generated_headers.am generated-headers top_srcdir="$srcdir"
generated_headers.am 0 → 100644
View file @ 7c8a5432
define extract_interface
@echo "Generating $@...";
@grep -h "^ *$1" $^ | sed 's/^ *$1//;' > $@ || { rm $@; exit 1; }
endef
elpa test:
mkdir $@
test/shared_sources: | test
mkdir $@
config-f90.h: config.h
@echo "Generating $@...";
@grep "^#define" $^ > $@ || { rm $@; exit 1; }
elpa/elpa_generated.h: $(top_srcdir)/src/elpa_c_interface.F90 | elpa
$(call extract_interface,!c>)
test/shared_sources/generated.h: $(wildcard $(top_srcdir)/test/shared_sources/*.F90) | test/shared_sources
$(call extract_interface,!c>)
elpa/elpa_generated_fortran_interfaces.h: $(wildcard $(top_srcdir)/src/elpa2_kernels/*.c) | elpa
$(call extract_interface,!f>)
generated_headers= config-f90.h elpa/elpa_generated.h test/shared_sources/generated.h elpa/elpa_generated_fortran_interfaces.h
generated-headers: $(generated_headers)
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