Skip to content

Commit

Permalink
Merge pull request #5 from jijunwan/master
Browse files Browse the repository at this point in the history
11.3 update

- improved to support RHEL 8.6
- improved to enable almalinux and circle Linux
- added tool ethshmcleanup.sh for obsoleted shm file clean up
- added support to IMPI 2021.6
- update MpiApps OSU to v5.9
  • Loading branch information
jijunwan authored Jun 13, 2022
2 parents 52bf690 + 104128a commit e2d1dd8
Show file tree
Hide file tree
Showing 38 changed files with 694 additions and 56 deletions.
8 changes: 5 additions & 3 deletions CommonInstall/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
# Copyright (c) 2015-2022, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down Expand Up @@ -98,8 +98,9 @@ CLEAN_TARGETS = $(OBJECTS) $(RSCOBJECTS) $(IDL_TARGETS) $(CLEAN_TARGETS_MISC)
# other files to remove during clobber phase
CLOBBER_TARGETS_MISC= comp_ff_of_prereq_RHEL78.pl comp_ff_of_prereq_RHEL79.pl \
comp_ff_of_prereq_RHEL8.pl comp_ff_of_prereq_RHEL81.pl \
comp_ff_of_prereq_RHEL82.pl comp_ff_of_prereq_RHEL83.pl \
comp_ff_of_prereq_RHEL84.pl comp_ff_of_prereq_RHEL85.pl \
comp_ff_of_prereq_RHEL82.pl comp_ff_of_prereq_RHEL83.pl \
comp_ff_of_prereq_RHEL84.pl comp_ff_of_prereq_RHEL85.pl \
comp_ff_of_prereq_RHEL86.pl \
comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES125.pl \
comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl \
comp_ff_of_prereq_SLES152.pl comp_ff_of_prereq_SLES153.pl
Expand Down Expand Up @@ -132,6 +133,7 @@ FF_FILES = comp_ff_of_prereq_RHEL78.pl comp_ff_of_prereq_RHEL79.pl \
comp_ff_of_prereq_RHEL8.pl comp_ff_of_prereq_RHEL81.pl \
comp_ff_of_prereq_RHEL82.pl comp_ff_of_prereq_RHEL83.pl \
comp_ff_of_prereq_RHEL84.pl comp_ff_of_prereq_RHEL85.pl \
comp_ff_of_prereq_RHEL86.pl \
comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES125.pl \
comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl \
comp_ff_of_prereq_SLES152.pl comp_ff_of_prereq_SLES153.pl
Expand Down
7 changes: 6 additions & 1 deletion CommonInstall/comp_delta.pl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# BEGIN_ICS_COPYRIGHT8
#
# Copyright (c) 2015-2020, Intel Corporation
# Copyright (c) 2015-2022, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down Expand Up @@ -81,6 +81,7 @@
my @delta_kernel_srpms_rhel83 = ( 'kmod-iefs-kernel-updates' );
my @delta_kernel_srpms_rhel84 = ( 'kmod-iefs-kernel-updates' );
my @delta_kernel_srpms_rhel85 = ( 'kmod-iefs-kernel-updates' );
my @delta_kernel_srpms_rhel86 = ( 'kmod-iefs-kernel-updates' );
my @delta_kernel_srpms = ( );

# This provides information for all kernel srpms
Expand Down Expand Up @@ -160,6 +161,8 @@ ($)
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel84 );
} elsif ( "$CUR_VENDOR_VER" eq "ES85" ) {
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel85 );
} elsif ( "$CUR_VENDOR_VER" eq "ES86" ) {
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel86 );
} elsif ( "$CUR_VENDOR_VER" eq "ES8" ) {
@delta_kernel_srpms = ( @delta_kernel_srpms_rhel8 );
} elsif ( "$CUR_VENDOR_VER" eq "ES78" ) {
Expand Down Expand Up @@ -780,6 +783,8 @@ ()
return rpm_is_installed("kmod-iefs-kernel-updates", $CUR_OS_VER);
} elsif ( "$CUR_VENDOR_VER" eq "ES85" ) {
return rpm_is_installed("kmod-iefs-kernel-updates", $CUR_OS_VER);
} elsif ( "$CUR_VENDOR_VER" eq "ES86" ) {
return rpm_is_installed("kmod-iefs-kernel-updates", $CUR_OS_VER);
} elsif ( "$CUR_VENDOR_VER" eq "ES124" ) {
return rpm_is_installed("iefs-kernel-updates-kmp-default", $CUR_OS_VER);
} elsif ( "$CUR_VENDOR_VER" eq "ES125" ) {
Expand Down
95 changes: 95 additions & 0 deletions CommonInstall/comp_delta_prereq_RHEL86.pl
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
#!/usr/bin/perl
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2022, 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 @eth_module_prereq = (
"bash",
"kernel-core",
"kmod",
);
$comp_prereq_hash{'eth_module_prereq'} = \@eth_module_prereq;

my @psm3_prereq = (
"bash",
"glibc",
"libfabric",
"libgcc",
"libibverbs",
"numactl-libs",
"libuuid",
"rdma-core",
);
$comp_prereq_hash{'psm3_prereq'} = \@psm3_prereq;

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

my @openmpi_gcc_ofi_prereq = (
"bash",
"glibc",
"libfabric",
"libgcc",
"libgfortran",
"libnl3",
"libquadmath",
"perl",
"pkgconf-pkg-config",
"zlib",
);
$comp_prereq_hash{'openmpi_gcc_ofi_prereq'} = \@openmpi_gcc_ofi_prereq;

my @openmpi_intel_ofi_prereq = (
"bash",
);
$comp_prereq_hash{'openmpi_intel_ofi_prereq'} = \@openmpi_intel_ofi_prereq;
81 changes: 81 additions & 0 deletions CommonInstall/comp_ff_of_prereq_RHEL86.pl
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
#!/usr/bin/perl
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2022, 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 fast fabric
#and of tools component
my @eth_tools_prereq = (
"bash",
"bc",
"expat",
"expect",
"glibc",
"libgomp",
"libibumad",
"libibverbs-utils",
"librdmacm-utils",
"net-snmp",
"net-snmp-utils",
"openssl",
"openssl-libs",
"perl",
"rdma-core",
"tcl",
);
$comp_prereq_hash{'eth_tools_prereq'} = \@eth_tools_prereq;

my @fastfabric_prereq = (
"bash",
"cronie",
"expat",
"expect",
"glibc",
"libgcc",
"libibumad",
"libibverbs",
"librdmacm",
"libstdc++",
"ncurses-libs",
"net-snmp-libs",
"openssl-libs",
"openblas-devel",
"perl",
"tcl",
"zlib",
);
$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
81 changes: 81 additions & 0 deletions CommonInstall/comp_ff_of_prereq_RHEL86.pl.base
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
#!/usr/bin/perl
## BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2022, 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 fast fabric
#and of tools component
my @eth_tools_prereq = (
"bash",
"bc",
"expat",
"expect",
"glibc",
"libgomp",
"libibumad",
"libibverbs-utils",
"librdmacm-utils",
"net-snmp",
"net-snmp-utils",
"openssl",
"openssl-libs",
"perl",
"rdma-core",
"tcl",
);
$comp_prereq_hash{'eth_tools_prereq'} = \@eth_tools_prereq;

my @fastfabric_prereq = (
"bash",
"cronie",
"expat",
"expect",
"glibc",
"libgcc",
"libibumad",
"libibverbs",
"librdmacm",
"libstdc++",
"ncurses-libs",
"net-snmp-libs",
"openssl-libs",
"openblas-devel",
"perl",
"tcl",
"zlib",
);
$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq;
9 changes: 8 additions & 1 deletion CommonInstall/main_omnipathwrap_delta.pl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
# Copyright (c) 2015-2022, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down Expand Up @@ -72,6 +72,7 @@
my @Components_rhel83 = ( @EthAllComponents );
my @Components_rhel84 = ( @EthAllComponents );
my @Components_rhel85 = ( @EthAllComponents );
my @Components_rhel86 = ( @EthAllComponents );

@Components = ( );

Expand Down Expand Up @@ -544,6 +545,12 @@ sub init_components
%ComponentInfo = ( %ComponentInfo, %ibacm_comp_info,
%eth_module_rhel_comp_info,
);
} elsif ( "$CUR_VENDOR_VER" eq "ES86" ) {
@Components = ( @Components_rhel86 );
@SubComponents = ( @SubComponents_newer );
%ComponentInfo = ( %ComponentInfo, %ibacm_comp_info,
%eth_module_rhel_comp_info,
);
} elsif ( "$CUR_VENDOR_VER" eq "ES15" ) {
@Components = ( @Components_sles15 );
@SubComponents = ( @SubComponents_newer );
Expand Down
9 changes: 8 additions & 1 deletion CommonInstall/overrides_delta.pl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# BEGIN_ICS_COPYRIGHT8 ****************************************
#
# Copyright (c) 2015-2020, Intel Corporation
# Copyright (c) 2015-2022, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down Expand Up @@ -88,6 +88,11 @@
"eth_rdma",
"delta_debug",
);
my @delta_Components_rhel86 = (
"psm3",
"eth_rdma",
"delta_debug",
);
my @delta_Components_sles15 = (
"psm3",
"eth_rdma",
Expand Down Expand Up @@ -133,6 +138,8 @@ ()
@Components = ( @delta_Components_rhel84 );
} elsif ( "$CUR_VENDOR_VER" eq "ES85" ) {
@Components = ( @delta_Components_rhel85 );
} elsif ( "$CUR_VENDOR_VER" eq "ES86" ) {
@Components = ( @delta_Components_rhel86 );
} elsif ( "$CUR_VENDOR_VER" eq "ES15" ) {
@Components = ( @delta_Components_sles15 );
} elsif ( "$CUR_VENDOR_VER" eq "ES151" ) {
Expand Down
Loading

0 comments on commit e2d1dd8

Please sign in to comment.