Commit a049abdf authored by Andreas Marek's avatar Andreas Marek

Merge branch 'master' into ELPA_GPU

parents e9b94af0 716b7f7f
This diff is collapsed.
...@@ -103,11 +103,11 @@ It this is not desired, it is possible to build *ELPA* with only one (not necess ...@@ -103,11 +103,11 @@ It this is not desired, it is possible to build *ELPA* with only one (not necess
real and complex valued case, respectively. This can be done with the "--with-real-..-kernel-only" and real and complex valued case, respectively. This can be done with the "--with-real-..-kernel-only" and
"--with-complex-..-kernel-only" configure options. For details please do a "configure --help" "--with-complex-..-kernel-only" configure options. For details please do a "configure --help"
### Non MPI one node shared-memory version of ELPA ### ### No MPI, one node shared-memory version of ELPA ###
Since release 2016.05.001 it is possible to build *ELPA* without any MPI support. This version can be used Since release 2016.05.001 it is possible to build *ELPA* without any MPI support. This version can be used
by applications, which do not have any MPI parallelisation. To set this version, use the by applications, which do not have any MPI parallelisation. To set this version, use the
"--enable-shared-memory-only" configure flag. It is strongly recommmended to also set the "--enable-openmp" "--with-mpi=0" configure flag. It is strongly recommmended to also set the "--enable-openmp"
option, otherwise no parallelisation whatsoever will be present. option, otherwise no parallelisation whatsoever will be present.
### Doxygen documentation ### ### Doxygen documentation ###
......
...@@ -44,15 +44,16 @@ EXTRA_libelpa@SUFFIX@_la_DEPENDENCIES = src/elpa_reduce_add_vectors.X90 \ ...@@ -44,15 +44,16 @@ EXTRA_libelpa@SUFFIX@_la_DEPENDENCIES = src/elpa_reduce_add_vectors.X90 \
src/elpa2_compute_complex_template.X90 src/elpa2_compute_complex_template.X90
if HAVE_DETAILED_TIMINGS if HAVE_DETAILED_TIMINGS
libelpa@SUFFIX@_la_SOURCES += src/timer.F90 \ libelpa@SUFFIX@_la_SOURCES += \
src/ftimings/ftimings.F90 \ src/timer.F90 \
src/ftimings/ftimings_type.F90 \ src/ftimings/ftimings.F90 \
src/ftimings/ftimings_value.F90 \ src/ftimings/ftimings_type.F90 \
src/ftimings/highwater_mark.c \ src/ftimings/ftimings_value.F90 \
src/ftimings/resident_set_size.c \ src/ftimings/highwater_mark.c \
src/ftimings/time.c \ src/ftimings/resident_set_size.c \
src/ftimings/virtual_memory.c \ src/ftimings/time.c \
src/ftimings/papi.c src/ftimings/virtual_memory.c \
src/ftimings/papi.c
endif endif
if WITH_GPU_VERSION if WITH_GPU_VERSION
...@@ -185,7 +186,8 @@ elpa_includedir = $(includedir)/elpa@SUFFIX@-@PACKAGE_VERSION@ ...@@ -185,7 +186,8 @@ elpa_includedir = $(includedir)/elpa@SUFFIX@-@PACKAGE_VERSION@
nobase_elpa_include_HEADERS = $(wildcard modules/*) nobase_elpa_include_HEADERS = $(wildcard modules/*)
nobase_elpa_include_HEADERS += elpa/elpa.h elpa/elpa_kernel_constants.h elpa/elpa_generated.h 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_double.3 \ man/solve_evp_real_1stage_double.3 \
man/solve_evp_complex.3 \ man/solve_evp_complex.3 \
man/solve_evp_complex_1stage_double.3 \ man/solve_evp_complex_1stage_double.3 \
...@@ -197,13 +199,13 @@ man_MANS = man/solve_evp_real.3 \ ...@@ -197,13 +199,13 @@ man_MANS = man/solve_evp_real.3 \
if WANT_SINGLE_PRECISION_REAL if WANT_SINGLE_PRECISION_REAL
man_MANS += man/solve_evp_real_1stage_single.3 \ dist_man_MANS += man/solve_evp_real_1stage_single.3 \
man/solve_evp_real_2stage_single.3 man/solve_evp_real_2stage_single.3
endif endif
if WANT_SINGLE_PRECISION_COMPLEX if WANT_SINGLE_PRECISION_COMPLEX
man_MANS += man/solve_evp_complex_1stage_single.3 \ dist_man_MANS += man/solve_evp_complex_1stage_single.3 \
man/solve_evp_complex_2stage_single.3 man/solve_evp_complex_2stage_single.3
endif endif
...@@ -366,7 +368,7 @@ endif ...@@ -366,7 +368,7 @@ endif
elpa1_test_real@SUFFIX@_SOURCES = test/fortran_test_programs/test_real.F90 $(shared_sources) $(redirect_sources) elpa1_test_real@SUFFIX@_SOURCES = test/fortran_test_programs/test_real.F90 $(shared_sources) $(redirect_sources)
elpa1_test_real@SUFFIX@_LDADD = $(build_lib) 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_complex_with_c@SUFFIX@_SOURCES = test/fortran_test_programs/test_complex_with_c.F90 test/shared_sources/mod_from_c.F90 test/shared_sources/call_elpa1.c $(shared_sources) $(redirect_sources) #elpa1_test_complex_with_c@SUFFIX@_SOURCES = test/fortran_test_programs/test_complex_with_c.F90 test/shared_sources/mod_from_c.F90 test/shared_sources/call_elpa1.c $(shared_sources) $(redirect_sources)
#elpa1_test_complex_with_c@SUFFIX@_LDADD = $(build_lib) #elpa1_test_complex_with_c@SUFFIX@_LDADD = $(build_lib)
...@@ -531,254 +533,23 @@ endif ...@@ -531,254 +533,23 @@ endif
endif endif
TESTS = $(check_SCRIPTS) # test scripts
if WITH_MPI if WITH_MPI
elpa1_test_real@SUFFIX@.sh: wrapper="mpiexec -n 2 "
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
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
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
if WANT_SINGLE_PRECISION_REAL
elpa1_test_real_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa1_test_real_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_single_precision@SUFFIX@.sh
chmod +x elpa1_test_real_single_precision@SUFFIX@.sh
elpa2_test_real_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_single_precision@SUFFIX@.sh
chmod +x elpa2_test_real_single_precision@SUFFIX@.sh
elpa2_test_real_default_kernel_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real_default_kernel_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_default_kernel_single_precision@SUFFIX@.sh
chmod +x elpa2_test_real_default_kernel_single_precision@SUFFIX@.sh
elpa2_test_real_default_kernel_qr_decomposition_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real_default_kernel_qr_decomposition_single_precision@SUFFIX@' > elpa2_test_real_default_kernel_qr_decomposition_single_precision@SUFFIX@.sh
chmod +x elpa2_test_real_default_kernel_qr_decomposition_single_precision@SUFFIX@.sh
elpa2_test_real_choose_kernel_with_api_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real_choose_kernel_with_api_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_choose_kernel_with_api_single_precision@SUFFIX@.sh
chmod +x elpa2_test_real_choose_kernel_with_api_single_precision@SUFFIX@.sh
endif
if WANT_SINGLE_PRECISION_COMPLEX
elpa1_test_complex_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa1_test_complex_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex_single_precision@SUFFIX@.sh
chmod +x elpa1_test_complex_single_precision@SUFFIX@.sh
elpa2_test_complex_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_complex_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_single_precision@SUFFIX@.sh
chmod +x elpa2_test_complex_single_precision@SUFFIX@.sh
elpa2_test_complex_default_kernel_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_complex_default_kernel_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_default_kernel_single_precision@SUFFIX@.sh
chmod +x elpa2_test_complex_default_kernel_single_precision@SUFFIX@.sh
elpa2_test_complex_choose_kernel_with_api_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_complex_choose_kernel_with_api_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_choose_kernel_with_api_single_precision@SUFFIX@.sh
chmod +x elpa2_test_complex_choose_kernel_with_api_single_precision@SUFFIX@.sh
endif
if WITH_GPU_VERSION
elpa2_test_real_gpu_version@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real_gpu_version@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_gpu_version@SUFFIX@.sh
chmod +x elpa2_test_real_gpu_version@SUFFIX@.sh
elpa2_test_complex_gpu_version@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_complex_gpu_version@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_gpu_version@SUFFIX@.sh
chmod +x elpa2_test_complex_gpu_version@SUFFIX@.sh
if WANT_SINGLE_PRECISION_REAL
elpa2_test_real_gpu_version_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_real_gpu_version_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_gpu_version_single_precision@SUFFIX@.sh
chmod +x elpa2_test_real_gpu_version_single_precision@SUFFIX@.sh
endif
if WANT_SINGLE_PRECISION_COMPLEX
elpa2_test_complex_gpu_version_single_precision@SUFFIX@.sh:
echo 'mpiexec -n 2 ./elpa2_test_complex_gpu_version_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_gpu_version_single_precision@SUFFIX@.sh
chmod +x elpa2_test_complex_gpu_version_single_precision@SUFFIX@.sh
endif
# GPU_VERSION
endif
else else
# build tests without mpi support wrapper=""
elpa1_test_real@SUFFIX@.sh:
echo './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 './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 './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 './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 './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 './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 './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 './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 './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 './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 './elpa1_test_complex@SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex@SUFFIX@.sh
chmod +x elpa1_test_complex@SUFFIX@.sh
elpa2_test_complex@SUFFIX@.sh:
echo './elpa2_test_complex@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex@SUFFIX@.sh
chmod +x elpa2_test_complex@SUFFIX@.sh
elpa2_test_complex_default_kernel@SUFFIX@.sh:
echo './elpa2_test_complex_default_kernel@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_default_kernel@SUFFIX@.sh
chmod +x elpa2_test_complex_default_kernel@SUFFIX@.sh
elpa2_test_complex_choose_kernel_with_api@SUFFIX@.sh:
echo './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
if WANT_SINGLE_PRECISION_REAL
elpa1_test_real_single_precision@SUFFIX@.sh:
echo './elpa1_test_real_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_single_precision@SUFFIX@.sh
chmod +x elpa1_test_real_single_precision@SUFFIX@.sh
elpa2_test_real_single_precision@SUFFIX@.sh:
echo './elpa2_test_real_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_single_precision@SUFFIX@.sh
chmod +x elpa2_test_real_single_precision@SUFFIX@.sh
elpa2_test_real_default_kernel_single_precision@SUFFIX@.sh:
echo './elpa2_test_real_default_kernel_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_default_kernel_single_precision@SUFFIX@.sh
chmod +x elpa2_test_real_default_kernel_single_precision@SUFFIX@.sh
elpa2_test_real_default_kernel_qr_decomposition_single_precision@SUFFIX@.sh:
echo './elpa2_test_real_default_kernel_qr_decomposition_single_precision@SUFFIX@' > elpa2_test_real_default_kernel_qr_decomposition_single_precision@SUFFIX@.sh
chmod +x elpa2_test_real_default_kernel_qr_decomposition_single_precision@SUFFIX@.sh
elpa2_test_real_choose_kernel_with_api_single_precision@SUFFIX@.sh:
echo './elpa2_test_real_choose_kernel_with_api_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_choose_kernel_with_api_single_precision@SUFFIX@.sh
chmod +x elpa2_test_real_choose_kernel_with_api_single_precision@SUFFIX@.sh
endif endif
TESTS = $(check_SCRIPTS)
%.sh: %
echo '$(wrapper)./$^ $$TEST_FLAGS' > $@
chmod +x $@
if WANT_SINGLE_PRECISION_COMPLEX # this one does not want any arguments
elpa1_test_complex_single_precision@SUFFIX@.sh: elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@.sh:
echo './elpa1_test_complex_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex_single_precision@SUFFIX@.sh echo '$(wrapper)./elpa2_test_real_default_kernel_qr_decomposition@SUFFIX@' > $@
chmod +x elpa1_test_complex_single_precision@SUFFIX@.sh chmod +x $@
elpa2_test_complex_single_precision@SUFFIX@.sh:
echo './elpa2_test_complex_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_single_precision@SUFFIX@.sh
chmod +x elpa2_test_complex_single_precision@SUFFIX@.sh
elpa2_test_complex_default_kernel_single_precision@SUFFIX@.sh:
echo './elpa2_test_complex_default_kernel_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_default_kernel_single_precision@SUFFIX@.sh
chmod +x elpa2_test_complex_default_kernel_single_precision@SUFFIX@.sh
elpa2_test_complex_choose_kernel_with_api_single_precision@SUFFIX@.sh:
echo './elpa2_test_complex_choose_kernel_with_api_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_choose_kernel_with_api_single_precision@SUFFIX@.sh
chmod +x elpa2_test_complex_choose_kernel_with_api_single_precision@SUFFIX@.sh
endif
if WITH_GPU_VERSION
elpa2_test_real_gpu_version@SUFFIX@.sh:
echo './elpa2_test_real_gpu_version@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_gpu_version@SUFFIX@.sh
chmod +x elpa2_test_real_gpu_version@SUFFIX@.sh
elpa2_test_complex_gpu_version@SUFFIX@.sh:
echo './elpa2_test_complex_gpu_version@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_gpu_version@SUFFIX@.sh
chmod +x elpa2_test_complex_gpu_version@SUFFIX@.sh
if WANT_SINGLE_PRECISION_REAL
elpa2_test_real_gpu_version_single_precision@SUFFIX@.sh:
echo './elpa2_test_real_gpu_version_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_gpu_version_single_precision@SUFFIX@.sh
chmod +x elpa2_test_real_gpu_version_single_precision@SUFFIX@.sh
endif
if WANT_SINGLE_PRECISION_COMPLEX
elpa2_test_complex_gpu_version_single_precision@SUFFIX@.sh:
echo './elpa2_test_complex_gpu_version_single_precision@SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_gpu_version_single_precision@SUFFIX@.sh
chmod +x elpa2_test_complex_gpu_version_single_precision@SUFFIX@.sh
endif
# GPU_VERSION
endif
# use mpi
endif
# Preprocessed files (just used for manual inspection)
mod_precision.i: $(top_srcdir)/src/mod_precision.F90 mod_precision.i: $(top_srcdir)/src/mod_precision.F90
$(CPP) $(CPPFLAGS) -I$(top_builddir)/ -I$(top_srcdir)/ -c $(top_srcdir)/src/mod_precision.F90 -o $@ $(CPP) $(CPPFLAGS) -I$(top_builddir)/ -I$(top_srcdir)/ -c $(top_srcdir)/src/mod_precision.F90 -o $@
...@@ -828,6 +599,8 @@ cuUtils.i: $(top_srcdir)/src/cuUtils.cu ...@@ -828,6 +599,8 @@ cuUtils.i: $(top_srcdir)/src/cuUtils.cu
$(CPP) $(CPPFLAGS) -I$(top_builddir)/ -c $(top_srcdir)/src/cuUtils.cu -o $@ $(CPP) $(CPPFLAGS) -I$(top_builddir)/ -c $(top_srcdir)/src/cuUtils.cu -o $@
include doxygen.am include doxygen.am
include generated_headers.am
BUILT_SOURCES = $(generated_headers)
CLEANFILES = \ CLEANFILES = \
elpa1_test* \ elpa1_test* \
...@@ -836,13 +609,13 @@ CLEANFILES = \ ...@@ -836,13 +609,13 @@ CLEANFILES = \
clean-local: clean-local:
-rm -rf modules/* .fortran_dependencies/* -rm -rf modules/* .fortran_dependencies/*
-rm -rf $(generated_headers)
distclean-local: distclean-local:
-rm config-f90.h -rm config-f90.h
-rm -rf ./src/elpa2_kernels/.deps -rm -rf ./src/elpa2_kernels/.deps
-rm -rf ./src/.deps -rm -rf ./src/.deps
-rm -rf ./test/.deps -rm -rf ./test/.deps
-rm -rf ./elpa/elpa_generated.h
-rmdir ./src/elpa2_kernels/ -rmdir ./src/elpa2_kernels/
-rmdir ./src -rmdir ./src
-rmdir ./test -rmdir ./test
...@@ -866,7 +639,8 @@ EXTRA_DIST = \ ...@@ -866,7 +639,8 @@ EXTRA_DIST = \
src/ev_tridi_band_gpu_c_v2_real_template.Xcu \ src/ev_tridi_band_gpu_c_v2_real_template.Xcu \
src/cuUtils_complex_template.Xcu \ src/cuUtils_complex_template.Xcu \
src/cuUtils_real_template.Xcu \ src/cuUtils_real_template.Xcu \
nvcc_wrap nvcc_wrap \
elpa.spec
# Rules to re-generated the headers # Rules to re-generated the headers
elpa/elpa_generated.h: $(top_srcdir)/src/elpa_c_interface.F90 elpa/elpa_generated.h: $(top_srcdir)/src/elpa_c_interface.F90
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
## Current Release ## ## Current Release ##
The current release is ELPA 2015.11.001 The current release is ELPA 2016.05.001
## About *ELPA* ## About *ELPA*
......
...@@ -85,7 +85,7 @@ please have a look at the man pages and/or the online documentation (see above) ...@@ -85,7 +85,7 @@ please have a look at the man pages and/or the online documentation (see above)
#### Shared-memory version of *ELPA* #### #### Shared-memory version of *ELPA* ####
If the *ELPA* library has been compiled with the configure option "--enable-shared-memory-only", If the *ELPA* library has been compiled with the configure option "--with-mpi=0",
no MPI will be used. no MPI will be used.
Still the **same** call sequence as in the MPI case can be used (see above). Still the **same** call sequence as in the MPI case can be used (see above).
......
AC_PREREQ([2.69]) AC_PREREQ([2.69])
# Remember to change the version also in elpa.spec
AC_INIT([elpa],[2016.05.001], [elpa-library@mpcdf.mpg.de]) AC_INIT([elpa],[2016.05.001], [elpa-library@mpcdf.mpg.de])
AC_SUBST([PACKAGE_VERSION]) AC_SUBST([PACKAGE_VERSION])
AC_CONFIG_SRCDIR([src/elpa1.F90]) AC_CONFIG_SRCDIR([src/elpa1.F90])
...@@ -19,8 +21,6 @@ AC_CONFIG_MACRO_DIR([m4]) ...@@ -19,8 +21,6 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
rm -rf config.h config-f90.h
# Set the libtool library version, see LIBRARY_INTERFACE # Set the libtool library version, see LIBRARY_INTERFACE
# #
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
...@@ -68,25 +68,21 @@ if test x"${enable_openmp}" = x"yes"; then ...@@ -68,25 +68,21 @@ if test x"${enable_openmp}" = x"yes"; then
AC_DEFINE([WITH_OPENMP], [1], [use OpenMP threading]) AC_DEFINE([WITH_OPENMP], [1], [use OpenMP threading])
fi fi
AC_MSG_CHECKING(whether --enable-shared-memory-only is specified) dnl mpi
AC_ARG_ENABLE([shared-memory-only], AC_ARG_WITH(mpi, [AS_HELP_STRING([--with-mpi=[[yes|no]]], [compile with MPI. Default: yes])],,[with_mpi=yes])
AS_HELP_STRING([--enable-shared-memory-only], AM_CONDITIONAL([WITH_MPI],[test x"with_mpi" = x"yes"])
[do not use MPI; ELPA will be build for one node shared-memory runs only]), if test x"${with_mpi}" = x"yes"; then
[], AC_DEFINE([WITH_MPI], [1], [use MPI])
[enable_shared_memory_only=no])
AC_MSG_RESULT([${enable_shared_memory_only}])
AM_CONDITIONAL([WITH_MPI],[test x"$enable_shared_memory_only" = x"no"])
if test x"${enable_shared_memory_only}" = x"no"; then
AC_DEFINE([WITH_MPI], [1], [use MPI])
fi fi
dnl check whether mpi compilers are available;
dnl if not abort since it is mandatory
# C # C
AC_LANG([C]) AC_LANG([C])
AX_PROG_CC_MPI([test x"$enable_shared_memory_only" = xno],[use_mpi=yes],[use_mpi=no]) AX_PROG_CC_MPI([test x"$with_mpi" = x"yes"],[found_mpi_c=yes],[found_mpi_c=no])
if test x"$with_mpi" = x"yes"; then
if test x"$found_mpi_c" = x"no"; then
AC_MSG_ERROR([Could not compile an MPI C program])
fi
fi
if test x"${enable_openmp}" = x"yes"; then if test x"${enable_openmp}" = x"yes"; then
AX_ELPA_OPENMP AX_ELPA_OPENMP
...@@ -111,7 +107,12 @@ AC_MSG_RESULT([${want_single_precision}]) ...@@ -111,7 +107,12 @@ AC_MSG_RESULT([${want_single_precision}])
AC_LANG([Fortran]) AC_LANG([Fortran])
m4_include([m4/ax_prog_fc_mpi.m4]) m4_include([m4/ax_prog_fc_mpi.m4])
AX_PROG_FC_MPI([test x"$enable_shared_memory_only" = xno],[use_mpi=yes],[use_mpi=no]) AX_PROG_FC_MPI([test x"$with_mpi" = x"yes"],[found_mpi_f=yes],[found_mpi_f=no])
if test x"$with_mpi" = x"yes"; then
if test x"$found_mpi_f" = x"no"; then
AC_MSG_ERROR([Could not compile an MPI Fortran program])
fi
fi
if test x"${enable_openmp}" = x"yes"; then if test x"${enable_openmp}" = x"yes"; then
AX_ELPA_OPENMP AX_ELPA_OPENMP
if test "$ac_cv_prog_fc_openmp" = unsupported; then if test "$ac_cv_prog_fc_openmp" = unsupported; then
...@@ -495,9 +496,9 @@ else ...@@ -495,9 +496,9 @@ else
AC_MSG_ERROR([could not link with lapack: specify path]) AC_MSG_ERROR([could not link with lapack: specify path])
fi fi
if test x"${enable_shared_memory_only}" = x"no"; then if test x"${with_mpi}" = x"yes"; then
dnl test whether scalapack already contains blacs dnl test whether scalapack already contains blacs
scalapack_libs="mpiscalapack scalapack" scalapack_libs="mpiscalapack scalapack scalapack-openmpi"
old_LIBS="$LIBS" old_LIBS="$LIBS"
for lib in ${scalapack_libs}; do for lib in ${scalapack_libs}; do
LIBS="-l${lib} ${old_LIBS}" LIBS="-l${lib} ${old_LIBS}"
...@@ -514,6 +515,12 @@ else ...@@ -514,6 +515,12 @@ else
dnl Test for stand-alone blacs dnl Test for stand-alone blacs
AC_SEARCH_LIBS([bi_f77_init],[mpiblacsF77init],[],[],[-lmpiblacs]) AC_SEARCH_LIBS([bi_f77_init],[mpiblacsF77init],[],[],[-lmpiblacs])
dnl for debian
AC_SEARCH_LIBS([blacs_gridinit],[blacs-openmpi],[have_blacs=yes],[have_blacs=no],[-lblacsCinit-openmpi -lscalapack-openmpi])
if test x"${have_blacs}" = x"no"; then
unset ac_cv_search_blacs_gridinit
fi
AC_SEARCH_LIBS([blacs_gridinit],[mpiblacs blacs],[have_blacs=yes],[have_blacs=no]) AC_SEARCH_LIBS([blacs_gridinit],[mpiblacs blacs],[have_blacs=yes],[have_blacs=no])
if test x"${have_blacs}" = x"no"; then if test x"${have_blacs}" = x"no"; then
...@@ -961,26 +968,6 @@ AC_CONFIG_FILES([ ...@@ -961,26 +968,6 @@ AC_CONFIG_FILES([
AC_OUTPUT 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 "${can_compile_avx}" = "no" ; then
# if test x"${want_avx}" = x"yes" ; then # if test x"${want_avx}" = x"yes" ; then
AC_MSG_WARN([Could not compile AVX instructions]) AC_MSG_WARN([Could not compile AVX instructions])
...@@ -995,3 +982,5 @@ fi ...@@ -995,3 +982,5 @@ fi
if test "${can_compile_sse}" = "no" ; then if test "${can_compile_sse}" = "no" ; then
AC_MSG_WARN([Could not compile SSE instructions]) AC_MSG_WARN([Could not compile SSE instructions])
fi fi
make -f $srcdir/generated_headers.am generated-headers top_srcdir="$srcdir"
#
# spec file for package elpa
#
# Copyright (c) 2015 Lorenz Hüdepohl
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
%define so_version 4
# OpenMP support requires an MPI implementation with MPI_THREAD_MULTIPLE support,
# which is only available for a sufficiently configured openmpi >= 1.8
# Set to 0 to disable
%define with_openmp 1
Name: elpa
Version: 2016.05.001
Release: 2
Summary: A massively parallel eigenvector solver
License: LGPL-3.0
Group: System/Libraries
Url: https://elpa.rzg.mpg.de/
Source0: https://elpa.mpcdf.mpg.de/html/Releases/%{version}/%{name}-%{version}.tar.gz
Requires: openmpi
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
BuildRequires: openmpi-devel
BuildRequires: blas
BuildRequires: blas-devel
BuildRequires: lapack
BuildRequires: lapack-devel
BuildRequires: pkg-config
%if %{defined fedora}
BuildRequires: scalapack-openmpi
BuildRequires: scalapack-openmpi-devel
BuildRequires: blacs-openmpi