Commit 0df144b1 authored by Andreas Marek's avatar Andreas Marek
Browse files

ELPA_devloment_version_qr: rename of files

parent ea970032
...@@ -90,8 +90,20 @@ B) Installing ELPA without the autotools procedure ...@@ -90,8 +90,20 @@ B) Installing ELPA without the autotools procedure
- the file elpa2.F90 uses preprocessor defines for the different kernels. - the file elpa2.F90 uses preprocessor defines for the different kernels.
you will have to do this by hand, if you do not use the autotools you will have to do this by hand, if you do not use the autotools
infrastructure. infrastructure.
- also the test programs now use preprocessor defines, discriminating
between version with and without OpenMP
- it is entirely possible that due to ever growing complexity of ELPA
in future releases the build procedure without autotools will not be
supported anymore
Thus, if you really want to use ELPA this way and not with the autotools
please ensure the following
- make yourself familiar with the preprocessor flags you will need
for your configuration of ELPA and define them in a file "config-f90.h"
- adapte the Makefile.example accordingly to your needs
Again, it is strongly encouraged to use the autotools build procedure!
How to use ELPA: How to use ELPA:
----------------- -----------------
......
...@@ -147,14 +147,14 @@ nobase_elpa_include_HEADERS = $(wildcard modules/*) ...@@ -147,14 +147,14 @@ nobase_elpa_include_HEADERS = $(wildcard modules/*)
# other files to distribute # other files to distribute
filesdir = $(datarootdir) filesdir = $(datarootdir)
files_DATA = \ files_DATA = \
test/read_real.f90 \ test/read_real.F90 \
test/read_real_gen.f90 \ test/read_real_gen.F90 \
test/test_complex2.F90 \ test/test_complex2.F90 \
test/test_complex.F90 \ test/test_complex.F90 \
test/test_complex_gen.f90 \ test/test_complex_gen.F90 \
test/test_real2.F90 \ test/test_real2.F90 \
test/test_real.F90 \ test/test_real.F90 \
test/test_real_gen.f90 test/test_real_gen.F90
# pkg-config stuff # pkg-config stuff
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
...@@ -166,8 +166,9 @@ build_lib = libelpa_mt.la ...@@ -166,8 +166,9 @@ build_lib = libelpa_mt.la
else else
build_lib = libelpa.la build_lib = libelpa.la
endif endif
noinst_bindir = $(abs_top_builddir)
noinst_bin_PROGRAMS = test_real test_real2 test_complex test_complex2 #bindir = $(abs_top_builddir)
bin_PROGRAMS = test_real test_real2 test_complex test_complex2
test_real_SOURCES = test/test_real.F90 test_real_SOURCES = test/test_real.F90
test_real_LDADD = $(build_lib) test_real_LDADD = $(build_lib)
......
...@@ -107,7 +107,7 @@ host_triplet = @host@ ...@@ -107,7 +107,7 @@ host_triplet = @host@
@WITH_AVX_REAL_BLOCK4_TRUE@@WITH_OPENMP_FALSE@am__append_22 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c @WITH_AVX_REAL_BLOCK4_TRUE@@WITH_OPENMP_FALSE@am__append_22 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c
@WITH_AVX_REAL_BLOCK6_TRUE@@WITH_OPENMP_TRUE@am__append_23 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c @WITH_AVX_REAL_BLOCK6_TRUE@@WITH_OPENMP_TRUE@am__append_23 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
@WITH_AVX_REAL_BLOCK6_TRUE@@WITH_OPENMP_FALSE@am__append_24 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c @WITH_AVX_REAL_BLOCK6_TRUE@@WITH_OPENMP_FALSE@am__append_24 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
noinst_bin_PROGRAMS = test_real$(EXEEXT) test_real2$(EXEEXT) \ bin_PROGRAMS = test_real$(EXEEXT) test_real2$(EXEEXT) \
test_complex$(EXEEXT) test_complex2$(EXEEXT) test_complex$(EXEEXT) test_complex2$(EXEEXT)
subdir = . subdir = .
DIST_COMMON = README $(am__configure_deps) \ DIST_COMMON = README $(am__configure_deps) \
...@@ -156,7 +156,7 @@ am__uninstall_files_from_dir = { \ ...@@ -156,7 +156,7 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \ $(am__cd) "$$dir" && rm -f $$files; }; \
} }
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(noinst_bindir)" \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(elpa_includedir)" "$(DESTDIR)$(elpa_includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES) LTLIBRARIES = $(lib_LTLIBRARIES)
...@@ -253,7 +253,7 @@ libelpa_mt_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ ...@@ -253,7 +253,7 @@ libelpa_mt_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(libelpa_mt_la_LDFLAGS) $(LDFLAGS) -o $@ $(CXXFLAGS) $(libelpa_mt_la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_OPENMP_TRUE@am_libelpa_mt_la_rpath = -rpath $(libdir) @WITH_OPENMP_TRUE@am_libelpa_mt_la_rpath = -rpath $(libdir)
PROGRAMS = $(noinst_bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
am_test_complex_OBJECTS = test/test_complex.$(OBJEXT) am_test_complex_OBJECTS = test/test_complex.$(OBJEXT)
test_complex_OBJECTS = $(am_test_complex_OBJECTS) test_complex_OBJECTS = $(am_test_complex_OBJECTS)
test_complex_DEPENDENCIES = $(build_lib) test_complex_DEPENDENCIES = $(build_lib)
...@@ -511,14 +511,14 @@ nobase_elpa_include_HEADERS = $(wildcard modules/*) ...@@ -511,14 +511,14 @@ nobase_elpa_include_HEADERS = $(wildcard modules/*)
# other files to distribute # other files to distribute
filesdir = $(datarootdir) filesdir = $(datarootdir)
files_DATA = \ files_DATA = \
test/read_real.f90 \ test/read_real.F90 \
test/read_real_gen.f90 \ test/read_real_gen.F90 \
test/test_complex2.F90 \ test/test_complex2.F90 \
test/test_complex.F90 \ test/test_complex.F90 \
test/test_complex_gen.f90 \ test/test_complex_gen.F90 \
test/test_real2.F90 \ test/test_real2.F90 \
test/test_real.F90 \ test/test_real.F90 \
test/test_real_gen.f90 test/test_real_gen.F90
# pkg-config stuff # pkg-config stuff
...@@ -528,7 +528,6 @@ pkgconfig_DATA = elpa.pc ...@@ -528,7 +528,6 @@ pkgconfig_DATA = elpa.pc
# test programs # test programs
@WITH_OPENMP_TRUE@build_lib = libelpa_mt.la @WITH_OPENMP_TRUE@build_lib = libelpa_mt.la
noinst_bindir = $(abs_top_builddir)
test_real_SOURCES = test/test_real.F90 test_real_SOURCES = test/test_real.F90
test_real_LDADD = $(build_lib) test_real_LDADD = $(build_lib)
test_real2_SOURCES = test/test_real2.F90 test_real2_SOURCES = test/test_real2.F90
...@@ -684,12 +683,12 @@ libelpa.la: $(libelpa_la_OBJECTS) $(libelpa_la_DEPENDENCIES) $(EXTRA_libelpa_la_ ...@@ -684,12 +683,12 @@ libelpa.la: $(libelpa_la_OBJECTS) $(libelpa_la_DEPENDENCIES) $(EXTRA_libelpa_la_
$(libelpa_la_LINK) $(am_libelpa_la_rpath) $(libelpa_la_OBJECTS) $(libelpa_la_LIBADD) $(LIBS) $(libelpa_la_LINK) $(am_libelpa_la_rpath) $(libelpa_la_OBJECTS) $(libelpa_la_LIBADD) $(LIBS)
libelpa_mt.la: $(libelpa_mt_la_OBJECTS) $(libelpa_mt_la_DEPENDENCIES) $(EXTRA_libelpa_mt_la_DEPENDENCIES) libelpa_mt.la: $(libelpa_mt_la_OBJECTS) $(libelpa_mt_la_DEPENDENCIES) $(EXTRA_libelpa_mt_la_DEPENDENCIES)
$(libelpa_mt_la_LINK) $(am_libelpa_mt_la_rpath) $(libelpa_mt_la_OBJECTS) $(libelpa_mt_la_LIBADD) $(LIBS) $(libelpa_mt_la_LINK) $(am_libelpa_mt_la_rpath) $(libelpa_mt_la_OBJECTS) $(libelpa_mt_la_LIBADD) $(LIBS)
install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS) install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
@list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
if test -n "$$list"; then \ if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(noinst_bindir)'"; \ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
$(MKDIR_P) "$(DESTDIR)$(noinst_bindir)" || exit 1; \ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
fi; \ fi; \
for p in $$list; do echo "$$p $$p"; done | \ for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \ sed 's/$(EXEEXT)$$//' | \
...@@ -707,23 +706,23 @@ install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS) ...@@ -707,23 +706,23 @@ install-noinst_binPROGRAMS: $(noinst_bin_PROGRAMS)
while read type dir files; do \ while read type dir files; do \
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
test -z "$$files" || { \ test -z "$$files" || { \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(noinst_bindir)$$dir'"; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(noinst_bindir)$$dir" || exit $$?; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
} \ } \
; done ; done
uninstall-noinst_binPROGRAMS: uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(noinst_bin_PROGRAMS)'; test -n "$(noinst_bindir)" || list=; \ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
files=`for p in $$list; do echo "$$p"; done | \ files=`for p in $$list; do echo "$$p"; done | \
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-e 's/$$/$(EXEEXT)/' `; \ -e 's/$$/$(EXEEXT)/' `; \
test -n "$$list" || exit 0; \ test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(noinst_bindir)' && rm -f" $$files ")"; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(noinst_bindir)" && rm -f $$files cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-noinst_binPROGRAMS: clean-binPROGRAMS:
@list='$(noinst_bin_PROGRAMS)'; test -n "$$list" || exit 0; \ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \ echo " rm -f" $$list; \
rm -f $$list || exit $$?; \ rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \ test -n "$(EXEEXT)" || exit 0; \
...@@ -1284,8 +1283,10 @@ check-am: all-am ...@@ -1284,8 +1283,10 @@ check-am: all-am
check: check-am check: check-am
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \
config.h config.h
install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(noinst_bindir)" "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(elpa_includedir)"; do \ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(elpa_includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done done
install: install-am install: install-am
...@@ -1327,8 +1328,8 @@ maintainer-clean-generic: ...@@ -1327,8 +1328,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
clean: clean-am clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
clean-noinst_binPROGRAMS mostlyclean-am clean-libtool mostlyclean-am
distclean: distclean-am distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f $(am__CONFIG_DISTCLEAN_FILES)
...@@ -1350,13 +1351,13 @@ info: info-am ...@@ -1350,13 +1351,13 @@ info: info-am
info-am: info-am:
install-data-am: install-filesDATA install-nobase_elpa_includeHEADERS \ install-data-am: install-filesDATA install-nobase_elpa_includeHEADERS \
install-noinst_binPROGRAMS install-pkgconfigDATA install-pkgconfigDATA
install-dvi: install-dvi-am install-dvi: install-dvi-am
install-dvi-am: install-dvi-am:
install-exec-am: install-libLTLIBRARIES install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
install-html: install-html-am install-html: install-html-am
...@@ -1398,33 +1399,33 @@ ps: ps-am ...@@ -1398,33 +1399,33 @@ ps: ps-am
ps-am: ps-am:
uninstall-am: uninstall-filesDATA uninstall-libLTLIBRARIES \ uninstall-am: uninstall-binPROGRAMS uninstall-filesDATA \
uninstall-nobase_elpa_includeHEADERS \ uninstall-libLTLIBRARIES uninstall-nobase_elpa_includeHEADERS \
uninstall-noinst_binPROGRAMS uninstall-pkgconfigDATA uninstall-pkgconfigDATA
.MAKE: all check-am install-am install-strip .MAKE: all check-am install-am install-strip
.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
clean clean-cscope clean-generic clean-libLTLIBRARIES \ clean clean-binPROGRAMS clean-cscope clean-generic \
clean-libtool clean-noinst_binPROGRAMS cscope cscopelist ctags \ clean-libLTLIBRARIES clean-libtool cscope cscopelist ctags \
dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \ dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \
dist-tarZ dist-xz dist-zip distcheck distclean \ dist-tarZ dist-xz dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \ distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \ distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \ distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \ install install-am install-binPROGRAMS install-data \
install-dvi-am install-exec install-exec-am install-filesDATA \ install-data-am install-dvi install-dvi-am install-exec \
install-html install-html-am install-info install-info-am \ install-exec-am install-filesDATA install-html install-html-am \
install-libLTLIBRARIES install-man \ install-info install-info-am install-libLTLIBRARIES \
install-nobase_elpa_includeHEADERS install-noinst_binPROGRAMS \ install-man install-nobase_elpa_includeHEADERS install-pdf \
install-pdf install-pdf-am install-pkgconfigDATA install-ps \ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
install-ps-am install-strip installcheck installcheck-am \ install-strip installcheck installcheck-am installdirs \
installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-am uninstall-filesDATA uninstall-libLTLIBRARIES \ uninstall-binPROGRAMS uninstall-filesDATA \
uninstall-nobase_elpa_includeHEADERS \ uninstall-libLTLIBRARIES uninstall-nobase_elpa_includeHEADERS \
uninstall-noinst_binPROGRAMS uninstall-pkgconfigDATA uninstall-pkgconfigDATA
test_real.sh: test_real.sh:
......
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