Commit c66338ae authored by Christian Gomez's avatar Christian Gomez

Updated to latest from public BETA.

parent 3f4bc6b8
This diff is collapsed.
......@@ -119,16 +119,23 @@ sub install_fastfabric
}
my $rpmfile = rpm_resolve("$srcdir/RPMS/*/", "any", "opa-fastfabric");
rpm_run_install($rpmfile, "any", "-U");
rpm_run_install($rpmfile, "any", " -U ");
check_dir("/opt/opa/tools");
check_dir("/opt/opa/samples");
system "chmod ug+x $ROOT/opt/opa/samples/hostverify.sh";
system "rm -f $ROOT/opt/opa/samples/nodeverify.sh";
preserve_prev_rpm_conf("$FF_TLS_CONF_FILE");
check_rpm_config_file("$FF_TLS_CONF_FILE");
printf("Default opaff.xml can be found in '/opt/opa/samples/opaff.xml-sample'\n");
preserve_prev_rpm_conf("$OPA_CONFIG_DIR/opamon.conf");
check_rpm_config_file("$CONFIG_DIR/opa/opamon.conf");
check_rpm_config_file("$CONFIG_DIR/opa/opafastfabric.conf");
check_rpm_config_file("$CONFIG_DIR/opa/allhosts");
check_rpm_config_file("$CONFIG_DIR/opa/chassis");
check_rpm_config_file("$CONFIG_DIR/opa/hosts");
check_rpm_config_file("$CONFIG_DIR/opa/ports");
check_rpm_config_file("$CONFIG_DIR/opa/switches");
check_rpm_config_file("/opt/opa/tools/osid_wrapper");
#install_conf_file("$ComponentInfo{'fastfabric'}{'Name'}", "$FF_TLS_CONF_FILE", "$srcdir/fastfabric/tools/tls");
#remove_conf_file("$ComponentInfo{'fastfabric'}{'Name'}", "$OPA_CONFIG_DIR/iba_stat.conf");
......
This diff is collapsed.
......@@ -124,10 +124,11 @@ sub install_oftools
check_dir("/opt/opa/samples");
my $rpmfile = rpm_resolve("$srcdir/RPMS/*/", "any", "opa-basic-tools");
rpm_run_install($rpmfile, "any", "-U");
rpm_run_install($rpmfile, "any", " -U ");
$rpmfile = rpm_resolve("$srcdir/RPMS/*/", "any", "opa-address-resolution");
rpm_run_install($rpmfile, "any", "-U");
rpm_run_install($rpmfile, "any", " -U ");
check_rpm_config_file("/etc/rdma/dsap.conf");
# we copy version file here for both fastfabric and oftools
copy_data_file("$srcdir/version", "$BASE_DIR/version_ff");
......
......@@ -70,7 +70,7 @@ sub install_generic_mpi
# enable this code if mpitests is missing for some compilers or MPIs
#my $mpitests_rpmfile = rpm_resolve("$srcdir/OtherMPIs", "any", "mpitests_$mpifullname");
#if ( "$mpitests_rpmfile" ne "" && -e "$mpitests_rpmfile" ) {
rpm_install_list ("$srcdir", "user", @list);
rpm_install_list_with_options ("$srcdir", "user", " -U --nodeps ", @list);
#} else {
# rpm_install("$srcdir/OtherMPIs", "user", "$mpifullname");
#}
......@@ -213,7 +213,11 @@ sub need_reinstall_openmpi_gcc_hfi
# has proper dependent rpms installed.
sub check_os_prereqs_openmpi_gcc_hfi
{
return rpm_check_os_prereqs("openmpi_gcc_hfi", "user", ( "libstdc++"));
if (lc($CUR_DISTRO_VENDOR) eq "redhat") {
return rpm_check_os_prereqs("openmpi_gcc_hfi", "user", ( "libstdc++", "infinipath-psm" ));
} else {
return rpm_check_os_prereqs("openmpi_gcc_hfi", "user", ( "libstdc++", "libpsm_infinipath1" ));
}
}
# called for all components before they are installed. Use
......@@ -335,7 +339,11 @@ sub need_reinstall_openmpi_intel_hfi
sub check_os_prereqs_openmpi_intel_hfi
{
# we allow this to install even if intel compiler runtime not available
return rpm_check_os_prereqs("openmpi_intel_hfi", "user", ( "libstdc++"));
if (lc($CUR_DISTRO_VENDOR) eq "redhat") {
return rpm_check_os_prereqs("openmpi_intel_hfi", "user", ( "libstdc++", "infinipath-psm" ));
} else {
return rpm_check_os_prereqs("openmpi_intel_hfi", "user", ( "libstdc++", "libpsm_infinipath1" ));
}
}
# called for all components before they are installed. Use
......@@ -457,7 +465,11 @@ sub need_reinstall_openmpi_pgi_hfi
sub check_os_prereqs_openmpi_pgi_hfi
{
# we allow this to install even if pgi compiler runtime not available
return rpm_check_os_prereqs("openmpi_pgi_hfi", "user", ( "libstdc++"));
if (lc($CUR_DISTRO_VENDOR) eq "redhat") {
return rpm_check_os_prereqs("openmpi_pgi_hfi", "user", ( "libstdc++", "infinipath-psm" ));
} else {
return rpm_check_os_prereqs("openmpi_pgi_hfi", "user", ( "libstdc++", "libpsm_infinipath1" ));
}
}
# called for all components before they are installed. Use
......
......@@ -154,9 +154,10 @@ sub install_opafm
rpm_run_install($rpmfile, "user", "-U");
$rpmfile = rpm_resolve("$srcdir/RPMS/*/", "user", "opa-fm-debuginfo");
if ($rpmfile) {
rpm_run_install($rpmfile, "user", "-U");
rpm_run_install($rpmfile, "user", " -U ");
}
check_rpm_config_file("$CONFIG_DIR/opafm.xml");
check_dir("/opt/opa");
copy_systool_file("$srcdir/comp.pl", "/opt/opa/.comp_opafm.pl");
......@@ -180,7 +181,6 @@ sub uninstall_opafm
my $install_list = $_[0]; # total that will be left installed when done
my $uninstalling_list = $_[1]; # what items are being uninstalled
my $driver_subdir=$ComponentInfo{'qlgc_fm'}{'DriverSubdir'};
my $driver_subdir=$ComponentInfo{'opafm'}{'DriverSubdir'};
NormalPrint("Uninstalling $ComponentInfo{'opafm'}{'Name'}...\n");
......
......@@ -46,7 +46,6 @@ Usage()
echo "" >&2
echo "Environment:" >&2
echo " STACK_PREFIX - where to find IB stack." >&2
echo " Default obtained from /etc/infiniband/info, typically /usr" >&2
echo " BUILD_DIR - temporary directory to use during build of MPI" >&2
echo " Default is /var/tmp/Intel-mvapich or /var/tmp/Intel-mvapich2" >&2
echo " or /var/tmp/Intel-openmpi" >&2
......
......@@ -103,7 +103,6 @@ Usage()
echo "" >&2
echo "Environment:" >&2
echo " STACK_PREFIX - where to find IB stack." >&2
echo " Default obtained from /etc/infiniband/info, typically /usr" >&2
echo " BUILD_DIR - temporary directory to use during build of MPI" >&2
echo " Default is /var/tmp/Intel-mvapich2" >&2
echo " MPICH_PREFIX - selects location for installed MPI" >&2
......@@ -279,11 +278,7 @@ interface=verbs
if [ "$skip_prompt" == "n" -a "$Qflag" == "n" -a "$Oflag" == "n" ]
then
echo
# only have a choice if psm or dapl is installed
if rpm -qa|grep dapl >/dev/null 2>&1
then
choices+=("udapl")
fi
# only have a choice if psm is installed
if rpm -qa|grep infinipath-devel >/dev/null 2>&1
then
choices+=("ts-psm")
......@@ -302,9 +297,6 @@ then
ofa)
interface=verbs
break;;
udapl)
interface=udapl
break;;
ts-psm)
interface=psm
Qflag=y
......@@ -332,15 +324,10 @@ case $interface in
mvapich2_path_suffix=
mvapich2_rpm_suffix=
;;
udapl)
mvapich2_conf_impl_define="impl $mvapich2_conf_impl"
mvapich2_path_suffix=
mvapich2_rpm_suffix=
PREREQ+=("dapl-devel")
;;
psm)
mvapich2_conf_impl=psm
mvapich2_conf_impl_define="channel ch3:psm"
# mvapich2_conf_impl_define="channel ch3:psm"
mvapich2_conf_impl_define="impl psm2"
mvapich2_conf_psm=
if [ "$Oflag" == "y" ]
then
......@@ -397,37 +384,6 @@ else
fi
done
fi
if [ "$mvapich2_conf_impl" = "udapl" ]
then
PS3="Cluster Size: "
select mvapich2_conf_vcluster in small medium large
do
case "$mvapich2_conf_vcluster" in
small|medium|large) break;;
esac
done
PS3="I/O Bus: "
select mvapich2_conf_io_bus in PCI_EX PCI_X
do
case "$mvapich2_conf_io_bus" in
PCI_EX|PCI_X) break;;
esac
done
if [ "$mvapich2_conf_io_bus" = "PCI_EX" ]
then
PS3="IB Link Speed: "
select mvapich2_conf_link_speed in SDR DDR
do
case "$mvapich2_conf_link_speed" in
SDR|DDR) break;;
esac
done
else
mvapich2_conf_link_speed=SDR
fi
echo -n "Default DAPL provider []: "
read mvapich2_conf_dapl_provider
fi
fi
if [ "$ARCH" = "PPC64" -a \
......@@ -453,9 +409,7 @@ fi
logfile=make.mvapich2.$interface.$compiler
(
prefix=$(/etc/infiniband/info 2>/dev/null|grep '^prefix='|cut -f2 -d=)
STACK_PREFIX=${STACK_PREFIX:-"$prefix"}
STACK_PREFIX=${STACK_PREFIX:-/usr} # just in case $prefix not defined
STACK_PREFIX=${STACK_PREFIX:-/usr}
BUILD_DIR=${BUILD_DIR:-/var/tmp/Intel-mvapich2}
BUILD_ROOT="$BUILD_DIR/build";
RPM_DIR="$BUILD_DIR/OFEDRPMS";
......@@ -610,25 +564,6 @@ logfile=make.mvapich2.$interface.$compiler
cmd="$cmd --define 'blcr_include --with-blcr-include=$mvapich2_conf_blcr_home/include' \
--define 'blcr_libpath --with-blcr-libpath=$mvapich2_conf_blcr_home/lib'"
fi
elif [ "$mvapich2_conf_impl" = "udapl" ]
then
if [ "$ARCH" = "PPC64" -o "$ARCH" = "X86_64" ]
then
mvapich2_dat_lib="$STACK_PREFIX/lib64";
elif [ -d "$STACK_PREFIX/lib" ]
then
mvapich2_dat_lib="$STACK_PREFIX/lib";
fi
cmd="$cmd --define 'rdma --with-rdma=udapl' \
--define 'dapl_include --with-dapl-include=$STACK_PREFIX/include' \
--define 'dapl_libpath --with-dapl-libpath=$mvapich2_dat_lib' \
--define 'cluster_size --with-cluster-size=$mvapich2_conf_vcluster' \
--define 'io_bus --with-io-bus=$mvapich2_conf_io_bus' \
--define 'link_speed --with-link=$mvapich2_conf_link_speed'"
if [ "$mvapich2_conf_dapl_provider" != "" ]
then
cmd="$cmd --define 'dapl_provider --with-dapl-provider=$mvapich2_conf_dapl_provider'"
fi
elif [ "$mvapich2_conf_impl" = "psm" ]
then
# no special args needed
......@@ -655,9 +590,7 @@ logfile=make.mvapich2.$interface.$compiler
echo "=========================================================="
echo "Installing MVAPICH2 MPI $mvapich2_version Library/Tools..."
rpmfile=$RPM_DIR/RPMS/$target_cpu/mvapich2_$compiler$mvapich2_rpm_suffix-$mvapich2_fullversion.$target_cpu.rpm
# make sure old files are removed first
rm -rf $INSTALL_ROOT/$MPICH_PREFIX
# need force for reinstall case
if [ x"$INSTALL_ROOT" != x"" -a x"$INSTALL_ROOT" != x"/" ]
then
......
......@@ -103,7 +103,6 @@ Usage()
echo "" >&2
echo "Environment:" >&2
echo " STACK_PREFIX - where to find IB stack." >&2
echo " Default obtained from /etc/infiniband/info, typically /usr" >&2
echo " BUILD_DIR - temporary directory to use during build of MPI" >&2
echo " Default is /var/tmp/Intel-openmpi" >&2
echo " MPICH_PREFIX - selects location for installed MPI" >&2
......@@ -347,9 +346,7 @@ fi
logfile=make.openmpi.$interface.$compiler
(
prefix=$(/etc/infiniband/info 2>/dev/null|grep '^prefix='|cut -f2 -d=)
STACK_PREFIX=${STACK_PREFIX:-"$prefix"}
STACK_PREFIX=${STACK_PREFIX:-/usr} # just in case $prefix not defined
STACK_PREFIX=${STACK_PREFIX:-/usr}
BUILD_DIR=${BUILD_DIR:-/var/tmp/Intel-openmpi}
BUILD_ROOT="$BUILD_DIR/build";
RPM_DIR="$BUILD_DIR/OFEDRPMS";
......@@ -433,7 +430,7 @@ logfile=make.openmpi.$interface.$compiler
case "$compiler" in
gcc)
openmpi_comp_env="$openmpi_comp_env CC=gcc"
openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS=-O3"
if have_comp g++
then
openmpi_comp_env="$openmpi_comp_env CXX=g++"
......@@ -562,7 +559,7 @@ logfile=make.openmpi.$interface.$compiler
--define '_defaultdocdir $MPICH_PREFIX' \
--define '_mandir %{_prefix}/share/man' \
--define 'mflags -j 4' \
--define 'configure_options $CONFIG_OPTIONS $openmpi_ldflags --with-verbs=$STACK_PREFIX --with-verbs-libdir=$STACK_PREFIX/$openmpi_lib $openmpi_comp_env $openmpi_conf_psm --with-contrib-vt-flags=--disable-iotrace' \
--define 'configure_options $CONFIG_OPTIONS $openmpi_ldflags --with-verbs=$STACK_PREFIX --with-verbs-libdir=$STACK_PREFIX/$openmpi_lib $openmpi_comp_env $openmpi_conf_psm --with-contrib-vt-flags=--disable-iotrace --with-devel-headers' \
--define 'use_default_rpm_opt_flags $use_default_rpm_opt_flags' \
$disable_auto_requires"
cmd="$cmd \
......@@ -582,8 +579,7 @@ logfile=make.openmpi.$interface.$compiler
echo "=========================================================="
echo "Installing OpenMPI MPI $openmpi_version Library/Tools..."
rpmfile=$RPM_DIR/RPMS/$target_cpu/openmpi_$compiler$openmpi_rpm_suffix-$openmpi_fullversion.$target_cpu.rpm
# make sure old files are removed first
rm -rf $INSTALL_ROOT/$MPICH_PREFIX
# need force for reinstall case
if [ x"$INSTALL_ROOT" != x"" -a x"$INSTALL_ROOT" != x"/" ]
then
......
This diff is collapsed.
This diff is collapsed.
......@@ -50,7 +50,7 @@ my $FirstIPoIBInterface=0; # first device is ib0
# Names of supported install components
# must be listed in depdency order such that prereqs appear 1st
@Components = ( "ib_stack", "ofed_mlx4", "ib_stack_dev", "ofed_ipoib",
@Components = ( "opa_stack", "ofed_mlx4", "opa_stack_dev", "ofed_ipoib",
"ofed_ib_bonding", "mpi_selector",
"mvapich2", "openmpi", "ofed_mpisrc", "ofed_udapl", "ofed_rds",
"ofed_srp", "ofed_srpt", "ofed_iser",
......@@ -114,28 +114,28 @@ $WrapperComponent = "";
# Name, PreReq (should reference only components), HasStart, StartPreReq,
# DefaultStart
%ComponentInfo = (
"ib_stack" => { Name => "OFED IB Stack",
"opa_stack" => { Name => "OFED OPA Stack",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "updates",
PreReq => "", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 1, HasFirmware => 0, DefaultStart => 1,
StartPreReq => "",
StartComponents => [ "ib_stack" ],
StartComponents => [ "opa_stack" ],
},
"ofed_mlx4" => { Name => "OFED mlx4 Driver",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "updates",
PreReq => " ib_stack ", CoReq => "",
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 1, HasFirmware => 0, DefaultStart => 1,
StartPreReq => " ib_stack ",
StartPreReq => " opa_stack ",
StartComponents => [ "ofed_mlx4" ],
},
"ib_stack_dev" => { Name => "OFED IB Development",
"opa_stack_dev" => { Name => "OFED IB Development",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " ib_stack ", CoReq => "",
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 0, HasFirmware => 0, DefaultStart => 0,
StartPreReq => "",
......@@ -144,16 +144,16 @@ $WrapperComponent = "";
"ofed_ipoib" => { Name => "OFED IP over IB",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "updates",
PreReq => " ib_stack ", CoReq => "",
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 1, HasFirmware => 0, DefaultStart => 1,
StartPreReq => " ib_stack ",
StartPreReq => " opa_stack ",
StartComponents => [ "ofed_ipoib" ],
},
"ofed_ib_bonding" => { Name => "OFED IB Bonding",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " ib_stack ofed_ipoib ", CoReq => "",
PreReq => " opa_stack ofed_ipoib ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 0, HasFirmware => 0, DefaultStart => 0,
StartPreReq => "",
......@@ -162,16 +162,16 @@ $WrapperComponent = "";
"ofed_rds" => { Name => "OFED RDS",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "updates",
PreReq => " ib_stack ofed_ipoib ", CoReq => "",
PreReq => " opa_stack ofed_ipoib ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 1, HasFirmware => 0, DefaultStart => 1,
StartPreReq => " ib_stack ",
StartPreReq => " opa_stack ",
StartComponents => [ "ofed_rds" ],
},
"ofed_udapl" => { Name => "OFED uDAPL",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " ib_stack ofed_ipoib ", CoReq => "",
PreReq => " opa_stack ofed_ipoib ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 0, HasFirmware => 0, DefaultStart => 0,
StartPreReq => "",
......@@ -180,7 +180,7 @@ $WrapperComponent = "";
"mpi_selector" => { Name => "MPI selector",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " ib_stack ", CoReq => "",
PreReq => " opa_stack ", CoReq => "",
Hidden => 1, Disabled => 0,
HasStart => 0, HasFirmware => 0, DefaultStart => 0,
StartPreReq => "",
......@@ -189,7 +189,7 @@ $WrapperComponent = "";
"mvapich2" => { Name => "MVAPICH2 for gcc",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " ib_stack mpi_selector ", CoReq => "",
PreReq => " opa_stack mpi_selector ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 0, HasFirmware => 0, DefaultStart => 0,
StartPreReq => "",
......@@ -198,7 +198,7 @@ $WrapperComponent = "";
"openmpi" => { Name => "OpenMPI for gcc",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " ib_stack mpi_selector ", CoReq => "",
PreReq => " opa_stack mpi_selector ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 0, HasFirmware => 0, DefaultStart => 0,
StartPreReq => "",
......@@ -207,7 +207,7 @@ $WrapperComponent = "";
"ofed_mpisrc" =>{ Name => "MPI Source",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " ib_stack ib_stack_dev mpi_selector ", CoReq => "",
PreReq => " opa_stack opa_stack_dev mpi_selector ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 0, HasFirmware => 0, DefaultStart => 0,
StartPreReq => "",
......@@ -216,52 +216,52 @@ $WrapperComponent = "";
"ofed_srp" => { Name => "OFED SRP",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "updates",
PreReq => " ib_stack ", CoReq => "",
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 1, HasFirmware => 0, DefaultStart => 1,
StartPreReq => " ib_stack ",
StartPreReq => " opa_stack ",
StartComponents => [ "ofed_srp" ],
},
"ofed_srpt" => { Name => "OFED SRP Target",
DefaultInstall => $State_DoNotAutoInstall,
SrcDir => ".", DriverSubdir => "updates",
PreReq => " ib_stack ", CoReq => "",
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 1, HasFirmware => 0, DefaultStart => 1,
StartPreReq => " ib_stack ",
StartPreReq => " opa_stack ",
StartComponents => [ "ofed_srpt" ],
},
"ofed_iser" => { Name => "OFED iSER",
DefaultInstall => $State_DoNotInstall,
SrcDir => ".", DriverSubdir => "updates",
PreReq => " ib_stack ", CoReq => "",
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 1, HasFirmware => 0, DefaultStart => 1,
StartPreReq => " ib_stack ",
StartPreReq => " opa_stack ",
StartComponents => [ "ofed_iser" ],
},
"ofed_iwarp" => { Name => "OFED iWARP",
DefaultInstall => $State_DoNotAutoInstall,
SrcDir => ".", DriverSubdir => "updates",
PreReq => " ib_stack ", CoReq => "",
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 1, HasFirmware => 0, DefaultStart => 1,
StartPreReq => " ib_stack ",
StartPreReq => " opa_stack ",
StartComponents => [ "ofed_iwarp" ],
},
"opensm" => { Name => "OFED Open SM",
DefaultInstall => $State_DoNotInstall,
SrcDir => ".", DriverSubdir => "",
PreReq => " ib_stack ", CoReq => "",
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 1, HasFirmware => 0, DefaultStart => 0,
StartPreReq => " ib_stack ",
StartPreReq => " opa_stack ",
StartComponents => [ "opensm" ],
},
"ofed_nfsrdma" =>{ Name => "OFED NFS RDMA",
DefaultInstall => $State_DoNotAutoInstall,
SrcDir => ".", DriverSubdir => "updates",
PreReq => " ib_stack ofed_ipoib ", CoReq => "",
PreReq => " opa_stack ofed_ipoib ", CoReq => "",
# for now, skip startup option for nfs and nfslock
Hidden => 0, Disabled => 0,
HasStart => 0, HasFirmware => 0, DefaultStart => 0,
......@@ -271,7 +271,7 @@ $WrapperComponent = "";
"ofed_debug" => { Name => "OFED Debug Info",
DefaultInstall => $State_DoNotInstall,
SrcDir => ".", DriverSubdir => "",
PreReq => " ib_stack ", CoReq => "",
PreReq => " opa_stack ", CoReq => "",
Hidden => 0, Disabled => 0,
HasStart => 0, HasFirmware => 0, DefaultStart => 0,
StartPreReq => "",
......@@ -280,7 +280,7 @@ $WrapperComponent = "";
);
# translate from startup script name to component/subcomponent name
%StartupComponent = (
"openibd" => "ib_stack",
"openibd" => "opa_stack",
"opensmd" => "opensm",
"ipoib" => "ipoib",
"udapl" => "udapl",
......@@ -289,9 +289,9 @@ $WrapperComponent = "";
);
# has component been loaded since last configured autostart
%ComponentWasInstalled = (
"ib_stack" => 0,
"opa_stack" => 0,
"ofed_mlx4" => 0,
"ib_stack_dev" => 0,
"opa_stack_dev" => 0,
"ofed_ipoib" => 0,
"ofed_ib_bonding" => 0,
"ofed_rds" => 0,
......
......@@ -128,7 +128,7 @@ $WrapperComponent = "opa_config_omnipath";
StartPreReq => "",
StartComponents => [ ],
},
"mvapich2_gcc_hfi" => { Name => "MVAPICH2 (hfi, gcc)",
"mvapich2_gcc_hfi" => { Name => "MVAPICH2 (hfi,gcc)",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " intel_hfi ", CoReq => "",
......@@ -137,7 +137,7 @@ $WrapperComponent = "opa_config_omnipath";
StartPreReq => "",
StartComponents => [ ],
},
"mvapich2_pgi_hfi" => { Name => "MVAPICH2 (hfi, PGI)",
"mvapich2_pgi_hfi" => { Name => "MVAPICH2 (hfi,PGI)",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " intel_hfi ", CoReq => "",
......@@ -146,7 +146,7 @@ $WrapperComponent = "opa_config_omnipath";
StartPreReq => "",
StartComponents => [ ],
},
"mvapich2_intel_hfi" => { Name => "MVAPICH2 (hfi, Intel)",
"mvapich2_intel_hfi" => { Name => "MVAPICH2 (hfi,Intel)",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " intel_hfi ", CoReq => "",
......@@ -155,7 +155,7 @@ $WrapperComponent = "opa_config_omnipath";
StartPreReq => "",
StartComponents => [ ],
},
"openmpi_gcc_hfi" => { Name => "OpenMPI (hfi, gcc)",
"openmpi_gcc_hfi" => { Name => "OpenMPI (hfi,gcc)",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " intel_hfi ", CoReq => "",
......@@ -164,7 +164,7 @@ $WrapperComponent = "opa_config_omnipath";
StartPreReq => "",
StartComponents => [ ],
},
"openmpi_pgi_hfi" => { Name => "OpenMPI (hfi, PGI)",
"openmpi_pgi_hfi" => { Name => "OpenMPI (hfi,PGI)",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " intel_hfi ", CoReq => "",
......@@ -173,7 +173,7 @@ $WrapperComponent = "opa_config_omnipath";
StartPreReq => "",
StartComponents => [ ],
},
"openmpi_intel_hfi" => { Name => "OpenMPI (hfi, Intel)",
"openmpi_intel_hfi" => { Name => "OpenMPI (hfi,Intel)",
DefaultInstall => $State_Install,
SrcDir => ".", DriverSubdir => "",
PreReq => " intel_fhi ", CoReq => "",
......@@ -328,7 +328,7 @@ sub verify_distrib
sub Usage
{
if ( $allow_install ) {
printf STDERR "Usage: $0 [-r root] [-v|-vv] [-a|-U|-u|-i comp|-e comp] [--without-depcheck] [--force] [--answer keyword=value]\n";
printf STDERR "Usage: $0 [-r root] [-v|-vv] [-a|-U|-u|-O|-N|-i comp|-e comp] [--without-depcheck] [--force] [--answer keyword=value]\n";
} else {
printf STDERR "Usage: $0 [-r root] [-v|-vv] [-u|-e comp] [--answer keyword=value]\n";
}
......@@ -347,6 +347,8 @@ sub Usage
printf STDERR " --without-depcheck - disable check of OS dependencies\n";
printf STDERR " --force - force install even if distos don't match\n";
printf STDERR " Use of this option can result in undefined behaviors\n";
printf STDERR " -O - Keep current modified rpm config file\n";
printf STDERR " -N - Use new default rpm config file\n";
}
printf STDERR " -u - uninstall all ULPs and drivers with default options\n";
#printf STDERR " -s - enable autostart for all installed drivers\n";
......@@ -517,6 +519,12 @@ sub process_args
} elsif ( "$arg" eq "-U" ) {
$Default_Upgrade=1;
$Default_SameAutostart=1;
} elsif ("$arg" eq "-O") {
$Default_RpmConfigKeepOld=1;
$Default_RpmConfigUseNew=0;