Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
iwr
amdis
Commits
c541effa
Commit
c541effa
authored
Jun 08, 2010
by
Thomas Witkowski
Browse files
Several changes in parallel AMDiS interface.
parent
e913e5aa
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
AMDiS/libtool
View file @
c541effa
...
@@ -30,10 +30,10 @@
...
@@ -30,10 +30,10 @@
# the same distribution terms that you use for the rest of that program.
# the same distribution terms that you use for the rest of that program.
# A sed program that does not truncate output.
# A sed program that does not truncate output.
SED
=
"/bin/sed"
SED
=
"/
usr/
bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed
=
"/bin/sed -e 1s/^X//"
Xsed
=
"/
usr/
bin/sed -e 1s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
# if CDPATH is set.
...
@@ -44,7 +44,7 @@ available_tags=" CXX F77"
...
@@ -44,7 +44,7 @@ available_tags=" CXX F77"
# ### BEGIN LIBTOOL CONFIG
# ### BEGIN LIBTOOL CONFIG
# Libtool was configured on host
NWRW13
:
# Libtool was configured on host
p1d066
:
# Shell to use when invoking shell scripts.
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
SHELL
=
"/bin/sh"
...
@@ -66,12 +66,12 @@ fast_install=yes
...
@@ -66,12 +66,12 @@ fast_install=yes
# The host system.
# The host system.
host_alias
=
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
host_os
=
linux-gnu
# The build system.
# The build system.
build_alias
=
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
# An echo program that does not interpret backslashes.
...
@@ -82,25 +82,22 @@ AR="ar"
...
@@ -82,25 +82,22 @@ AR="ar"
AR_FLAGS
=
"cru"
AR_FLAGS
=
"cru"
# A C compiler.
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
LTCFLAGS
=
"-g -O2"
# A language-specific compiler.
# A language-specific compiler.
CC
=
"
g
cc"
CC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# Is the compiler the GNU C compiler?
# Is the compiler the GNU C compiler?
with_gcc
=
yes
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
# An ERE matcher.
EGREP
=
"grep -E"
EGREP
=
"grep -E"
# The linker used to build libraries.
# The linker used to build libraries.
LD
=
"/usr/
bin/ld
"
LD
=
"/usr/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
# Whether we need hard or soft links.
# Whether we need hard or soft links.
LN_S
=
"ln -s"
LN_S
=
"ln -s"
...
@@ -174,7 +171,7 @@ dlopen_self=unknown
...
@@ -174,7 +171,7 @@ dlopen_self=unknown
dlopen_self_static
=
unknown
dlopen_self_static
=
unknown
# Compiler flag to prevent dynamic linking.
# Compiler flag to prevent dynamic linking.
link_static_flag
=
"
-static
"
link_static_flag
=
""
# Compiler flag to turn off builtin functions.
# Compiler flag to turn off builtin functions.
no_builtin_flag
=
" -fno-builtin"
no_builtin_flag
=
" -fno-builtin"
...
@@ -232,11 +229,11 @@ striplib="strip --strip-unneeded"
...
@@ -232,11 +229,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
predep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
predep_objects
=
""
# Dependencies to place after the objects being linked to create a
# Dependencies to place after the objects being linked to create a
# shared library.
# shared library.
postdep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
postdep_objects
=
""
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
...
@@ -248,7 +245,7 @@ postdeps=""
...
@@ -248,7 +245,7 @@ postdeps=""
# The library search path used internally by the compiler when linking
# The library search path used internally by the compiler when linking
# a shared library.
# a shared library.
compiler_lib_search_path
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
compiler_lib_search_path
=
""
# Method to check whether dependent libraries are shared objects.
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
deplibs_check_method
=
"pass_all"
...
@@ -328,10 +325,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
...
@@ -328,10 +325,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
" /u/backofen/adds/local/lib/i386-redhat-linux/4.1.2/ /u/backofen/adds
/local/lib/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../../
i386-redhat-linux/lib/i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../../
i386-redhat
-linux/lib/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../
/lib
/i386-redhat
-linux/4.1.2/ /lib/ /usr/lib/
i386-redhat
-linux/4.1.2/ /usr/lib/
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
sys_lib_search_path_spec
=
" /fastfs/wir/local/lib/x86_64-suse-linux/4.1.2/ /fastfs/wir
/local/lib/
../lib64/
/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/ /usr/lib/gcc/
x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../../
x86_64-suse-linux/lib/x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../../
x86_64-suse
-linux/lib/
../lib64/
/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
..
/lib
64/ /lib/x86_64-suse
-linux/4.1.2/ /lib/
../lib64/
/usr/lib/
x86_64-suse
-linux/4.1.2/ /usr/lib/
../lib64/ /fastfs/wir/local/lib/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../ /lib/ /usr/lib/"
# Run-time system search path for libraries
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/mysql /usr/lib/octave-3.0.1 /usr/lib/qt-
3.
3
/lib
/usr/lib/qt4
/lib "
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale3.0/lib/2.9.99 /opt/cluster/Pathscale
3.
0
/lib
/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2
/lib
so
"
# Fix the shell variable $srcfile for the compiler.
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
fix_srcfile_path
=
""
...
@@ -6763,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
...
@@ -6763,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
# End:
# End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX
# ### BEGIN LIBTOOL TAG CONFIG: CXX
# Libtool was configured on host
NWRW13
:
# Libtool was configured on host
p1d066
:
# Shell to use when invoking shell scripts.
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
SHELL
=
"/bin/sh"
...
@@ -6785,12 +6782,12 @@ fast_install=yes
...
@@ -6785,12 +6782,12 @@ fast_install=yes
# The host system.
# The host system.
host_alias
=
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
host_os
=
linux-gnu
# The build system.
# The build system.
build_alias
=
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
# An echo program that does not interpret backslashes.
...
@@ -6801,25 +6798,22 @@ AR="ar"
...
@@ -6801,25 +6798,22 @@ AR="ar"
AR_FLAGS
=
"cru"
AR_FLAGS
=
"cru"
# A C compiler.
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
LTCFLAGS
=
"-g -O2"
# A language-specific compiler.
# A language-specific compiler.
CC
=
"
g++
"
CC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpiCC
"
# Is the compiler the GNU C compiler?
# Is the compiler the GNU C compiler?
with_gcc
=
yes
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
# An ERE matcher.
EGREP
=
"grep -E"
EGREP
=
"grep -E"
# The linker used to build libraries.
# The linker used to build libraries.
LD
=
"/usr/
bin/ld
"
LD
=
"/usr/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
# Whether we need hard or soft links.
# Whether we need hard or soft links.
LN_S
=
"ln -s"
LN_S
=
"ln -s"
...
@@ -6893,7 +6887,7 @@ dlopen_self=unknown
...
@@ -6893,7 +6887,7 @@ dlopen_self=unknown
dlopen_self_static
=
unknown
dlopen_self_static
=
unknown
# Compiler flag to prevent dynamic linking.
# Compiler flag to prevent dynamic linking.
link_static_flag
=
"
-static
"
link_static_flag
=
""
# Compiler flag to turn off builtin functions.
# Compiler flag to turn off builtin functions.
no_builtin_flag
=
" -fno-builtin"
no_builtin_flag
=
" -fno-builtin"
...
@@ -6948,11 +6942,11 @@ striplib="strip --strip-unneeded"
...
@@ -6948,11 +6942,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
predep_objects
=
`
echo
"/usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../crti.o /usr/lib/gcc/
i386-redhat
-linux/4.1.2/crtbeginS.o"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
predep_objects
=
"/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
../lib64/
crti.o /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/crtbeginS.o"
# Dependencies to place after the objects being linked to create a
# Dependencies to place after the objects being linked to create a
# shared library.
# shared library.
postdep_objects
=
`
echo
"/usr/lib/gcc/
i386-redhat
-linux/4.1.2/crtendS.o /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../
crtn.o"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
postdep_objects
=
"/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/crtendS.o /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
../lib64/crtn.o"
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
...
@@ -6960,11 +6954,11 @@ predeps=""
...
@@ -6960,11 +6954,11 @@ predeps=""
# Dependencies to place after the objects being linked to create a
# Dependencies to place after the objects being linked to create a
# shared library.
# shared library.
postdeps
=
"-lstdc++ -lm -lgcc_s -lc -lgcc_s"
postdeps
=
"
-lmpi_cxx -lmpi -lopen-rte -lopen-pal -libverbs -lrt -lnuma -ldl -lnsl -lutil -ldl
-lstdc++ -lm -lgcc_s
-lpthread
-lc -lgcc_s"
# The library search path used internally by the compiler when linking
# The library search path used internally by the compiler when linking
# a shared library.
# a shared library.
compiler_lib_search_path
=
`
echo
"-L/u/backofen/adds/local
/lib -L/usr/lib/gcc/
i386-redhat
-linux/4.1.2 -L/usr/lib/gcc/
i386-redhat
-linux/4.1.2
-L/usr/lib/gcc/i386-redhat-linux/4.1.2/../../.."
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
compiler_lib_search_path
=
"-L/usr/lib64 -L/licsoft/libraries/openmpi/1.2.6/64bit
/lib -L/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2 -L/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2
/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/fastfs/wir/local/lib -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../.."
# Method to check whether dependent libraries are shared objects.
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
deplibs_check_method
=
"pass_all"
...
@@ -7044,10 +7038,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
...
@@ -7044,10 +7038,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
" /u/backofen/adds/local/lib/i386-redhat-linux/4.1.2/ /u/backofen/adds
/local/lib/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../../
i386-redhat-linux/lib/i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../../
i386-redhat
-linux/lib/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../
/lib
/i386-redhat
-linux/4.1.2/ /lib/ /usr/lib/
i386-redhat
-linux/4.1.2/ /usr/lib/
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
sys_lib_search_path_spec
=
" /fastfs/wir/local/lib/x86_64-suse-linux/4.1.2/ /fastfs/wir
/local/lib/
../lib64/
/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/ /usr/lib/gcc/
x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../../
x86_64-suse-linux/lib/x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../../
x86_64-suse
-linux/lib/
../lib64/
/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
..
/lib
64/ /lib/x86_64-suse
-linux/4.1.2/ /lib/
../lib64/
/usr/lib/
x86_64-suse
-linux/4.1.2/ /usr/lib/
../lib64/ /fastfs/wir/local/lib/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../ /lib/ /usr/lib/"
# Run-time system search path for libraries
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/mysql /usr/lib/octave-3.0.1 /usr/lib/qt-
3.
3
/lib
/usr/lib/qt4
/lib "
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale3.0/lib/2.9.99 /opt/cluster/Pathscale
3.
0
/lib
/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2
/lib
so
"
# Fix the shell variable $srcfile for the compiler.
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
fix_srcfile_path
=
""
...
@@ -7071,7 +7065,7 @@ include_expsyms=""
...
@@ -7071,7 +7065,7 @@ include_expsyms=""
# ### BEGIN LIBTOOL TAG CONFIG: F77
# ### BEGIN LIBTOOL TAG CONFIG: F77
# Libtool was configured on host
NWRW13
:
# Libtool was configured on host
p1d066
:
# Shell to use when invoking shell scripts.
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
SHELL
=
"/bin/sh"
...
@@ -7093,12 +7087,12 @@ fast_install=yes
...
@@ -7093,12 +7087,12 @@ fast_install=yes
# The host system.
# The host system.
host_alias
=
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
host_os
=
linux-gnu
# The build system.
# The build system.
build_alias
=
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
# An echo program that does not interpret backslashes.
...
@@ -7109,25 +7103,22 @@ AR="ar"
...
@@ -7109,25 +7103,22 @@ AR="ar"
AR_FLAGS
=
"cru"
AR_FLAGS
=
"cru"
# A C compiler.
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
LTCFLAGS
=
"-g -O2"
# A language-specific compiler.
# A language-specific compiler.
CC
=
"
f95
"
CC
=
"
g77
"
# Is the compiler the GNU C compiler?
# Is the compiler the GNU C compiler?
with_gcc
=
yes
with_gcc
=
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
# An ERE matcher.
EGREP
=
"grep -E"
EGREP
=
"grep -E"
# The linker used to build libraries.
# The linker used to build libraries.
LD
=
"/usr/
bin/ld
"
LD
=
"/usr/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
# Whether we need hard or soft links.
# Whether we need hard or soft links.
LN_S
=
"ln -s"
LN_S
=
"ln -s"
...
@@ -7259,11 +7250,11 @@ striplib="strip --strip-unneeded"
...
@@ -7259,11 +7250,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
predep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
predep_objects
=
""
# Dependencies to place after the objects being linked to create a
# Dependencies to place after the objects being linked to create a
# shared library.
# shared library.
postdep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
postdep_objects
=
""
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
...
@@ -7275,7 +7266,7 @@ postdeps=""
...
@@ -7275,7 +7266,7 @@ postdeps=""
# The library search path used internally by the compiler when linking
# The library search path used internally by the compiler when linking
# a shared library.
# a shared library.
compiler_lib_search_path
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
compiler_lib_search_path
=
""
# Method to check whether dependent libraries are shared objects.
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
deplibs_check_method
=
"pass_all"
...
@@ -7355,10 +7346,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
...
@@ -7355,10 +7346,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
" /u/backofen/adds/local/lib/i386-redhat-linux/4.1.2/ /u/backofen/adds
/local/lib/ /usr/lib/gcc
/i386-redhat
-linux/
4.1.2
/ /usr/lib/gcc/
i386-redhat
-linux/
4.1.2
/ /usr/lib/gcc
/i386-redhat
-linux/
4.1.2
/../../../../
i386-redhat-linux/lib/i386-redhat
-linux/
4.1.2
/ /usr/lib/gcc
/i386-redhat
-linux/
4.1.2
/../../../../
i386-redhat
-linux/lib/ /usr/lib/gcc
/i386-redhat
-linux/
4.1.2
/../../../
i386-redhat
-linux/
4.1.2
/ /usr/lib/gcc
/i386-redhat
-linux/
4.1.2
/../../../ /lib/
i386-redhat
-linux/
4.1.2
/ /lib/ /usr/lib/
i386-redhat
-linux/
4.1.2
/ /usr/lib/"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
sys_lib_search_path_spec
=
" /fastfs/wir/local/lib/x86_64-suse-linux/3.3.5/ /fastfs/wir
/local/lib/ /usr/lib
64
/gcc
-lib/x86_64-suse
-linux/
3.3.5
/ /usr/lib/gcc/
x86_64-suse
-linux/
3.3.5
/ /usr/lib
64
/gcc
-lib/x86_64-suse
-linux/
3.3.5
/../../../../
x86_64-suse-linux/lib/x86_64-suse
-linux/
3.3.5
/ /usr/lib
64
/gcc
-lib/x86_64-suse
-linux/
3.3.5
/../../../../
x86_64-suse
-linux/lib/ /usr/lib
64
/gcc
-lib/x86_64-suse
-linux/
3.3.5
/../../../
x86_64-suse
-linux/
3.3.5
/ /usr/lib
64
/gcc
-lib/x86_64-suse
-linux/
3.3.5
/../../../ /lib/
x86_64-suse
-linux/
3.3.5
/ /lib/ /usr/lib/
x86_64-suse
-linux/
3.3.5
/ /usr/lib/"
# Run-time system search path for libraries
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/mysql /usr/lib/octave-3.0.1 /usr/lib/qt-
3.
3
/lib
/usr/lib/qt4
/lib "
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale3.0/lib/2.9.99 /opt/cluster/Pathscale
3.
0
/lib
/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2
/lib
so
"
# Fix the shell variable $srcfile for the compiler.
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
fix_srcfile_path
=
""
...
...
AMDiS/src/parallel/GlobalMatrixSolver.cc
View file @
c541effa
...
@@ -16,17 +16,36 @@ namespace AMDiS {
...
@@ -16,17 +16,36 @@ namespace AMDiS {
return
0
;
return
0
;
}
}
void
GlobalMatrixSolver
::
solve
()
void
GlobalMatrixSolver
::
addToMeshDistributor
(
MeshDistributor
&
m
)
{
meshDistributor
=
&
m
;
m
.
addProblemStat
(
this
);
}
void
GlobalMatrixSolver
::
buildAfterCoarsen
(
AdaptInfo
*
adaptInfo
,
Flag
flag
,
bool
assembleMatrix
,
bool
assembleVector
)
{
meshDistributor
->
checkMeshChange
();
ProblemVec
::
buildAfterCoarsen
(
adaptInfo
,
flag
,
assembleMatrix
,
assembleVector
);
}
void
GlobalMatrixSolver
::
solve
(
AdaptInfo
*
adaptInfo
,
bool
fixedMatrix
)
{
{
FUNCNAME
(
"GlobalMatrixSolver::solve()"
);
FUNCNAME
(
"GlobalMatrixSolver::solve()"
);
TEST_EXIT
(
meshDistributor
)(
"Should not happen!
\n
"
);
#ifdef _OPENMP
#ifdef _OPENMP
double
wtime
=
omp_get_wtime
();
double
wtime
=
omp_get_wtime
();
#endif
#endif
clock_t
first
=
clock
();
clock_t
first
=
clock
();
fillPetscMatrix
(
probStat
->
getSystemMatrix
(),
probStat
->
getRhs
()
);
fillPetscMatrix
(
systemMatrix
,
rhs
);
solvePetscMatrix
(
*
(
probStat
->
getS
olution
())
);
solvePetscMatrix
(
*
s
olution
);
#ifdef _OPENMP
#ifdef _OPENMP
INFO
(
info
,
8
)(
"solution of discrete system needed %.5f seconds system time / %.5f seconds wallclock time
\n
"
,
INFO
(
info
,
8
)(
"solution of discrete system needed %.5f seconds system time / %.5f seconds wallclock time
\n
"
,
...
@@ -71,9 +90,9 @@ namespace AMDiS {
...
@@ -71,9 +90,9 @@ namespace AMDiS {
values
.
clear
();
values
.
clear
();
// Global index of the current row dof.
// Global index of the current row dof.
int
globalRowDof
=
mapLocalGlobal
Dofs
[
*
cursor
]
;
DegreeOfFreedom
globalRowDof
=
meshDistributor
->
mapLocal
To
Global
(
*
cursor
)
;
// Test if the current row dof is a periodic dof.
// Test if the current row dof is a periodic dof.
bool
periodicRow
=
(
p
eriodicDof
.
count
(
globalRowDof
)
>
0
);
bool
periodicRow
=
(
meshDistributor
->
getP
eriodicDof
Map
()
.
count
(
globalRowDof
)
>
0
);
// === Traverse all non zero entries of the row and produce vector cols ===
// === Traverse all non zero entries of the row and produce vector cols ===
...
@@ -86,16 +105,18 @@ namespace AMDiS {
...
@@ -86,16 +105,18 @@ namespace AMDiS {
// Set only non null values.
// Set only non null values.
if
(
value
(
*
icursor
)
!=
0.0
)
{
if
(
value
(
*
icursor
)
!=
0.0
)
{
// Global index of the current column index.
// Global index of the current column index.
int
globalColDof
=
mapLocalGlobal
Dofs
[
col
(
*
icursor
)
]
;
int
globalColDof
=
meshDistributor
->
mapLocal
To
Global
(
col
(
*
icursor
)
)
;
// Calculate the exact position of the column index in the petsc matrix.
// Calculate the exact position of the column index in the petsc matrix.
int
colIndex
=
globalColDof
*
dispMult
+
dispAddCol
;
int
colIndex
=
globalColDof
*
dispMult
+
dispAddCol
;
// If the current row is not periodic, but the current dof index is periodic,
// If the current row is not periodic, but the current dof index is periodic,
// we have to duplicate the value to the other corresponding periodic columns.
// we have to duplicate the value to the other corresponding periodic columns.
if
(
periodicRow
==
false
&&
periodicDof
.
count
(
globalColDof
)
>
0
)
{
if
(
periodicRow
==
false
&&
meshDistributor
->
getPeriodicDofMap
().
count
(
globalColDof
)
>
0
)
{
// The value is assign to n matrix entries, therefore, every entry
// The value is assign to n matrix entries, therefore, every entry
// has only 1/n value of the original entry.
// has only 1/n value of the original entry.
double
scalFactor
=
1.0
/
(
periodicDof
[
globalColDof
].
size
()
+
1.0
);
double
scalFactor
=
1.0
/
(
meshDistributor
->
getPeriodicDof
(
globalColDof
).
size
()
+
1.0
);
// Insert original entry.
// Insert original entry.
cols
.
push_back
(
colIndex
);
cols
.
push_back
(
colIndex
);
...
@@ -103,8 +124,8 @@ namespace AMDiS {
...
@@ -103,8 +124,8 @@ namespace AMDiS {
// Insert the periodic entries.
// Insert the periodic entries.
for
(
std
::
set
<
DegreeOfFreedom
>::
iterator
it
=
for
(
std
::
set
<
DegreeOfFreedom
>::
iterator
it
=
p
eriodicDof
[
globalColDof
]
.
begin
();
meshDistributor
->
getP
eriodicDof
(
globalColDof
)
.
begin
();
it
!=
p
eriodicDof
[
globalColDof
]
.
end
();
++
it
)
{
it
!=
meshDistributor
->
getP
eriodicDof
(
globalColDof
)
.
end
();
++
it
)
{
cols
.
push_back
(
*
it
*
dispMult
+
dispAddCol
);
cols
.
push_back
(
*
it
*
dispMult
+
dispAddCol
);
values
.
push_back
(
value
(
*
icursor
)
*
scalFactor
);
values
.
push_back
(
value
(
*
icursor
)
*
scalFactor
);
}
}
...
@@ -126,7 +147,8 @@ namespace AMDiS {
...
@@ -126,7 +147,8 @@ namespace AMDiS {
if
(
periodicRow
)
{
if
(
periodicRow
)
{
// The row dof is periodic, so send dof to all the corresponding rows.
// The row dof is periodic, so send dof to all the corresponding rows.
double
scalFactor
=
1.0
/
(
periodicDof
[
globalRowDof
].
size
()
+
1.0
);
double
scalFactor
=
1.0
/
(
meshDistributor
->
getPeriodicDof
(
globalRowDof
).
size
()
+
1.0
);
int
diagIndex
=
-
1
;
int
diagIndex
=
-
1
;
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
values
.
size
());
i
++
)
{
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
values
.
size
());
i
++
)
{
...
@@ -149,8 +171,8 @@ namespace AMDiS {
...
@@ -149,8 +171,8 @@ namespace AMDiS {
values
[
diagIndex
]
=
0.0
;
values
[
diagIndex
]
=
0.0
;
// Send the row to all periodic row indices.
// Send the row to all periodic row indices.
for
(
std
::
set
<
DegreeOfFreedom
>::
iterator
it
=
p
eriodicDof
[
globalRowDof
]
.
begin
();
for
(
std
::
set
<
DegreeOfFreedom
>::
iterator
it
=
meshDistributor
->
getP
eriodicDof
(
globalRowDof
)
.
begin
();
it
!=
p
eriodicDof
[
globalRowDof
]
.
end
();
++
it
)
{
it
!=
meshDistributor
->
getP
eriodicDof
(
globalRowDof
)
.
end
();
++
it
)
{
int
perRowIndex
=
*
it
*
dispMult
+
dispAddRow
;
int
perRowIndex
=
*
it
*
dispMult
+
dispAddRow
;
MatSetValues
(
petscMatrix
,
1
,
&
perRowIndex
,
cols
.
size
(),
MatSetValues
(
petscMatrix
,
1
,
&
perRowIndex
,
cols
.
size
(),
&
(
cols
[
0
]),
&
(
values
[
0
]),
ADD_VALUES
);
&
(
cols
[
0
]),
&
(
values
[
0
]),
ADD_VALUES
);
...
@@ -172,18 +194,18 @@ namespace AMDiS {
...
@@ -172,18 +194,18 @@ namespace AMDiS {
DOFVector
<
double
>::
Iterator
dofIt
(
vec
,
USED_DOFS
);
DOFVector
<
double
>::
Iterator
dofIt
(
vec
,
USED_DOFS
);
for
(
dofIt
.
reset
();
!
dofIt
.
end
();
++
dofIt
)
{
for
(
dofIt
.
reset
();
!
dofIt
.
end
();
++
dofIt
)
{
// Calculate global row index of the dof.
// Calculate global row index of the dof.
int
globalRow
=
mapLocalGlobal
Dofs
[
dofIt
.
getDOFIndex
()
]
;
DegreeOfFreedom
globalRow
=
meshDistributor
->
mapLocal
To
Global
(
dofIt
.
getDOFIndex
()
)
;
// Calculate petsc index of the row dof.
// Calculate petsc index of the row dof.
int
index
=
globalRow
*
dispMult
+
dispAdd
;
int
index
=
globalRow
*
dispMult
+
dispAdd
;
if
(
p
eriodicDof
.
count
(
globalRow
)
>
0
)
{
if
(
meshDistributor
->
getP
eriodicDof
Map
()
.
count
(
globalRow
)
>
0
)
{
// The dof index is periodic, so devide the value to all dof entries.
// The dof index is periodic, so devide the value to all dof entries.
double
value
=
*
dofIt
/
(
p
eriodicDof
[
globalRow
]
.
size
()
+
1.0
);
double
value
=
*
dofIt
/
(
meshDistributor
->
getP
eriodicDof
(
globalRow
)
.
size
()
+
1.0
);
VecSetValues
(
petscVec
,
1
,
&
index
,
&
value
,
ADD_VALUES
);
VecSetValues
(
petscVec
,
1
,
&
index
,
&
value
,
ADD_VALUES
);
for
(
std
::
set
<
DegreeOfFreedom
>::
iterator
it
=
p
eriodicDof
[
globalRow
]
.
begin
();
for
(
std
::
set
<
DegreeOfFreedom
>::
iterator
it
=
meshDistributor
->
getP
eriodicDof
(
globalRow
)
.
begin
();
it
!=
p
eriodicDof
[
globalRow
]
.
end
();
++
it
)
{
it
!=
meshDistributor
->
getP
eriodicDof
(
globalRow
)
.
end
();
++
it
)
{
index
=
*
it
*
dispMult
+
dispAdd
;
index
=
*
it
*
dispMult
+
dispAdd
;