mpi support
This commit is contained in:
parent
90feb7f9f8
commit
656e27f5e0
8
configure
vendored
8
configure
vendored
@ -16700,7 +16700,7 @@ else
|
|||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
as_dummy="$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin"
|
as_dummy="$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin:/usr/lib64/openmpi/bin:/usr/lib/openmpi/bin"
|
||||||
for as_dir in $as_dummy
|
for as_dir in $as_dummy
|
||||||
do
|
do
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
@ -16715,7 +16715,7 @@ done
|
|||||||
done
|
done
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
|
|
||||||
test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC="true"
|
test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC=""$CC""
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
@ -16743,7 +16743,7 @@ else
|
|||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
as_dummy="$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin"
|
as_dummy="$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin:/usr/lib/openmpi/bin:/usr/lib/openmpi/bin"
|
||||||
for as_dir in $as_dummy
|
for as_dir in $as_dummy
|
||||||
do
|
do
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
@ -16758,7 +16758,7 @@ done
|
|||||||
done
|
done
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
|
|
||||||
test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC="true"
|
test -z "$ac_cv_path_MPI_CC" && ac_cv_path_MPI_CC=""$CC""
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
@ -58,7 +58,7 @@ PROJECT_LOGO = misc/icons/yap_96x96x32.png
|
|||||||
# entered, it will be relative to the location where doxygen was started. If
|
# entered, it will be relative to the location where doxygen was started. If
|
||||||
# left blank the current directory will be used.
|
# left blank the current directory will be used.
|
||||||
|
|
||||||
OUTPUT_DIRECTORY = /Users/vsc/Yap/doxout
|
OUTPUT_DIRECTORY = /home/vsc/Yap/doxout
|
||||||
|
|
||||||
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
|
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
|
||||||
# directories (in 2 levels) under the output directory of each output format and
|
# directories (in 2 levels) under the output directory of each output format and
|
||||||
|
@ -36,9 +36,9 @@ dnl LAM/MPI interface
|
|||||||
|
|
||||||
if test "$yap_cv_mpi" != "no" -a "$INSTALL_DLLS" != "no"; then
|
if test "$yap_cv_mpi" != "no" -a "$INSTALL_DLLS" != "no"; then
|
||||||
if test "$yap_cv_mpi" != "yes"; then
|
if test "$yap_cv_mpi" != "yes"; then
|
||||||
AC_PATH_PROG(MPI_CC,mpicc,true,$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
|
AC_PATH_PROG(MPI_CC,mpicc,"$CC",$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin:/usr/lib64/openmpi/bin:/usr/lib/openmpi/bin)
|
||||||
else
|
else
|
||||||
AC_PATH_PROG(MPI_CC,mpicc,true,$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
|
AC_PATH_PROG(MPI_CC,mpicc,"$CC",$yap_cv_mpi/bin:$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin:/usr/lib/openmpi/bin:/usr/lib/openmpi/bin)
|
||||||
fi
|
fi
|
||||||
MPILDF=`"$MPI_CC" --showme:link`
|
MPILDF=`"$MPI_CC" --showme:link`
|
||||||
MPICF=`"$MPI_CC" --showme:compile`
|
MPICF=`"$MPI_CC" --showme:compile`
|
||||||
|
@ -104,7 +104,7 @@ mpi.o: $(srcdir)/mpi.c
|
|||||||
mpe.o: $(srcdir)/mpe.c
|
mpe.o: $(srcdir)/mpe.c
|
||||||
$(CC) -c $(CFLAGS) $(srcdir)/mpe.c -o $@
|
$(CC) -c $(CFLAGS) $(srcdir)/mpe.c -o $@
|
||||||
|
|
||||||
depend: $(HEADERS) $(C_SOURCES)
|
.depend: $(HEADERS) $(C_SOURCES)
|
||||||
-@if test "$(GCC)" = yes; then\
|
-@if test "$(GCC)" = yes; then\
|
||||||
$(CC) -MM $(CFLAGS) -I$(srcdir)/include -i ../.. $(C_SOURCES) > .depend;\
|
$(CC) -MM $(CFLAGS) -I$(srcdir)/include -i ../.. $(C_SOURCES) > .depend;\
|
||||||
else\
|
else\
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit dc25a433df1f77e6271179664080d338e10c9d6b
|
Subproject commit 55f1b0d765c607c99b9b9c67f150df64d33128b0
|
@ -1 +1 @@
|
|||||||
Subproject commit c488f2493012e8e3b83bbcd4db020a3db5b96062
|
Subproject commit e75f61fe11da02633e61501dae21122b9adad687
|
@ -1 +1 @@
|
|||||||
Subproject commit e0a566b31a14f28a49fe112f6e56bbd58a12ccd4
|
Subproject commit 54d9b5d24c60b1be4dc6c1167a59ef46a0f79ac8
|
Reference in New Issue
Block a user