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
93af6a28
Commit
93af6a28
authored
Jun 13, 2014
by
Andreas Marek
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'u/loh/master' of gitta:amarek/ELPA
parents
3043b9d1
9affd0ab
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
117 additions
and
4 deletions
+117
-4
ELPA_2014.06/Makefile.in
ELPA_2014.06/Makefile.in
+1
-0
ELPA_2014.06/configure
ELPA_2014.06/configure
+99
-2
ELPA_2014.06/configure.ac
ELPA_2014.06/configure.ac
+16
-1
ELPA_2014.06/m4/ax_elpa_openmp.m4
ELPA_2014.06/m4/ax_elpa_openmp.m4
+1
-1
No files found.
ELPA_2014.06/Makefile.in
View file @
93af6a28
...
...
@@ -691,6 +691,7 @@ NM = @NM@
NMEDIT
=
@NMEDIT@
OBJDUMP
=
@OBJDUMP@
OBJEXT
=
@OBJEXT@
OPENMP_CXXFLAGS
=
@OPENMP_CXXFLAGS@
OPENMP_FCFLAGS
=
@OPENMP_FCFLAGS@
OTOOL
=
@OTOOL@
OTOOL64
=
@OTOOL64@
...
...
ELPA_2014.06/configure
View file @
93af6a28
...
...
@@ -696,6 +696,7 @@ WITH_REAL_GENERIC_KERNEL_FALSE
WITH_REAL_GENERIC_KERNEL_TRUE
SCALAPACK_FCFLAGS
SCALAPACK_LDFLAGS
OPENMP_CXXFLAGS
OPENMP_FCFLAGS
WITH_OPENMP_FALSE
WITH_OPENMP_TRUE
...
...
@@ -6712,6 +6713,13 @@ fi
$as_echo "#define WITH_OPENMP 1" >>confdefs.h
# Fortran
ac_ext=${ac_fc_srcext-f}
ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
OPENMP_FCFLAGS=
# Check whether --enable-openmp was given.
if test "${enable_openmp+set}" = set; then :
...
...
@@ -6719,8 +6727,8 @@ if test "${enable_openmp+set}" = set; then :
fi
if test "$enable_openmp" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
$CC
option to support OpenMP" >&5
$as_echo_n "checking for
$CC
option to support OpenMP... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
fc
option to support OpenMP" >&5
$as_echo_n "checking for
fc
option to support OpenMP... " >&6; }
if ${ac_cv_prog_fc_openmp+:} false; then :
$as_echo_n "(cached) " >&6
else
...
...
@@ -6766,6 +6774,95 @@ $as_echo "$ac_cv_prog_fc_openmp" >&6; }
fi
ac_ext=${ac_fc_srcext-f}
ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
# C++
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
OPENMP_CXXFLAGS=
# Check whether --enable-openmp was given.
if test "${enable_openmp+set}" = set; then :
enableval=$enable_openmp;
fi
if test "$enable_openmp" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cxx option to support OpenMP" >&5
$as_echo_n "checking for cxx option to support OpenMP... " >&6; }
if ${ac_cv_prog_cxx_openmp+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef _OPENMP
choke me
#endif
#include <omp.h>
int main () { return omp_get_num_threads (); }
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
ac_cv_prog_cxx_openmp='none needed'
else
ac_cv_prog_cxx_openmp='unsupported'
for ac_option in -openmp -fopenmp -xopenmp -mp -omp -qsmp=omp; do
ac_save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $ac_option"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef _OPENMP
choke me
#endif
#include <omp.h>
int main () { return omp_get_num_threads (); }
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
ac_cv_prog_cxx_openmp=$ac_option
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$ac_save_CXXFLAGS
if test "$ac_cv_prog_cxx_openmp" != unsupported; then
break
fi
done
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_openmp" >&5
$as_echo "$ac_cv_prog_cxx_openmp" >&6; }
case $ac_cv_prog_cxx_openmp in #(
"none needed" | unsupported)
;; #(
*)
OPENMP_CXXFLAGS=$ac_cv_prog_cxx_openmp ;;
esac
fi
ac_ext=${ac_fc_srcext-f}
ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_fc_compiler_gnu
# Append to flags as this influences which
# kind of MPI library has to be used (thread-safe or not)
CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
FCFLAGS="$OPENMP_FCFLAGS $FCFLAGS"
LDFLAGS="$OPENMP_CXXFLAGS $LDFLAGS"
fi
save_FCFLAGS=$FCFLAGS
...
...
ELPA_2014.06/configure.ac
View file @
93af6a28
...
...
@@ -757,7 +757,22 @@ AC_ARG_WITH([openmp],
AM_CONDITIONAL([WITH_OPENMP],[test x"$with_openmp" = x"yes"])
if test x"${with_openmp}" = x"yes"; then
AC_DEFINE([WITH_OPENMP], [1], [use OpenMP threading])
AX_ELPA_OPENMP
# Fortran
AC_LANG_PUSH([Fortran])
AX_ELPA_OPENMP
AC_LANG_POP()
# C++
AC_LANG_PUSH([C++])
AX_ELPA_OPENMP
AC_LANG_POP()
# Append to flags as this influences which
# kind of MPI library has to be used (thread-safe or not)
CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
FCFLAGS="$OPENMP_FCFLAGS $FCFLAGS"
LDFLAGS="$OPENMP_CXXFLAGS $LDFLAGS"
fi
save_FCFLAGS=$FCFLAGS
...
...
ELPA_2014.06/m4/ax_elpa_openmp.m4
View file @
93af6a28
...
...
@@ -54,7 +54,7 @@ AC_DEFUN([AX_ELPA_OPENMP],
AC_ARG_ENABLE([openmp],
[AS_HELP_STRING([--disable-openmp], [do not use OpenMP])])
if test "$enable_openmp" != no; then
AC_CACHE_CHECK([for
$CC
option to support OpenMP],
AC_CACHE_CHECK([for
_AC_LANG_ABBREV
option to support OpenMP],
[ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp],
[AC_LINK_IFELSE([_AX_ELPA_LANG_OPENMP],
[ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp='none needed'],
...
...
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