Remove the setup_hadoop configure script as it is no longer required - the hadoop support components can build without accessing hadoop itself.
This commit was SVN r27385.
Этот коммит содержится в:
Ralph Castain
родитель
2352c75d16
Коммит
04304c186f
@ -560,14 +560,6 @@ m4_ifdef([project_orte], [ORTE_SETUP_JAVA])
|
||||
# Only needed for OMPI
|
||||
m4_ifdef([project_ompi], [OMPI_SETUP_JAVA_BINDINGS])
|
||||
|
||||
##################################
|
||||
# Hadoop support
|
||||
##################################
|
||||
|
||||
# We can't use Hadoop support unless we're building ORTE
|
||||
m4_ifdef([project_orte], [ORTE_SETUP_HADOOP])
|
||||
|
||||
|
||||
##################################
|
||||
# Assembler Configuration
|
||||
##################################
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
dnl -*- shell-script -*-
|
||||
dnl
|
||||
dnl Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
# This macro is necessary to get the title to be displayed first. :-)
|
||||
AC_DEFUN([ORTE_SETUP_HADOOP_BANNER],[
|
||||
ompi_show_subtitle "HADOOP class libraries"
|
||||
])
|
||||
|
||||
# ORTE_SETUP_HADOOP()
|
||||
# ----------------
|
||||
# Do everything required to setup the HADOOP libraries. Safe to AC_REQUIRE
|
||||
# this macro.
|
||||
AC_DEFUN([ORTE_SETUP_HADOOP],[
|
||||
AC_REQUIRE([ORTE_SETUP_HADOOP_BANNER])
|
||||
|
||||
AC_MSG_CHECKING([if want Hadoop support])
|
||||
AC_ARG_ENABLE(hadoop,
|
||||
AC_HELP_STRING([--enable-hadoop],
|
||||
[Enable Hadoop support - path to Hadoop taken from environment]))
|
||||
|
||||
# Collect the jars
|
||||
ORTE_HAVE_HADOOP_SERIES_1=0
|
||||
ORTE_HAVE_HADOOP_SERIES_2=0
|
||||
|
||||
# Only build the Hadoop support if requested
|
||||
if test "$enable_hadoop" == "yes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
orte_enable_hadoop_support=0
|
||||
# if this is Hadoop 2.x, we will find a share/hadoop/common
|
||||
# directory under the location given in the environ
|
||||
AC_MSG_CHECKING([for Hadoop 2.0 commons directory])
|
||||
AS_IF([test "x$HADOOP_COMMON_HOME" != "x" -a -d "$HADOOP_COMMON_HOME/share/hadoop/common"],
|
||||
[AC_MSG_RESULT([found])
|
||||
orte_enable_hadoop_support=1
|
||||
ORTE_HAVE_HADOOP_SERIES_2=1],
|
||||
[AC_MSG_RESULT([not found])
|
||||
# check instead for Hadoop 1.0.2
|
||||
AC_MSG_CHECKING([for Hadoop 1.0.2])
|
||||
AS_IF([test "x$HADOOP_HOME" != "x" -a -f "$HADOOP_HOME/hadoop-core-1.0.2.jar"],
|
||||
[AC_MSG_RESULT([found])
|
||||
orte_enable_hadoop_support=1
|
||||
ORTE_HAVE_HADOOP_SERIES_1=1],
|
||||
[AC_MSG_RESULT([not found])
|
||||
AC_MSG_WARN([HADOOP support requested but supported version not found])
|
||||
AC_MSG_ERROR([Cannot continue])])])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
orte_enable_hadoop_support=0
|
||||
fi
|
||||
|
||||
AC_SUBST([ORTE_HAVE_HADOOP_SERIES_1])
|
||||
|
||||
AC_DEFINE_UNQUOTED([ORTE_WANT_HADOOP_SUPPORT], [$orte_enable_hadoop_support],
|
||||
[do we want hadoop support])
|
||||
AM_CONDITIONAL(ORTE_WANT_HADOOP_SUPPORT, test "$orte_enable_hadoop_support" = "1")
|
||||
|
||||
AM_CONDITIONAL(ORTE_HAVE_HADOOP_SERIES1, test "$ORTE_HAVE_HADOOP_SERIES_1" = "1")
|
||||
AC_DEFINE_UNQUOTED([ORTE_HAVE_HADOOP_SERIES1], [$ORTE_HAVE_HADOOP_SERIES_1],
|
||||
[do we have MRV1])
|
||||
|
||||
AM_CONDITIONAL(ORTE_HAVE_HADOOP_SERIES2, test "$ORTE_HAVE_HADOOP_SERIES_2" = "1")
|
||||
AC_DEFINE_UNQUOTED([ORTE_HAVE_HADOOP_SERIES2], [$ORTE_HAVE_HADOOP_SERIES_2],
|
||||
[do we have MRV2])
|
||||
])
|
||||
@ -75,19 +75,13 @@ static int filem_raw_query(mca_base_module_t **module, int *priority)
|
||||
{
|
||||
*priority = 0;
|
||||
|
||||
/* only select when requested, and never for an APP */
|
||||
/* never for an APP */
|
||||
if (ORTE_PROC_IS_APP) {
|
||||
*module = NULL;
|
||||
return ORTE_ERROR;
|
||||
}
|
||||
|
||||
#if ORTE_WANT_HADOOP_SUPPORT
|
||||
/* always use us if Hadoop is enabled */
|
||||
*priority = 1000;
|
||||
/* always flatten directory trees for Hadoop */
|
||||
orte_filem_raw_flatten_trees = true;
|
||||
#endif
|
||||
|
||||
/* otherwise, use if selected */
|
||||
*module = (mca_base_module_t*) &mca_filem_raw_module;
|
||||
return ORTE_SUCCESS;
|
||||
}
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
# -*- shell-script -*-
|
||||
#
|
||||
# Copyright (c) 2012 Los Alamos National Security, LLC.
|
||||
# All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
# MCA_iof_mr_hnp_CONFIG([action-if-found], [action-if-not-found])
|
||||
# -----------------------------------------------------------
|
||||
AC_DEFUN([MCA_orte_iof_mr_hnp_CONFIG], [
|
||||
AC_CONFIG_FILES([orte/mca/iof/mr_hnp/Makefile])
|
||||
|
||||
AS_IF([test "$orte_enable_hadoop_support" = 1 -a "$orte_without_full_support" = 0],
|
||||
[$1],
|
||||
[$2])
|
||||
])
|
||||
@ -1,19 +0,0 @@
|
||||
# -*- shell-script -*-
|
||||
#
|
||||
# Copyright (c) 2012 Los Alamos National Security, LLC.
|
||||
# All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
# MCA_iof_mr_orted_CONFIG([action-if-found], [action-if-not-found])
|
||||
# -----------------------------------------------------------
|
||||
AC_DEFUN([MCA_orte_iof_mr_orted_CONFIG], [
|
||||
AC_CONFIG_FILES([orte/mca/iof/mr_orted/Makefile])
|
||||
|
||||
AS_IF([test "$orte_enable_hadoop_support" = 1 -a test "$orte_without_full_support" = 0],
|
||||
[$1],
|
||||
[$2])
|
||||
])
|
||||
Загрузка…
Ссылка в новой задаче
Block a user