Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
elpa
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
11
Issues
11
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
elpa
elpa
Commits
3043b9d1
Commit
3043b9d1
authored
Jun 12, 2014
by
Andreas Marek
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'u/loh/master' of gitta:amarek/ELPA
parents
8e5915f7
0dadd203
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
22 deletions
+26
-22
ELPA_2014.06/Makefile.am
ELPA_2014.06/Makefile.am
+7
-5
ELPA_2014.06/Makefile.in
ELPA_2014.06/Makefile.in
+15
-13
ELPA_2014.06/configure
ELPA_2014.06/configure
+2
-2
ELPA_2014.06/configure.ac
ELPA_2014.06/configure.ac
+2
-2
No files found.
ELPA_2014.06/Makefile.am
View file @
3043b9d1
...
...
@@ -2,8 +2,8 @@
ACLOCAL_AMFLAGS
=
${ACLOCAL_FLAGS}
-I
m4
AM_FCFLAGS
=
$(SCALAPACK_FCFLAGS)
@FC_MODINC@modules @FC_MODOUT@modules
AM_LDFLAGS
=
$(SCALAPACK_LDFLAGS)
AM_FCFLAGS
=
$(SCALAPACK_FCFLAGS)
$(OPENMP_FCFLAGS)
@FC_MODINC@modules @FC_MODOUT@modules
AM_LDFLAGS
=
$(SCALAPACK_LDFLAGS)
$(OPENMP_FCFLAGS)
# libelpa
if
WITH_OPENMP
...
...
@@ -276,11 +276,13 @@ CLEANFILES = \
elpa2_test_real_choose_kernel_with_api.sh
\
elpa2_test_complex_choose_kernel_with_api.sh
\
elpa2_print_kernels.sh
\
*
.i
\
config-f90.h
*
.i
clean-local
:
-
rm
-rf
modules .fortran_dependencies
-
rm
-rf
modules/
*
.fortran_dependencies/
*
distclean-local
:
-
rm
config-f90.h
EXTRA_DIST
=
fdep/fortran_dependencies.pl fdep/fortran_dependencies.mk
...
...
ELPA_2014.06/Makefile.in
View file @
3043b9d1
...
...
@@ -771,8 +771,8 @@ top_builddir = @top_builddir@
top_srcdir
=
@top_srcdir@
with_amd_bulldozer_kernel
=
@with_amd_bulldozer_kernel@
ACLOCAL_AMFLAGS
=
${ACLOCAL_FLAGS}
-I
m4
AM_FCFLAGS
=
$(SCALAPACK_FCFLAGS)
@FC_MODINC@modules @FC_MODOUT@modules
AM_LDFLAGS
=
$(SCALAPACK_LDFLAGS)
AM_FCFLAGS
=
$(SCALAPACK_FCFLAGS)
$(OPENMP_FCFLAGS)
@FC_MODINC@modules @FC_MODOUT@modules
AM_LDFLAGS
=
$(SCALAPACK_LDFLAGS)
$(OPENMP_FCFLAGS)
@WITH_OPENMP_FALSE@
lib_LTLIBRARIES
=
libelpa-@PACKAGE_VERSION@.la
# libelpa
...
...
@@ -878,8 +878,7 @@ CLEANFILES = \
elpa2_test_real_choose_kernel_with_api.sh
\
elpa2_test_complex_choose_kernel_with_api.sh
\
elpa2_print_kernels.sh
\
*
.i
\
config-f90.h
*
.i
EXTRA_DIST
=
fdep/fortran_dependencies.pl fdep/fortran_dependencies.mk
all
:
config.h
...
...
@@ -1832,7 +1831,7 @@ distclean: distclean-am
-
rm
-rf
src/elpa2_kernels/
$(DEPDIR)
-
rm
-f
Makefile
distclean-am
:
clean-am distclean-compile distclean-generic
\
distclean-hdr distclean-libtool distclean-tags
distclean-hdr distclean-libtool distclean-
local distclean-
tags
dvi
:
dvi-am
...
...
@@ -1907,13 +1906,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
cscopelist-am ctags ctags-am dist dist-all dist-bzip2
\
dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip
\
distcheck distclean distclean-compile distclean-generic
\
distclean-hdr distclean-libtool distclean-
tags distcleancheck
\
dist
dir distuninstallcheck dvi dvi-am html html-am info
\
info-am install install-am install-binPROGRAMS install-data
\
install-data
-am install-dist_docDATA install-dist_files
DATA
\
install-d
vi install-dvi-am install-exec install-exec-am
\
install-
html install-html-am install-info install-info-am
\
install-libLTLIBRARIES install-man
\
distclean-hdr distclean-libtool distclean-
local distclean-tags
\
dist
cleancheck distdir distuninstallcheck dvi dvi-am html
\
html-am info info-am install install-am install-binPROGRAMS
\
install-data
install-data-am install-dist_doc
DATA
\
install-d
ist_filesDATA install-dvi install-dvi-am install-exec
\
install-
exec-am install-html install-html-am install-info
\
install-
info-am install-
libLTLIBRARIES install-man
\
install-nobase_elpa_includeHEADERS install-pdf install-pdf-am
\
install-pkgconfigDATA install-ps install-ps-am install-strip
\
installcheck installcheck-am installdirs maintainer-clean
\
...
...
@@ -1964,7 +1963,10 @@ elpa1.i: $(top_srcdir)/src/elpa1.F90
$(CPP)
$(CPPFLAGS)
-I
$(top_builddir)
/
-c
$(top_srcdir)
/src/elpa1.F90
-o
$@
clean-local
:
-
rm
-rf
modules .fortran_dependencies
-
rm
-rf
modules/
*
.fortran_dependencies/
*
distclean-local
:
-
rm
config-f90.h
@FORTRAN_MODULE_DEPS@
...
...
ELPA_2014.06/configure
View file @
3043b9d1
...
...
@@ -6774,8 +6774,8 @@ save_LDFLAGS=$LDFLAGS
FCFLAGS="$FCFLAGS $SCALAPACK_FCFLAGS"
LDFLAGS="$LDFLAGS $SCALAPACK_LDFLAGS"
FCFLAGS="$FCFLAGS $SCALAPACK_FCFLAGS
$OPENMP_FCFLAGS
"
LDFLAGS="$LDFLAGS $SCALAPACK_LDFLAGS
$OPENMP_FCFLAGS
"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Fortran module iso_fortran_env is available" >&5
$as_echo_n "checking whether Fortran module iso_fortran_env is available... " >&6; }
...
...
ELPA_2014.06/configure.ac
View file @
3043b9d1
...
...
@@ -766,8 +766,8 @@ save_LDFLAGS=$LDFLAGS
AC_ARG_VAR([SCALAPACK_LDFLAGS],[Extra LDFLAGS necessary to link a program with Scalapack])
AC_ARG_VAR([SCALAPACK_FCFLAGS],[Extra FCFLAGS necessary to compile a Fortran program with Scalapack])
FCFLAGS="$FCFLAGS $SCALAPACK_FCFLAGS"
LDFLAGS="$LDFLAGS $SCALAPACK_LDFLAGS"
FCFLAGS="$FCFLAGS $SCALAPACK_FCFLAGS
$OPENMP_FCFLAGS
"
LDFLAGS="$LDFLAGS $SCALAPACK_LDFLAGS
$OPENMP_FCFLAGS
"
dnl check whether fortran error_unit is defined
AC_MSG_CHECKING([whether Fortran module iso_fortran_env is available])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment