Skip to content

Commit

Permalink
Update to latest from build 10.4.0.0.173 (IFS 10.4.0.0.185)
Browse files Browse the repository at this point in the history
  • Loading branch information
Scott Breyer committed Mar 10, 2017
1 parent cdf9d50 commit 288d6d3
Show file tree
Hide file tree
Showing 163 changed files with 12,537 additions and 10,381 deletions.
158 changes: 97 additions & 61 deletions CommonInstall/comp_delta.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
my %opa_stack_dev_rhel73_comp_info = (
'opa_stack_dev' => {
KernelRpms => [ ],
UserRpms => [ ],
UserRpms => [ "ifs-kernel-updates-devel" ],
DebugRpms => [ ],
Drivers => "", # none
StartupScript => "",
Expand Down Expand Up @@ -498,6 +498,8 @@
KernelRpms => [ "kmod-ifs-kernel-updates" ], # special case
UserRpms => [ "opa-scripts",
"srptools",
"libibmad",
"infiniband-diags",
],
DebugRpms => [ "srptools-debuginfo",
],
Expand Down Expand Up @@ -544,7 +546,8 @@
my %opa_stack_sles12_sp2_comp_info = (
'opa_stack' => {
KernelRpms => [ "ifs-kernel-updates-kmp-default" ], # special case
UserRpms => [ "opa-scripts" ],
UserRpms => [ "opa-scripts",
"infiniband-diags" ],
DebugRpms => [ ],
Drivers => "",
StartupScript => "opa",
Expand All @@ -555,7 +558,8 @@
my %opa_stack_rhel73_comp_info = (
'opa_stack' => {
KernelRpms => [ "kmod-ifs-kernel-updates" ], # special case
UserRpms => [ "opa-scripts" ],
UserRpms => [ "opa-scripts",
"infiniband-diags" ],
DebugRpms => [ ],
Drivers => "",
StartupScript => "opa",
Expand Down Expand Up @@ -679,6 +683,7 @@
%openmpi_comp_info,
%gasnet_comp_info,
%openshmem_comp_info,
%opa_stack_dev_rhel73_comp_info,
%delta_mpisrc_comp_info,
%mpiRest_comp_info,
%hfi1_uefi_comp_info,
Expand Down Expand Up @@ -725,7 +730,7 @@
"opa-scripts", "mpi-selector", "ibacm",
"libhfi1", "libpsm2", "hfi1-diagtools-sw", "hfidiags", "hfi1-firmware", "hfi1-firmware_debug",
"mvapich2", "openmpi", "gasnet", "openshmem", "openshmem-test-suite",
"shmem-benchmarks", "srptools", "hfi1_uefi"
"shmem-benchmarks", "srptools", "libibmad", "infiniband-diags", "hfi1_uefi"
);
my @delta_user_srpms_rhel70 = (
"opa-scripts", "libibumad", "ibacm", "mpi-selector",
Expand All @@ -743,13 +748,13 @@
"opa-scripts", "mpi-selector",
"libpsm2", "hfi1-diagtools-sw", "hfidiags", "hfi1-firmware", "hfi1-firmware_debug",
"mvapich2", "openmpi", "gasnet", "openshmem", "openshmem-test-suite",
"shmem-benchmarks", "hfi1_uefi"
"shmem-benchmarks", "infiniband-diags", "hfi1_uefi"
);
my @delta_user_srpms_rhel73 = (
"opa-scripts", "mpi-selector",
"libpsm2", "hfi1-diagtools-sw", "hfidiags", "hfi1-firmware", "hfi1-firmware_debug",
"mvapich2", "openmpi", "gasnet", "openshmem", "openshmem-test-suite",
"shmem-benchmarks", "hfi1_uefi"
"shmem-benchmarks", "infiniband-diags", "hfi1_uefi"
);
my @delta_user_srpms = ( );

Expand Down Expand Up @@ -1409,6 +1414,7 @@ ($)
sub delta_rpm_install_list($$$@)
{
my $rpmdir = shift();
my $rpmdir_t;
my $osver = shift(); # OS version
my $skip_kernelib = shift(); # should compat-rdma be skipped if in package_list
my(@package_list) = @_; # package names
Expand All @@ -1417,10 +1423,14 @@ ($$$@)
# user space RPM installs
foreach my $package ( @package_list )
{
$rpmdir_t=$rpmdir;
if ($delta_rpm_info{$package}{'Available'} ) {
if ( "$delta_rpm_info{$package}{'Mode'}" eq "kernel" ) {
if ( "$CUR_VENDOR_VER" eq "ES72" || "$CUR_VENDOR_VER" eq "ES73" || "$CUR_VENDOR_VER" eq "ES122" ) {
if ( $package =~ /ifs-kernel-updates/ ) {
if ($GPU_Install == 1 ){
$rpmdir_t=$rpmdir."/CUDA";
}
next if ( $skip_kernelib);
$ret = 1;
}
Expand All @@ -1437,7 +1447,14 @@ ($$$@)
}
rpm_install_with_options($rpmdir, $osver, $package, " -U --nodeps ");
} else {
rpm_install_with_options($rpmdir, "user", $package, " -U --nodeps ");
if ( "$CUR_VENDOR_VER" eq "ES72" || "$CUR_VENDOR_VER" eq "ES73" || "$CUR_VENDOR_VER" eq "ES122" ) {
if ( $package =~ /libpsm/ ) {
if ($GPU_Install == 1 ){
$rpmdir_t=$rpmdir."/CUDA";
}
}
}
rpm_install_with_options($rpmdir_t, "user", $package, " -U --nodeps ");
}
}
}
Expand Down Expand Up @@ -1853,28 +1870,28 @@ ($$$$$)

if ("$srpm" eq "gasnet") {
$cmd .= " --define '_name gasnet_openmpi_hfi'";
$cmd .= " --define '_prefix /usr/shmem/gcc/gasnet-1.24.0-openmpi-hfi'";
$cmd .= " --define '_prefix /usr/shmem/gcc/gasnet-1.28.0-openmpi-hfi'";
$cmd .= " --define '_name gasnet_gcc_hfi'";
$cmd .= " --define 'spawner mpi'";
$cmd .= " --define 'mpi_prefix /usr/mpi/gcc/openmpi-1.8.5-hfi'";
}

if ("$srpm" eq "openshmem") {
$cmd .= " --define '_name openshmem_gcc_hfi'";
$cmd .= " --define '_prefix /usr/shmem/gcc/openshmem-1.0h-hfi'";
$cmd .= " --define 'gasnet_prefix /usr/shmem/gcc/gasnet-1.24.0-openmpi-hfi'";
$cmd .= " --define '_prefix /usr/shmem/gcc/openshmem-1.3-hfi'";
$cmd .= " --define 'gasnet_prefix /usr/shmem/gcc/gasnet-1.28.0-openmpi-hfi'";
$cmd .= " --define 'configargs --with-gasnet-threnv=seq'";
}

if ("$srpm" eq "openshmem-test-suite") {
$cmd .= " --define '_name openshmem-test-suite_gcc_hfi'";
$cmd .= " --define '_prefix /usr/shmem/gcc/openshmem-1.0h-hfi'";
$cmd .= " --define 'openshmem_prefix /usr/shmem/gcc/openshmem-1.0h-hfi'";
$cmd .= " --define '_prefix /usr/shmem/gcc/openshmem-1.3-hfi'";
$cmd .= " --define 'openshmem_prefix /usr/shmem/gcc/openshmem-1.3-hfi'";
}

if ("$srpm" eq "shmem-benchmarks") {
$cmd .= " --define '_prefix /usr/shmem/gcc/openshmem-1.0h-hfi'";
$cmd .= " --define 'openshmem_prefix /usr/shmem/gcc/openshmem-1.0h-hfi'";
$cmd .= " --define '_prefix /usr/shmem/gcc/openshmem-1.3-hfi'";
$cmd .= " --define 'openshmem_prefix /usr/shmem/gcc/openshmem-1.3-hfi'";
}

return run_build("$srcdir $SRC_RPM $RPM_ARCH", "$srcdir", $cmd, "$resfileop");
Expand Down Expand Up @@ -2226,7 +2243,7 @@ ($$$)

my $ret = 0; # assume success
my @packages = ();
my @prev_release_rpms = ( "hfi1-psm-compat-devel","hfi1-psm","hfi1-psm-devel","hfi1-psm-debuginfo","libhfi1verbs","libhfi1verbs-devel" );
my @prev_release_rpms = ( "hfi1-psm-compat-devel","hfi1-psm","hfi1-psm-devel","hfi1-psm-debuginfo","libhfi1verbs","libhfi1verbs-devel", "ifs-kernel-updates" );

if ("$message" eq "" ) {
$message = "previous OFA Delta";
Expand Down Expand Up @@ -2631,16 +2648,24 @@ ($$)
{
my $rpmdir = shift();
my $install_list = shift(); # total that will be installed when done
my $rpmdir_t = $rpmdir;

my $driver_subdir=$ComponentInfo{'opa_stack'}{'DriverSubdir'}; # same for all delta components

if ( $install_kernel_ib_was_run) {
return;
}

$rpmdir_t = $rpmdir;
if ( "$CUR_VENDOR_VER" eq "ES72" || "$CUR_VENDOR_VER" eq "ES73" || "$CUR_VENDOR_VER" eq "ES122" ) {
if ($GPU_Install == 1 ){
$rpmdir_t=$rpmdir."/CUDA";
}
}

if(!$skip_kernel) {
foreach my $srpm ( @delta_kernel_srpms ) {
rpm_install_with_options("$rpmdir", $CUR_OS_VER, $srpm, " -U --nodeps ");
rpm_install_with_options("$rpmdir_t", $CUR_OS_VER, $srpm, " -U --nodeps ");
}
}
remove_unneeded_kernel_ib_drivers($install_list);
Expand Down Expand Up @@ -2705,7 +2730,11 @@ ()
return ( -e "$ROOT$BASE_DIR/version_delta"
&& rpm_is_installed("libibumad", "user")
&& rpm_is_installed("ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES72" || "$CUR_VENDOR_VER" eq "ES73" ) {
} elsif ( "$CUR_VENDOR_VER" eq "ES72" ) {
return ( -e "$ROOT$BASE_DIR/version_delta"
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)
|| rpm_is_installed("ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES73" ) {
return ( -e "$ROOT$BASE_DIR/version_delta"
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq 'ES122' ) {
Expand Down Expand Up @@ -2801,9 +2830,7 @@ ($$)

sub check_os_prereqs_opa_stack
{
return rpm_check_os_prereqs("opa_stack", "any", (
'pciutils', 'libstdc++ any user'
));
return rpm_check_os_prereqs("opa_stack", "any");
}

sub preinstall_opa_stack($$)
Expand Down Expand Up @@ -3474,7 +3501,7 @@ ($$)

sub check_os_prereqs_mpi_selector
{
return rpm_check_os_prereqs("mpi_selector", "any", ( "tcsh"))
return rpm_check_os_prereqs("mpi_selector", "any");
}

sub preinstall_mpi_selector($$)
Expand Down Expand Up @@ -3561,7 +3588,7 @@ ($$)

sub check_os_prereqs_mvapich2
{
return rpm_check_os_prereqs("mvapich2", "user", ( "sysfsutils", "libstdc++"));
return rpm_check_os_prereqs("mvapich2", "user");
}

sub preinstall_mvapich2($$)
Expand Down Expand Up @@ -3660,11 +3687,7 @@ ($$)

sub check_os_prereqs_openmpi
{
if (lc($CUR_DISTRO_VENDOR) eq "suse") {
return rpm_check_os_prereqs("openmpi", "user", ( "libstdc++", "opensm-libs3"));
} else {
return rpm_check_os_prereqs("openmpi", "user", ( "libstdc++"));
}
return rpm_check_os_prereqs("openmpi", "user");
}

sub preinstall_openmpi($$)
Expand Down Expand Up @@ -3811,6 +3834,11 @@ ($$)
$ComponentWasInstalled{'gasnet'}=0;
}

sub check_os_prereqs_gasnet()
{
return rpm_check_os_prereqs("gasnet", "user");
}

# ==========================================================================
# OFED openshmem for gcc installation

Expand Down Expand Up @@ -3905,6 +3933,11 @@ ($$)
$ComponentWasInstalled{'openshmem'}=0;
}

sub check_os_prereqs_openshmem
{
return rpm_check_os_prereqs("openshmem", "user");
}

# ==========================================================================
# OFED DELTA delta_mpisrc installation

Expand All @@ -3921,9 +3954,9 @@ ()
sub installed_delta_mpisrc()
{
return ((-e "$ROOT$BASE_DIR/version_delta"
&& file_glob("$ROOT/usr/lib/opa/src/MPI/mvapich*.src.rpm") ne ""
&& file_glob("$ROOT/usr/lib/opa/src/MPI/openmpi*.src.rpm") ne ""
&& file_glob("$ROOT/usr/lib/opa/src/MPI/mpitests*.src.rpm") ne ""));
&& file_glob("$ROOT/usr/src/opa/MPI/mvapich*.src.rpm") ne ""
&& file_glob("$ROOT/usr/src/opa/MPI/openmpi*.src.rpm") ne ""
&& file_glob("$ROOT/usr/src/opa/MPI/mpitests*.src.rpm") ne ""));
}

# only called if installed_delta_mpisrc is true
Expand Down Expand Up @@ -3957,10 +3990,7 @@ ($$)

sub check_os_prereqs_delta_mpisrc
{
return rpm_check_os_prereqs("delta_mpisrc", "any",
( @{ $delta_srpm_info{'mvapich'}{'BuildPrereq'}},
@{ $delta_srpm_info{'openmpi'}{'BuildPrereq'}},
@{ $delta_srpm_info{'mvapich2'}{'BuildPrereq'}} ));
return rpm_check_os_prereqs("delta_mpisrc", "any");
}

sub preinstall_delta_mpisrc($$)
Expand All @@ -3980,29 +4010,29 @@ ($$)

print_install_banner_delta_comp('delta_mpisrc');
install_delta_comp('delta_mpisrc', $install_list);
check_dir("/usr/lib/opa/src");
check_dir("/usr/lib/opa/src/MPI");
check_dir("/usr/src/opa");
check_dir("/usr/src/opa/MPI");
# remove old versions (.src.rpm and built .rpm files too)
system "rm -rf $ROOT/usr/lib/opa/src/MPI/mvapich[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/mvapich2[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/openmpi[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/mpitests[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/make.*.res 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/make.*.err 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/make.*.warn 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/.mpiinfo 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/mvapich[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/mvapich2[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/openmpi[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/mpitests[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/make.*.res 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/make.*.err 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/make.*.warn 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/.mpiinfo 2>/dev/null";

# install new versions
foreach my $srpm ( "mvapich2", "openmpi", "mpitests" ) {
my $srpmfile = file_glob("$srcdir/$SRPMS_SUBDIR/${srpm}-*.src.rpm");
if ( "$srpmfile" ne "" ) {
my $file = my_basename($srpmfile);
copy_data_file($srpmfile, "/usr/lib/opa/src/MPI/$file");
copy_data_file($srpmfile, "/usr/src/opa/MPI/$file");
}
}
copy_systool_file("$srcdir/do_build", "/usr/lib/opa/src/MPI/do_build");
copy_systool_file("$srcdir/do_mvapich2_build", "/usr/lib/opa/src/MPI/do_mvapich2_build");
copy_systool_file("$srcdir/do_openmpi_build", "/usr/lib/opa/src/MPI/do_openmpi_build");
copy_systool_file("$srcdir/do_build", "/usr/src/opa/MPI/do_build");
copy_systool_file("$srcdir/do_mvapich2_build", "/usr/src/opa/MPI/do_mvapich2_build");
copy_systool_file("$srcdir/do_openmpi_build", "/usr/src/opa/MPI/do_openmpi_build");

$ComponentWasInstalled{'delta_mpisrc'}=1;
}
Expand All @@ -4022,21 +4052,21 @@ ($$)
print_uninstall_banner_delta_comp('delta_mpisrc');

# remove old versions (.src.rpm and built .rpm files too)
system "rm -rf $ROOT/usr/lib/opa/src/MPI/mvapich2[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/openmpi[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/mpitests[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/make.*.res 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/make.*.err 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/make.*.warn 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/.mpiinfo 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/do_build 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/do_mvapich2_build 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/do_openmpi_build 2>/dev/null";
system "rm -rf $ROOT/usr/lib/opa/src/MPI/.mpiinfo 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/mvapich2[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/openmpi[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/mpitests[-_]*.rpm 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/make.*.res 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/make.*.err 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/make.*.warn 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/.mpiinfo 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/do_build 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/do_mvapich2_build 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/do_openmpi_build 2>/dev/null";
system "rm -rf $ROOT/usr/src/opa/MPI/.mpiinfo 2>/dev/null";

uninstall_delta_comp('delta_mpisrc', $install_list, $uninstalling_list, 'verbose');
system "rmdir $ROOT/usr/lib/opa/src/MPI 2>/dev/null"; # remove only if empty
system "rmdir $ROOT/usr/lib/opa/src 2>/dev/null"; # remove only if empty
system "rmdir $ROOT/usr/src/opa/MPI 2>/dev/null"; # remove only if empty
system "rmdir $ROOT/usr/src/opa 2>/dev/null"; # remove only if empty
$ComponentWasInstalled{'delta_mpisrc'}=0;
}

Expand Down Expand Up @@ -4279,6 +4309,12 @@ ($$)
uninstall_delta_comp('ibacm', $install_list, $uninstalling_list, 'verbose');
$ComponentWasInstalled{'ibacm'}=0;
}

sub check_os_prereqs_ibacm
{
return rpm_check_os_prereqs("ibacm", "user");
}

# ------------------------------------------------------------------
# subroutines for hfi1_uefi component
# ------------------------------------------------------------------
Expand Down
Loading

0 comments on commit 288d6d3

Please sign in to comment.