ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Silence asprintf warnings in ompi_info, add libs to build under Ubuntu

Просмотр исходного кода 
This commit was SVN r27719.
Этот коммит содержится в:
Ralph Castain 2012-12-23 19:54:44 +00:00
родитель ed77868984
Коммит b1925d35c7
5 изменённых файлов: 27 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
ompi/tools/ompi-server/Makefile.am
Просмотреть файл

@ -41,7 +41,7 @@ endif # !ORTE_DISABLE_FULL_SUPPORT
endif # OMPI_INSTALL_BINARIES
ompi_server_SOURCES = ompi-server.c
ompi_server_LDADD = $(top_builddir)/ompi/libmpi.la
ompi_server_LDADD = $(top_builddir)/ompi/libmpi.la $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
distclean-local:
rm -f $(man_pages)

2
ompi/tools/ompi_info/Makefile.am
Просмотреть файл

@ -63,7 +63,7 @@ ompi_info_SOURCES = \
components.c \
version.c
ompi_info_LDADD = $(top_builddir)/ompi/libmpi.la
ompi_info_LDADD = $(top_builddir)/ompi/libmpi.la $(top_builddir)/orte/libopen-rte.la $(top_builddir)/opal/libopen-pal.la
clean-local:
test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || rm -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)

6
ompi/tools/ompi_info/components.c
Просмотреть файл

@ -103,14 +103,14 @@ int ompi_info_register_components(opal_pointer_array_t *mca_types,
if (NULL == (type = (char*)opal_pointer_array_get_item(mca_types, i))) {
continue;
}
asprintf(&env, "OMPI_MCA_%s", type);
(void)asprintf(&env, "OMPI_MCA_%s", type);
if (NULL != (save = getenv(env))) {
/* save this param so it can later be restored */
asprintf(&str, "%s=%s", env, save);
(void)asprintf(&str, "%s=%s", env, save);
opal_argv_append_nosize(&env_save, str);
free(str);
/* can't manipulate it directly, so make a copy first */
asprintf(&target, "%s=", env);
(void)asprintf(&target, "%s=", env);
putenv(target);
free(target);
}

38
ompi/tools/ompi_info/param.c
Просмотреть файл

@ -235,11 +235,11 @@ void ompi_info_do_config(bool want_all)
/* setup strings that require allocation */
if (OMPI_BUILD_FORTRAN_MPIFH_BINDINGS) {
asprintf(&fortran_mpifh, "yes (%s)",
(OPAL_HAVE_WEAK_SYMBOLS ? "all" :
(OMPI_FORTRAN_CAPS ? "caps" :
(OMPI_FORTRAN_PLAIN ? "lower case" :
(OMPI_FORTRAN_SINGLE_UNDERSCORE ? "single underscore" : "double underscore")))));
(void)asprintf(&fortran_mpifh, "yes (%s)",
(OPAL_HAVE_WEAK_SYMBOLS ? "all" :
(OMPI_FORTRAN_CAPS ? "caps" :
(OMPI_FORTRAN_PLAIN ? "lower case" :
(OMPI_FORTRAN_SINGLE_UNDERSCORE ? "single underscore" : "double underscore")))));
} else {
fortran_mpifh = strdup("no");
}
@ -249,30 +249,30 @@ void ompi_info_do_config(bool want_all)
didn't work consistently to put it in _STRINGIFY because
sometimes the compiler would actually interpret the pragma
in there before stringify-ing it. */
asprintf(&fortran_have_ignore_tkr, "yes (%s)",
OMPI_FORTRAN_IGNORE_TKR_PREDECL);
(void)asprintf(&fortran_have_ignore_tkr, "yes (%s)",
OMPI_FORTRAN_IGNORE_TKR_PREDECL);
} else {
fortran_have_ignore_tkr = strdup("no");
}
if (OPAL_HAVE_SOLARIS_THREADS || OPAL_HAVE_POSIX_THREADS) { /* should just test OPAL_HAVE_THREADS */
asprintf(&threads, "%s (MPI_THREAD_MULTIPLE: %s, OPAL support: %s, OMPI progress: %s, ORTE progress: %s, Event lib: %s)",
OPAL_HAVE_SOLARIS_THREADS ? "solaris" :
(OPAL_HAVE_POSIX_THREADS ? "posix" : "type unknown"), /* "type unknown" can presumably never happen */
OMPI_ENABLE_THREAD_MULTIPLE ? "yes" : "no",
OPAL_ENABLE_MULTI_THREADS ? "yes" : "no",
OMPI_ENABLE_PROGRESS_THREADS ? "yes" : "no",
ORTE_ENABLE_PROGRESS_THREADS ? "yes" : "no",
OPAL_EVENT_HAVE_THREAD_SUPPORT ? "yes" : "no");
(void)asprintf(&threads, "%s (MPI_THREAD_MULTIPLE: %s, OPAL support: %s, OMPI progress: %s, ORTE progress: %s, Event lib: %s)",
OPAL_HAVE_SOLARIS_THREADS ? "solaris" :
(OPAL_HAVE_POSIX_THREADS ? "posix" : "type unknown"), /* "type unknown" can presumably never happen */
OMPI_ENABLE_THREAD_MULTIPLE ? "yes" : "no",
OPAL_ENABLE_MULTI_THREADS ? "yes" : "no",
OMPI_ENABLE_PROGRESS_THREADS ? "yes" : "no",
ORTE_ENABLE_PROGRESS_THREADS ? "yes" : "no",
OPAL_EVENT_HAVE_THREAD_SUPPORT ? "yes" : "no");
} else {
threads = strdup("no");
}
asprintf(&ft_support, "%s (checkpoint thread: %s)",
OPAL_ENABLE_FT ? "yes" : "no", OPAL_ENABLE_FT_THREAD ? "yes" : "no");;
(void)asprintf(&ft_support, "%s (checkpoint thread: %s)",
OPAL_ENABLE_FT ? "yes" : "no", OPAL_ENABLE_FT_THREAD ? "yes" : "no");
asprintf(&crdebug_support, "%s",
OPAL_ENABLE_CRDEBUG ? "yes" : "no");
(void)asprintf(&crdebug_support, "%s",
OPAL_ENABLE_CRDEBUG ? "yes" : "no");
/* output values */
opal_info_out("Configured by", "config:user", OPAL_CONFIGURE_USER);

6
ompi/tools/ompi_info/version.c
Просмотреть файл

@ -122,7 +122,7 @@ void ompi_info_show_ompi_version(const char *scope)
char *tmp, *tmp2;
opal_info_out("Package", "package", OPAL_PACKAGE_STRING);
asprintf(&tmp, "%s:version:full", ompi_info_type_ompi);
(void)asprintf(&tmp, "%s:version:full", ompi_info_type_ompi);
tmp2 = opal_info_make_version_str(scope,
OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION,
OMPI_RELEASE_VERSION,
@ -131,10 +131,10 @@ void ompi_info_show_ompi_version(const char *scope)
opal_info_out("Open MPI", tmp, tmp2);
free(tmp);
free(tmp2);
asprintf(&tmp, "%s:version:repo", ompi_info_type_ompi);
(void)asprintf(&tmp, "%s:version:repo", ompi_info_type_ompi);
opal_info_out("Open MPI repo revision", tmp, OMPI_REPO_REV);
free(tmp);
asprintf(&tmp, "%s:version:release_date", ompi_info_type_ompi);
(void)asprintf(&tmp, "%s:version:release_date", ompi_info_type_ompi);
opal_info_out("Open MPI release date", tmp, OMPI_RELEASE_DATE);
free(tmp);