Skip to content

GitLab

Commit c7228c45 authored by Andreas Marek's avatar Andreas Marek
Browse files
Options

Merge branch 'u/loh/master' of gitta:amarek/ELPA

parents b29d8110 cc703a4c
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 148 deletions
ELPA_2014.06/LIBRARY_INTERFACE 0 → 100644
View file @ c7228c45
Libtool interface number history (the "c" in [c:r:a] of
https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html).
- 0
Legacy interface number for all releases prior to 2014.06
- 1
Incompatible API change. Most subroutines were converted into functions
returning a success flag. Previously, the library called exit() on error
conditions.
The state of release 2014.06.001 defines this interface
ELPA_2014.06/Makefile.am
View file @ c7228c45
......@@ -6,94 +6,88 @@ AM_FCFLAGS = $(SCALAPACK_FCFLAGS) @FC_MODINC@modules @FC_MODOUT@modules
AM_LDFLAGS = $(SCALAPACK_LDFLAGS)
# libelpa
lib_LTLIBRARIES = libelpa@SUFFIX@-@PACKAGE_VERSION@.la
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LINK = $(FCLINK)
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
lib_LTLIBRARIES = libelpa@SUFFIX@.la
libelpa@SUFFIX@_la_LINK = $(FCLINK) $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
##rule to produce fortran config file:
#config_f90.h: ./config.h
# grep "^#define" ./config.h > $@
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES = src/elpa1.F90 src/elpa2.F90
libelpa@SUFFIX@_la_SOURCES = src/elpa1.F90 src/elpa2.F90
if WITH_REAL_GENERIC_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real.f90
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real.f90
endif
if WITH_COMPLEX_GENERIC_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex.f90
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex.f90
endif
if WITH_REAL_GENERIC_SIMPLE_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_simple.f90
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_simple.f90
endif
if WITH_COMPLEX_GENERIC_SIMPLE_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_simple.f90
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_simple.f90
endif
if WITH_REAL_BGP_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgp.f90
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgp.f90
endif
if WITH_REAL_BGQ_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgq.f90
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_bgq.f90
endif
if WITH_REAL_SSE_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
else
if WITH_COMPLEX_SSE_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_asm_x86_64.s
endif
endif
if WITH_REAL_AVX_BLOCK2_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c
endif
if WITH_REAL_AVX_BLOCK4_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_4hv.c
endif
if WITH_REAL_AVX_BLOCK6_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.c
endif
if WITH_COMPLEX_AVX_BLOCK1_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
endif
if WITH_COMPLEX_AVX_BLOCK2_KERNEL
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.cpp
libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.cpp
endif
#if WITH_AVX_SANDYBRIDGE
# libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
# libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
# src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
#endif
# install any .mod files in the include/ dir
elpa_includedir = $(includedir)/elpa-@PACKAGE_VERSION@
elpa_includedir = $(includedir)/elpa@SUFFIX@-@PACKAGE_VERSION@
nobase_elpa_include_HEADERS = $(wildcard modules/*)
# other files to distribute
filesdir = $(datadir)/@PACKAGE@-@PACKAGE_VERSION@/examples
filesdir = $(docdir)/examples
dist_files_DATA = \
test/read_real.F90 \
test/read_real_gen.F90 \
test/test_complex2.F90 \
test/test_complex2_default_kernel.F90 \
test/test_complex2_choose_kernel_with_api.F90 \
test/test_complex.F90 \
test/test_complex_gen.F90 \
test/test_real2.F90 \
test/test_real2_default_kernel.F90 \
test/test_real2_choose_kernel_with_api.F90 \
src/print_available_elpa2_kernels.F90 \
test/test_real.F90 \
test/test_real_gen.F90
test/read_real.F90 \
test/read_real_gen.F90 \
test/test_complex2.F90 \
test/test_complex2_default_kernel.F90 \
test/test_complex2_choose_kernel_with_api.F90 \
test/test_complex.F90 \
test/test_complex_gen.F90 \
test/test_real2.F90 \
test/test_real2_default_kernel.F90 \
test/test_real2_choose_kernel_with_api.F90 \
src/print_available_elpa2_kernels.F90 \
test/test_real.F90 \
test/test_real_gen.F90
dist_doc_DATA = README COPYING/COPYING COPYING/gpl.txt COPYING/lgpl.txt
......@@ -103,19 +97,19 @@ pkgconfig_DATA = @PKG_CONFIG_FILE@
# programs
bin_PROGRAMS = \
elpa1_test_real@SUFFIX@ \
elpa1_test_complex@SUFFIX@ \
elpa2_test_real@SUFFIX@ \
elpa2_test_complex@SUFFIX@ \
elpa2_print_kernels@SUFFIX@
elpa1_test_real@SUFFIX@ \
elpa1_test_complex@SUFFIX@ \
elpa2_test_real@SUFFIX@ \
elpa2_test_complex@SUFFIX@ \
elpa2_print_kernels@SUFFIX@
noinst_PROGRAMS = \
elpa2_test_real_default_kernel@SUFFIX@ \
elpa2_test_complex_default_kernel@SUFFIX@ \
elpa2_test_real_choose_kernel_with_api@SUFFIX@ \
elpa2_test_complex_choose_kernel_with_api@SUFFIX@
elpa2_test_real_default_kernel@SUFFIX@ \
elpa2_test_complex_default_kernel@SUFFIX@ \
elpa2_test_real_choose_kernel_with_api@SUFFIX@ \
elpa2_test_complex_choose_kernel_with_api@SUFFIX@
build_lib = libelpa@SUFFIX@-@PACKAGE_VERSION@.la
build_lib = libelpa@SUFFIX@.la
elpa1_test_real@SUFFIX@_SOURCES = test/test_real.F90 test/util.F90
elpa1_test_real@SUFFIX@_LDADD = $(build_lib)
......@@ -145,15 +139,15 @@ elpa2_print_kernels@SUFFIX@_SOURCES = src/print_available_elpa2_kernels.F90 test
elpa2_print_kernels@SUFFIX@_LDADD = $(build_lib)
check_SCRIPTS = \
elpa1_test_real.sh \
elpa2_test_real.sh \
elpa2_test_real_default_kernel.sh \
elpa1_test_complex.sh \
elpa2_test_complex.sh \
elpa2_test_complex_default_kernel.sh \
elpa2_test_real_choose_kernel_with_api.sh \
elpa2_test_complex_choose_kernel_with_api.sh \
elpa2_print_kernels@SUFFIX@
elpa1_test_real.sh \
elpa2_test_real.sh \
elpa2_test_real_default_kernel.sh \
elpa1_test_complex.sh \
elpa2_test_complex.sh \
elpa2_test_complex_default_kernel.sh \
elpa2_test_real_choose_kernel_with_api.sh \
elpa2_test_complex_choose_kernel_with_api.sh \
elpa2_print_kernels@SUFFIX@
TESTS = $(check_SCRIPTS)
......@@ -196,28 +190,28 @@ elpa1.i: $(top_srcdir)/src/elpa1.F90
$(CPP) $(CPPFLAGS) -I$(top_builddir)/ -c $(top_srcdir)/src/elpa1.F90 -o $@
CLEANFILES = \
elpa1_test_real.sh \
elpa1_test_complex.sh \
elpa2_test_real.sh \
elpa2_test_real_default_kernel.sh \
elpa2_test_complex.sh \
elpa2_test_complex_default_kernel.sh \
elpa2_test_real_choose_kernel_with_api.sh \
elpa2_test_complex_choose_kernel_with_api.sh \
*.i
elpa1_test_real.sh \
elpa1_test_complex.sh \
elpa2_test_real.sh \
elpa2_test_real_default_kernel.sh \
elpa2_test_complex.sh \
elpa2_test_complex_default_kernel.sh \
elpa2_test_real_choose_kernel_with_api.sh \
elpa2_test_complex_choose_kernel_with_api.sh \
*.i
clean-local:
-rm -rf modules/* .fortran_dependencies/*
distclean-local:
-rm config-f90.h
-rmdir ./src/elpa2_kernels/.deps
-rm -rf ./src/elpa2_kernels/.deps
-rm -rf ./src/.deps
-rm -rf ./test/.deps
-rmdir ./src/elpa2_kernels/
-rmdir ./src/.deps
-rmdir ./src/.deps
-rmdir ./src
-rmdir ./test/.deps
-rmdir ./test
-rmdir ./m4
-rmdir modules/
-rmdir .fortran_dependencies/
......@@ -234,9 +228,9 @@ libtool: $(LIBTOOL_DEPS)
# specify that the test programs need a finished library before
# one can compile them
# $1 Object name
# $1 Object name
define require_elpa_lib
$1: libelpa@SUFFIX@-@PACKAGE_VERSION@.la
$1: libelpa@SUFFIX@.la
endef
$(foreach p,$(bin_PROGRAMS) $(noinst_PROGRAMS),$(foreach o,$($p_OBJECTS),$(eval $(call require_elpa_lib,$o))))
ELPA_2014.06/Makefile.in
View file @ c7228c45
......@@ -158,9 +158,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(docdir)" "$(DESTDIR)$(filesdir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(elpa_includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LIBADD =
am__libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES_DIST = src/elpa1.F90 \
src/elpa2.F90 src/elpa2_kernels/elpa2_kernels_real.f90 \
libelpa@SUFFIX@_la_LIBADD =
am__libelpa@SUFFIX@_la_SOURCES_DIST = src/elpa1.F90 src/elpa2.F90 \
src/elpa2_kernels/elpa2_kernels_real.f90 \
src/elpa2_kernels/elpa2_kernels_complex.f90 \
src/elpa2_kernels/elpa2_kernels_real_simple.f90 \
src/elpa2_kernels/elpa2_kernels_complex_simple.f90 \
......@@ -186,14 +186,13 @@ am__dirstamp = $(am__leading_dot)dirstamp
@WITH_REAL_AVX_BLOCK6_KERNEL_TRUE@am__objects_11 = src/elpa2_kernels/elpa2_kernels_real_sse-avx_6hv.lo
@WITH_COMPLEX_AVX_BLOCK1_KERNEL_TRUE@am__objects_12 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.lo
@WITH_COMPLEX_AVX_BLOCK2_KERNEL_TRUE@am__objects_13 = src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.lo
am_libelpa@SUFFIX@_@PACKAGE_VERSION@_la_OBJECTS = src/elpa1.lo \
src/elpa2.lo $(am__objects_1) $(am__objects_2) \
$(am__objects_3) $(am__objects_4) $(am__objects_5) \
$(am__objects_6) $(am__objects_7) $(am__objects_8) \
$(am__objects_9) $(am__objects_10) $(am__objects_11) \
$(am__objects_12) $(am__objects_13)
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_OBJECTS = \
$(am_libelpa@SUFFIX@_@PACKAGE_VERSION@_la_OBJECTS)
am_libelpa@SUFFIX@_la_OBJECTS = src/elpa1.lo src/elpa2.lo \
$(am__objects_1) $(am__objects_2) $(am__objects_3) \
$(am__objects_4) $(am__objects_5) $(am__objects_6) \
$(am__objects_7) $(am__objects_8) $(am__objects_9) \
$(am__objects_10) $(am__objects_11) $(am__objects_12) \
$(am__objects_13)
libelpa@SUFFIX@_la_OBJECTS = $(am_libelpa@SUFFIX@_la_OBJECTS)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_elpa1_test_complex@SUFFIX@_OBJECTS = test/test_complex.$(OBJEXT) \
test/util.$(OBJEXT)
......@@ -334,7 +333,7 @@ AM_V_CCAS = $(am__v_CCAS_@AM_V@)
am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@)
am__v_CCAS_0 = @echo " CCAS " $@;
am__v_CCAS_1 =
SOURCES = $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES) \
SOURCES = $(libelpa@SUFFIX@_la_SOURCES) \
$(elpa1_test_complex@SUFFIX@_SOURCES) \
$(elpa1_test_real@SUFFIX@_SOURCES) \
$(elpa2_print_kernels@SUFFIX@_SOURCES) \
......@@ -344,8 +343,7 @@ SOURCES = $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES) \
$(elpa2_test_real@SUFFIX@_SOURCES) \
$(elpa2_test_real_choose_kernel_with_api@SUFFIX@_SOURCES) \
$(elpa2_test_real_default_kernel@SUFFIX@_SOURCES)
DIST_SOURCES = \
$(am__libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES_DIST) \
DIST_SOURCES = $(am__libelpa@SUFFIX@_la_SOURCES_DIST) \
$(elpa1_test_complex@SUFFIX@_SOURCES) \
$(elpa1_test_real@SUFFIX@_SOURCES) \
$(elpa2_print_kernels@SUFFIX@_SOURCES) \
......@@ -732,51 +730,47 @@ AM_FCFLAGS = $(SCALAPACK_FCFLAGS) @FC_MODINC@modules @FC_MODOUT@modules
AM_LDFLAGS = $(SCALAPACK_LDFLAGS)
# libelpa
lib_LTLIBRARIES = libelpa@SUFFIX@-@PACKAGE_VERSION@.la
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LINK = $(FCLINK)
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
#config_f90.h: ./config.h
# grep "^#define" ./config.h > $@
libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES = src/elpa1.F90 \
src/elpa2.F90 $(am__append_1) $(am__append_2) $(am__append_3) \
lib_LTLIBRARIES = libelpa@SUFFIX@.la
libelpa@SUFFIX@_la_LINK = $(FCLINK) $(AM_LDFLAGS) -version-info $(ELPA_SO_VERSION) -lstdc++
libelpa@SUFFIX@_la_SOURCES = src/elpa1.F90 src/elpa2.F90 \
$(am__append_1) $(am__append_2) $(am__append_3) \
$(am__append_4) $(am__append_5) $(am__append_6) \
$(am__append_7) $(am__append_8) $(am__append_9) \
$(am__append_10) $(am__append_11) $(am__append_12) \
$(am__append_13)
#if WITH_AVX_SANDYBRIDGE
# libelpa@SUFFIX@_@PACKAGE_VERSION@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
# libelpa@SUFFIX@_la_SOURCES += src/elpa2_kernels/elpa2_kernels_real_sse-avx_2hv.c \
# src/elpa2_kernels/elpa2_kernels_complex_sse-avx_1hv.cpp
#endif
# install any .mod files in the include/ dir
elpa_includedir = $(includedir)/elpa-@PACKAGE_VERSION@
elpa_includedir = $(includedir)/elpa@SUFFIX@-@PACKAGE_VERSION@
nobase_elpa_include_HEADERS = $(wildcard modules/*)
# other files to distribute
filesdir = $(datadir)/@PACKAGE@-@PACKAGE_VERSION@/examples
filesdir = $(docdir)/examples
dist_files_DATA = \
test/read_real.F90 \
test/read_real_gen.F90 \
test/test_complex2.F90 \
test/test_complex2_default_kernel.F90 \
test/test_complex2_choose_kernel_with_api.F90 \
test/test_complex.F90 \
test/test_complex_gen.F90 \
test/test_real2.F90 \
test/test_real2_default_kernel.F90 \
test/test_real2_choose_kernel_with_api.F90 \
src/print_available_elpa2_kernels.F90 \
test/test_real.F90 \
test/test_real_gen.F90
test/read_real.F90 \
test/read_real_gen.F90 \
test/test_complex2.F90 \
test/test_complex2_default_kernel.F90 \
test/test_complex2_choose_kernel_with_api.F90 \
test/test_complex.F90 \
test/test_complex_gen.F90 \
test/test_real2.F90 \
test/test_real2_default_kernel.F90 \
test/test_real2_choose_kernel_with_api.F90 \
src/print_available_elpa2_kernels.F90 \
test/test_real.F90 \
test/test_real_gen.F90
dist_doc_DATA = README COPYING/COPYING COPYING/gpl.txt COPYING/lgpl.txt
# pkg-config stuff
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = @PKG_CONFIG_FILE@
build_lib = libelpa@SUFFIX@-@PACKAGE_VERSION@.la
build_lib = libelpa@SUFFIX@.la
elpa1_test_real@SUFFIX@_SOURCES = test/test_real.F90 test/util.F90
elpa1_test_real@SUFFIX@_LDADD = $(build_lib)
elpa2_test_real@SUFFIX@_SOURCES = test/test_real2.F90 test/util.F90
......@@ -796,26 +790,26 @@ elpa2_test_complex_choose_kernel_with_api@SUFFIX@_LDADD = $(build_lib)
elpa2_print_kernels@SUFFIX@_SOURCES = src/print_available_elpa2_kernels.F90 test/util.F90
elpa2_print_kernels@SUFFIX@_LDADD = $(build_lib)
check_SCRIPTS = \
elpa1_test_real.sh \
elpa2_test_real.sh \
elpa2_test_real_default_kernel.sh \
elpa1_test_complex.sh \
elpa2_test_complex.sh \
elpa2_test_complex_default_kernel.sh \
elpa2_test_real_choose_kernel_with_api.sh \
elpa2_test_complex_choose_kernel_with_api.sh \
elpa2_print_kernels@SUFFIX@
elpa1_test_real.sh \
elpa2_test_real.sh \
elpa2_test_real_default_kernel.sh \
elpa1_test_complex.sh \
elpa2_test_complex.sh \
elpa2_test_complex_default_kernel.sh \
elpa2_test_real_choose_kernel_with_api.sh \
elpa2_test_complex_choose_kernel_with_api.sh \
elpa2_print_kernels@SUFFIX@
CLEANFILES = \
elpa1_test_real.sh \
elpa1_test_complex.sh \
elpa2_test_real.sh \
elpa2_test_real_default_kernel.sh \
elpa2_test_complex.sh \
elpa2_test_complex_default_kernel.sh \
elpa2_test_real_choose_kernel_with_api.sh \
elpa2_test_complex_choose_kernel_with_api.sh \
*.i
elpa1_test_real.sh \
elpa1_test_complex.sh \
elpa2_test_real.sh \
elpa2_test_real_default_kernel.sh \
elpa2_test_complex.sh \
elpa2_test_complex_default_kernel.sh \
elpa2_test_real_choose_kernel_with_api.sh \
elpa2_test_complex_choose_kernel_with_api.sh \
*.i
EXTRA_DIST = fdep/fortran_dependencies.pl fdep/fortran_dependencies.mk
LIBTOOL_DEPS = @LIBTOOL_DEPS@
......@@ -961,8 +955,8 @@ src/elpa2_kernels/elpa2_kernels_complex_sse-avx_2hv.lo: \
src/elpa2_kernels/$(am__dirstamp) \
src/elpa2_kernels/$(DEPDIR)/$(am__dirstamp)
libelpa@SUFFIX@-@PACKAGE_VERSION@.la: $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_OBJECTS) $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_DEPENDENCIES) $(EXTRA_libelpa@SUFFIX@_@PACKAGE_VERSION@_la_DEPENDENCIES)
$(AM_V_GEN)$(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LINK) -rpath $(libdir) $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_OBJECTS) $(libelpa@SUFFIX@_@PACKAGE_VERSION@_la_LIBADD) $(LIBS)
libelpa@SUFFIX@.la: $(libelpa@SUFFIX@_la_OBJECTS) $(libelpa@SUFFIX@_la_DEPENDENCIES) $(EXTRA_libelpa@SUFFIX@_la_DEPENDENCIES)
$(AM_V_GEN)$(libelpa@SUFFIX@_la_LINK) -rpath $(libdir) $(libelpa@SUFFIX@_la_OBJECTS) $(libelpa@SUFFIX@_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
......@@ -1914,13 +1908,13 @@ clean-local:
distclean-local:
-rm config-f90.h
-rmdir ./src/elpa2_kernels/.deps
-rm -rf ./src/elpa2_kernels/.deps
-rm -rf ./src/.deps
-rm -rf ./test/.deps
-rmdir ./src/elpa2_kernels/
-rmdir ./src/.deps
-rmdir ./src/.deps
-rmdir ./src
-rmdir ./test/.deps
-rmdir ./test
-rmdir ./m4
-rmdir modules/
-rmdir .fortran_dependencies/
libtool: $(LIBTOOL_DEPS)
......@@ -1932,9 +1926,9 @@ libtool: $(LIBTOOL_DEPS)
# specify that the test programs need a finished library before
# one can compile them
# $1 Object name
# $1 Object name
define require_elpa_lib
$1: libelpa@SUFFIX@-@PACKAGE_VERSION@.la
$1: libelpa@SUFFIX@.la
endef
$(foreach p,$(bin_PROGRAMS) $(noinst_PROGRAMS),$(foreach o,$($p_OBJECTS),$(eval $(call require_elpa_lib,$o))))
......
ELPA_2014.06/configure
View file @ c7228c45
......@@ -3151,10 +3151,22 @@ AM_BACKSLASH='\'
rm -rf config.h config-f90.h
# this is the version of the API, should be changed in the major revision
# if and only if the actual API changes
# see http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
ELPA_SO_VERSION=0:0:0
# Set the libtool library version, see LIBRARY_INTERFACE
#
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
#
# [c:r:a]
#
# c: The currently implement interface
# r: The revision number of the current interface, that is the number
# of released source-code changes for the current interface
# a: The "age" is the number of interfaces prior to c that are also supported
# by the current interface, as they are ABI compatible (e.g. only new symbols
# were added by the new interface)
#
ELPA_SO_VERSION=1:0:0
#
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
......
ELPA_2014.06/configure.ac
View file @ c7228c45
......@@ -22,10 +22,22 @@ AM_SILENT_RULES([yes])
rm -rf config.h config-f90.h
# this is the version of the API, should be changed in the major revision
# if and only if the actual API changes
# see http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST([ELPA_SO_VERSION], [0:0:0])
# Set the libtool library version, see LIBRARY_INTERFACE
#
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
#
# [c:r:a]
#
# c: The currently implement interface
# r: The revision number of the current interface, that is the number
# of released source-code changes for the current interface
# a: The "age" is the number of interfaces prior to c that are also supported
# by the current interface, as they are ABI compatible (e.g. only new symbols
# were added by the new interface)
#
AC_SUBST([ELPA_SO_VERSION], [1:0:0])
#
AX_CHECK_GNU_MAKE()
if test x$_cv_gnu_make_command = x ; then
......
ELPA_2014.06/elpa.pc.in
View file @ c7228c45
......@@ -7,6 +7,6 @@ Name: @PACKAGE_NAME@@SUFFIX@-@PACKAGE_VERSION@
Description: ELPA is a Fortran-based high-performance computational library for the (massively) parallel solution of symmetric or Hermitian, standard or generalized eigenvalue problems.
Version: @PACKAGE_VERSION@.@PACKAGE_MINOR_VERSION@
URL: @PACKAGE_URL@
Libs: -L${libdir} -lelpa@SUFFIX@-@PACKAGE_VERSION@ @LIBS@ @OPENMP_FCFLAGS@
Libs: -L${libdir} -lelpa@SUFFIX@ @LIBS@ @OPENMP_FCFLAGS@
Cflags: -I${includedir}/elpa@SUFFIX@-@PACKAGE_VERSION@ @OPENMP_CFLAGS@
fcflags= -I${includedir}/elpa@SUFFIX@-@PACKAGE_VERSION@/modules @OPENMP_FCFLAGS@
ELPA_2014.06/test_project/configure.ac
View file @ c7228c45
......@@ -39,8 +39,8 @@ AM_PROG_AS
# Here comes the ELPA specific part
PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([ELPA],[elpa-2014.06.000],[],[AC_MSG_ERROR(["Need elpa-2014.06.000"])])
PKG_CHECK_VAR([ELPA_FCFLAGS],[elpa-2014.06.000],[fcflags])
PKG_CHECK_MODULES([ELPA],[elpa-2014.06],[],[AC_MSG_ERROR(["Need elpa-2014.06"])])
PKG_CHECK_VAR([ELPA_FCFLAGS],[elpa-2014.06],[fcflags])
AC_LANG([Fortran])
m4_include([m4/ax_prog_fc_mpi.m4])
......
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