Skip to content

Commit

Permalink
Update to latest from build 10.10.0.0.445 (IFS 10.10.0.0.445)
Browse files Browse the repository at this point in the history
  • Loading branch information
Scott Breyer committed Oct 30, 2019
1 parent 73b52d1 commit 9e61462
Show file tree
Hide file tree
Showing 175 changed files with 24,526 additions and 24,184 deletions.
11 changes: 6 additions & 5 deletions CommonInstall/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,11 @@ CMD_TARGETS_MISC =
CLEAN_TARGETS_MISC =
CLEAN_TARGETS = $(OBJECTS) $(RSCOBJECTS) $(IDL_TARGETS) $(CLEAN_TARGETS_MISC)
# other files to remove during clobber phase
CLOBBER_TARGETS_MISC= comp_ff_of_prereq_RHEL72.pl comp_ff_of_prereq_RHEL73.pl comp_ff_of_prereq_RHEL74.pl comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl comp_ff_of_prereq_RHEL8.pl \
CLOBBER_TARGETS_MISC= comp_ff_of_prereq_RHEL72.pl comp_ff_of_prereq_RHEL73.pl comp_ff_of_prereq_RHEL74.pl comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl \
comp_ff_of_prereq_RHEL77.pl comp_ff_of_prereq_RHEL8.pl \
comp_ff_of_prereq_SLES122.pl comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl \
comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL8.pl \
comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl comp_fm_prereq_SLES15.pl comp_fm_prereq_SLES151.pl
comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL77.pl \
comp_fm_prereq_RHEL8.pl comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl comp_fm_prereq_SLES15.pl comp_fm_prereq_SLES151.pl
# sub-directory to install to within bin
BIN_SUBDIR =
# sub-directory to install to within include
Expand All @@ -126,11 +127,11 @@ INCLUDE_SUBDIR =
LOCALDEPLIBS =

FF_FILES = comp_ff_of_prereq_RHEL72.pl comp_ff_of_prereq_RHEL73.pl comp_ff_of_prereq_RHEL74.pl \
comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl comp_ff_of_prereq_RHEL8.pl \
comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl comp_ff_of_prereq_RHEL77.pl comp_ff_of_prereq_RHEL8.pl \
comp_ff_of_prereq_SLES122.pl comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl \
comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl
FM_FILES = comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl \
comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL8.pl \
comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL77.pl comp_fm_prereq_RHEL8.pl \
comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl \
comp_fm_prereq_SLES15.pl comp_fm_prereq_SLES151.pl

Expand Down
128 changes: 14 additions & 114 deletions CommonInstall/comp_delta.pl
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
my @delta_kernel_srpms_rhel74 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel75 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel76 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel77 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms_rhel8 = ( 'kmod-ifs-kernel-updates' );
my @delta_kernel_srpms = ( );

Expand Down Expand Up @@ -159,6 +160,8 @@ ($)
}
} elsif ( "$CUR_VENDOR_VER" eq "ES8" ) {
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel8 );
} elsif ( "$CUR_VENDOR_VER" eq "ES77" ) {
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel77 );
} elsif ( "$CUR_VENDOR_VER" eq "ES76" ) {
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel76 );
} elsif ( "$CUR_VENDOR_VER" eq "ES75" ) {
Expand Down Expand Up @@ -789,6 +792,9 @@ ()
} elsif ( "$CUR_VENDOR_VER" eq "ES8" ) {
return ( has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES77" ) {
return ( has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES76" ) {
return ( has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
Expand Down Expand Up @@ -896,6 +902,10 @@ ($$)
return preinstall_delta("opa_stack", $install_list, $installing_list);
}

my $arptbl_tunning = "ARPTABLE_TUNING";
my $arptbl_tunning_desc = 'Adjust kernel ARP table size for large fabrics';
AddAnswerHelp("$arptbl_tunning", "$arptbl_tunning_desc");

sub install_opa_stack($$)
{
my $install_list = shift(); # total that will be installed when done
Expand Down Expand Up @@ -924,7 +934,7 @@ ($$)
check_config_dirs();
check_dir("/usr/lib/opa");

prompt_opa_conf_param('ARPTABLE_TUNING', 'Adjust kernel ARP table size for large fabrics', "y", 'OPA_ARPTABLE_TUNING');
prompt_opa_conf_param("$arptbl_tunning", "$arptbl_tunning_desc", "y", 'OPA_ARPTABLE_TUNING');

install_comp_rpms('opa_stack', " -U --nodeps ", $install_list);
# rdma.conf values not directly associated with driver startup are left
Expand Down Expand Up @@ -1094,6 +1104,9 @@ ()
} elsif ( "$CUR_VENDOR_VER" eq "ES76" ) {
return (has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES77" ) {
return (has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
} elsif ( "$CUR_VENDOR_VER" eq "ES8" ) {
return (has_version_delta()
&& rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER));
Expand Down Expand Up @@ -1503,119 +1516,6 @@ ($$)
$ComponentWasInstalled{'mpi_selector'}=0;
}

# ==========================================================================
# OFA sandiashmem for gcc installation

sub get_rpms_dir_sandiashmem($)
{
my $package = shift();
return get_rpms_dir_delta($package)
}

sub available_sandiashmem()
{
my $srcdir=$ComponentInfo{'sandiashmem'}{'SrcDir'};
return ( -d "$srcdir/SRPMS" || -d "$srcdir/RPMS" );
}

sub installed_sandiashmem()
{
return ((rpm_is_installed("sandia-openshmem_gcc_hfi", "user")
&& has_version_delta()));
}

# only called if installed_openshmem is true
sub installed_version_sandiashmem()
{
if ( -e "$BASE_DIR/version_delta" ) {
return `cat $BASE_DIR/version_delta`;
} else {
return 'Unknown';
}
}

# only called if available_openshmem is true
sub media_version_sandiashmem()
{
return media_version_delta();
}

sub build_sandiashmem($$$$)
{
my $osver = shift();
my $debug = shift(); # enable extra debug of build itself
my $build_temp = shift(); # temp area for use by build
my $force = shift(); # force a rebuild
return 0; # success
}

sub need_reinstall_sandiashmem($$)
{
my $install_list = shift(); # total that will be installed when done
my $installing_list = shift(); # what items are being installed/reinstalled

return (need_reinstall_delta_comp('sandiashmem', $install_list, $installing_list));
}

sub preinstall_sandiashmem($$)
{
my $install_list = shift(); # total that will be installed when done
my $installing_list = shift(); # what items are being installed/reinstalled

return preinstall_delta("sandiashmem", $install_list, $installing_list);
}

sub install_sandiashmem($$)
{
my $install_list = shift(); # total that will be installed when done
my $installing_list = shift(); # what items are being installed/reinstalled

print_comp_install_banner('sandiashmem');

# make sure any old potentially custom built versions of sandiashmem are uninstalled
rpm_uninstall_list2("any", " --nodeps ", 'silent', @{ $ComponentInfo{'sandiashmem'}{'UserRpms'}});
my $rpmfile = rpm_resolve(delta_rpms_dir() . "/sandia-openshmem_gcc_hfi", "any");
if ( "$rpmfile" ne "" && -e "$rpmfile" ) {
# try to remove existed SOS folders. Note this is the workaround for PR 144408. We shall remove the following
# code after we resolve the PR.
my @installed_pkgs = glob("/usr/shmem/gcc/sandia-openshmem-*-hfi");
if (@installed_pkgs) {
foreach my $installed_pkg (@installed_pkgs) {
if (GetYesNo ("Remove $installed_pkg directory?", "y")) {
LogPrint "rm -rf $installed_pkg\n";
system("rm -rf $installed_pkg");
}
}
}
}

install_comp_rpms('sandiashmem', " -U --nodeps ", $install_list);

$ComponentWasInstalled{'sandiashmem'}=1;
}

sub postinstall_sandiashmem($$)
{
my $install_list = shift(); # total that will be installed when done
my $installing_list = shift(); # what items are being installed/reinstalled
#delta_restore_autostart('sandiashmem');
}

sub uninstall_sandiashmem($$)
{
my $install_list = shift(); # total that will be left installed when done
my $uninstalling_list = shift(); # what items are being uninstalled

print_comp_uninstall_banner('sandiashmem');
uninstall_comp_rpms('sandiashmem', ' --nodeps ', $install_list, $uninstalling_list, 'verbose');
$ComponentWasInstalled{'sandiashmem'}=0;
}

sub check_os_prereqs_sandiashmem
{
return rpm_check_os_prereqs("sandiashmem", "user");
}

# ==========================================================================
# OFA delta_debug installation

Expand Down
1 change: 1 addition & 0 deletions CommonInstall/comp_delta_prereq_RHEL75.pl
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"systemd",
"numactl-libs",
"irqbalance",
"libatomic",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;

Expand Down
1 change: 1 addition & 0 deletions CommonInstall/comp_delta_prereq_RHEL76.pl
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"systemd",
"numactl-libs",
"irqbalance",
"libatomic",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;

Expand Down
138 changes: 138 additions & 0 deletions CommonInstall/comp_delta_prereq_RHEL77.pl
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
#!/usr/bin/perl
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2018, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of Intel Corporation nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
## END_ICS_COPYRIGHT8 ****************************************
#
## [ICS VERSION STRING: unknown]
#use strict;
##use Term::ANSIColor;
##use Term::ANSIColor qw(:constants);
##use File::Basename;
##use Math::BigInt;
#
## ==========================================================================
#
#Installation Prequisites array for delta components
my @opa_stack_prereq = (
"bash",
"kernel",
"kmod",
"rdma-core",
"systemd",
"glibc",
"pciutils",
"opensm-libs",
"libibumad",
"rdma-core-devel",
);
$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq;

my @mpi_selector_prereq = (
"bash",
"coreutils",
"perl",
"perl-Getopt-Long",
"tcsh",
);
$comp_prereq_hash{'mpi_selector_prereq'} = \@mpi_selector_prereq;

my @intel_hfi_prereq = (
"bash",
"glibc",
"libgcc",
"python",
"systemd",
"numactl-libs",
"irqbalance",
"libatomic",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;

my @mvapich2_prereq = (
"bash",
"libibverbs",
"librdmacm",
"glibc",
"zlib",
"sysfsutils",
);
$comp_prereq_hash{'mvapich2_prereq'} = \@mvapich2_prereq;

my @openmpi_prereq = (
"bash",
"glibc",
"libgcc",
"libgfortran",
"gcc-gfortran",
"libgomp",
"libibverbs",
"libquadmath",
"librdmacm",
"libstdc++",
"libstdc++-devel",
"opensm-libs",
"pkgconfig",
"zlib",
);
$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq;

my @mvapich2_gcc_hfi_prereq = (
"bash",
"zlib",
"glibc",
);
$comp_prereq_hash{'mvapich2_gcc_hfi_prereq'} = \@mvapich2_gcc_hfi_prereq;

my @mvapich2_intel_hfi_prereq = (
"bash",
);
$comp_prereq_hash{'mvapich2_intel_hfi_prereq'} = \@mvapich2_intel_hfi_prereq;

my @openmpi_gcc_hfi_prereq = (
"bash",
"glibc",
"infinipath-psm",
"libgcc",
"libgfortran",
"gcc-gfortran",
"libgomp",
"libibverbs",
"libquadmath",
"librdmacm",
"libstdc++",
"libstdc++-devel",
"opensm-libs",
"pkgconfig",
"zlib",
);
$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq;

my @openmpi_intel_hfi_prereq = (
"bash",
);
$comp_prereq_hash{'openmpi_intel_hfi_prereq'} = \@openmpi_intel_hfi_prereq;
1 change: 1 addition & 0 deletions CommonInstall/comp_delta_prereq_SLES122.pl
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"libncurses5",
"libnuma1",
"irqbalance",
"libatomic1",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;

Expand Down
1 change: 1 addition & 0 deletions CommonInstall/comp_delta_prereq_SLES123.pl
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"libncurses5",
"libnuma1",
"irqbalance",
"libatomic1",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;

Expand Down
1 change: 1 addition & 0 deletions CommonInstall/comp_delta_prereq_SLES124.pl
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"libncurses5",
"libnuma1",
"irqbalance",
"libatomic1",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;

Expand Down
1 change: 1 addition & 0 deletions CommonInstall/comp_delta_prereq_SLES15.pl
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"libncurses6",
"libnuma1",
"irqbalance",
"libatomic1",
);
$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq;

Expand Down
Loading

0 comments on commit 9e61462

Please sign in to comment.