From d62756adb09f53cf960ad6bfe6695678da8266b1 Mon Sep 17 00:00:00 2001 From: Greg Kresge Date: Mon, 27 Feb 2023 11:38:53 -0500 Subject: [PATCH] Update to latest from build 10.12.1.0.6 (IFS 10.12.1.0.7) --- CommonInstall/Makefile | 18 ++- CommonInstall/comp_delta.pl | 28 ++++ CommonInstall/comp_delta_prereq_RHEL86.pl | 138 ++++++++++++++++++ CommonInstall/comp_delta_prereq_RHEL9.pl | 138 ++++++++++++++++++ CommonInstall/comp_delta_prereq_SLES154.pl | 138 ++++++++++++++++++ CommonInstall/comp_ff_of_prereq_RHEL86.pl | 88 +++++++++++ .../comp_ff_of_prereq_RHEL86.pl.base | 88 +++++++++++ CommonInstall/comp_ff_of_prereq_RHEL9.pl | 88 +++++++++++ CommonInstall/comp_ff_of_prereq_RHEL9.pl.base | 88 +++++++++++ CommonInstall/comp_ff_of_prereq_SLES154.pl | 91 ++++++++++++ .../comp_ff_of_prereq_SLES154.pl.base | 91 ++++++++++++ CommonInstall/comp_fm_prereq_RHEL86.pl | 53 +++++++ CommonInstall/comp_fm_prereq_RHEL86.pl.base | 53 +++++++ CommonInstall/comp_fm_prereq_RHEL9.pl | 53 +++++++ CommonInstall/comp_fm_prereq_RHEL9.pl.base | 53 +++++++ CommonInstall/comp_fm_prereq_SLES154.pl | 55 +++++++ CommonInstall/comp_fm_prereq_SLES154.pl.base | 55 +++++++ CommonInstall/do_mvapich2_build.sh | 48 +++--- CommonInstall/do_openmpi_build.sh | 32 ++-- CommonInstall/main_omnipathwrap_delta.pl | 94 +++++++++++- CommonInstall/overrides_delta.pl | 18 +++ CommonInstall/util_rpm.pl | 2 +- Esm/ib/src/config/fm_xml.c | 7 - MakeTools/patch_version/README.md | 60 ++++++++ MakeTools/patch_version/patch_version.c | 9 +- OpenIb_Host/LINUX/Makefile | 9 ++ OpenIb_Host/build.env | 2 +- OpenIb_Host/build_label | 2 +- OpenIb_Host/mpi-apps.spec.in | 1 + TestTools/mpi.exp | 2 +- TestTools/target.exp | 2 +- opa-ff.spec.in | 14 +- 32 files changed, 1559 insertions(+), 59 deletions(-) create mode 100644 CommonInstall/comp_delta_prereq_RHEL86.pl create mode 100644 CommonInstall/comp_delta_prereq_RHEL9.pl create mode 100644 CommonInstall/comp_delta_prereq_SLES154.pl create mode 100644 CommonInstall/comp_ff_of_prereq_RHEL86.pl create mode 100644 CommonInstall/comp_ff_of_prereq_RHEL86.pl.base create mode 100644 CommonInstall/comp_ff_of_prereq_RHEL9.pl create mode 100644 CommonInstall/comp_ff_of_prereq_RHEL9.pl.base create mode 100644 CommonInstall/comp_ff_of_prereq_SLES154.pl create mode 100644 CommonInstall/comp_ff_of_prereq_SLES154.pl.base create mode 100644 CommonInstall/comp_fm_prereq_RHEL86.pl create mode 100644 CommonInstall/comp_fm_prereq_RHEL86.pl.base create mode 100644 CommonInstall/comp_fm_prereq_RHEL9.pl create mode 100644 CommonInstall/comp_fm_prereq_RHEL9.pl.base create mode 100644 CommonInstall/comp_fm_prereq_SLES154.pl create mode 100644 CommonInstall/comp_fm_prereq_SLES154.pl.base create mode 100644 MakeTools/patch_version/README.md diff --git a/CommonInstall/Makefile b/CommonInstall/Makefile index b2d8d85..5c5a7d8 100644 --- a/CommonInstall/Makefile +++ b/CommonInstall/Makefile @@ -105,12 +105,15 @@ CLOBBER_TARGETS_MISC= comp_ff_of_prereq_RHEL77.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_RHEL9.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_ff_of_prereq_SLES152.pl \ comp_ff_of_prereq_SLES153.pl \ + comp_ff_of_prereq_SLES154.pl \ comp_fm_prereq_RHEL77.pl \ comp_fm_prereq_RHEL8.pl \ comp_fm_prereq_RHEL81.pl \ @@ -118,12 +121,15 @@ CLOBBER_TARGETS_MISC= comp_ff_of_prereq_RHEL77.pl \ comp_fm_prereq_RHEL83.pl \ comp_fm_prereq_RHEL84.pl \ comp_fm_prereq_RHEL85.pl \ + comp_fm_prereq_RHEL86.pl \ + comp_fm_prereq_RHEL9.pl \ comp_fm_prereq_SLES123.pl \ comp_fm_prereq_SLES124.pl \ comp_fm_prereq_SLES15.pl \ comp_fm_prereq_SLES151.pl \ comp_fm_prereq_SLES152.pl \ - comp_fm_prereq_SLES153.pl + comp_fm_prereq_SLES153.pl \ + comp_fm_prereq_SLES154.pl # sub-directory to install to within bin BIN_SUBDIR = # sub-directory to install to within include @@ -157,12 +163,15 @@ FF_FILES = comp_ff_of_prereq_RHEL77.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_RHEL9.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_ff_of_prereq_SLES152.pl \ - comp_ff_of_prereq_SLES153.pl + comp_ff_of_prereq_SLES153.pl \ + comp_ff_of_prereq_SLES154.pl FM_FILES = comp_fm_prereq_RHEL77.pl \ comp_fm_prereq_RHEL78.pl \ comp_fm_prereq_RHEL8.pl \ @@ -171,12 +180,15 @@ FM_FILES = comp_fm_prereq_RHEL77.pl \ comp_fm_prereq_RHEL83.pl \ comp_fm_prereq_RHEL84.pl \ comp_fm_prereq_RHEL85.pl \ + comp_fm_prereq_RHEL86.pl \ + comp_fm_prereq_RHEL9.pl \ comp_fm_prereq_SLES123.pl \ comp_fm_prereq_SLES124.pl \ comp_fm_prereq_SLES15.pl \ comp_fm_prereq_SLES151.pl \ comp_fm_prereq_SLES152.pl \ - comp_fm_prereq_SLES153.pl + comp_fm_prereq_SLES153.pl \ + comp_fm_prereq_SLES154.pl # Include Make Rules definitions and rules include $(TL_DIR)/$(PROJ_FILE_DIR)/Makerules.project diff --git a/CommonInstall/comp_delta.pl b/CommonInstall/comp_delta.pl index 6f747ea..29cccef 100755 --- a/CommonInstall/comp_delta.pl +++ b/CommonInstall/comp_delta.pl @@ -79,6 +79,7 @@ my @delta_kernel_srpms_sles15_sp1 = ( 'ifs-kernel-updates-kmp-default' ); my @delta_kernel_srpms_sles15_sp2 = ( 'ifs-kernel-updates-kmp-default' ); my @delta_kernel_srpms_sles15_sp3 = ( 'ifs-kernel-updates-kmp-default' ); +my @delta_kernel_srpms_sles15_sp4 = ( 'ifs-kernel-updates-kmp-default' ); my @delta_kernel_srpms_rhel73 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel74 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel75 = ( 'kmod-ifs-kernel-updates' ); @@ -91,6 +92,8 @@ my @delta_kernel_srpms_rhel83 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel84 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel85 = ( 'kmod-ifs-kernel-updates' ); +my @delta_kernel_srpms_rhel86 = ( 'kmod-ifs-kernel-updates' ); +my @delta_kernel_srpms_rhel9 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms = ( ); # This provides information for all kernel srpms @@ -171,12 +174,19 @@ ($) } elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE' && "$CUR_VENDOR_VER" eq 'ES153') { @delta_kernel_srpms = ( @delta_kernel_srpms_sles15_sp3 ); + } elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE' + && "$CUR_VENDOR_VER" eq 'ES154') { + @delta_kernel_srpms = ( @delta_kernel_srpms_sles15_sp4 ); } elsif ( "$CUR_VENDOR_VER" eq "ES74" ) { if ($HFI2_INSTALL) { @delta_kernel_srpms = (@delta_kernel_srpms_rhel74_hfi2); } else { @delta_kernel_srpms = (@delta_kernel_srpms_rhel74); } + } elsif ( "$CUR_VENDOR_VER" eq "ES86" ) { + @delta_kernel_srpms = ( @delta_kernel_srpms_rhel86 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES9" ) { + @delta_kernel_srpms = ( @delta_kernel_srpms_rhel9 ); } elsif ( "$CUR_VENDOR_VER" eq "ES85" ) { @delta_kernel_srpms = ( @delta_kernel_srpms_rhel85 ); } elsif ( "$CUR_VENDOR_VER" eq "ES84" ) { @@ -820,6 +830,12 @@ () return ( has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } + } elsif ( "$CUR_VENDOR_VER" eq "ES86" ) { + return ( has_version_delta() + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES9" ) { + return ( has_version_delta() + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq "ES85" ) { return ( has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); @@ -874,6 +890,9 @@ () } elsif ( "$CUR_VENDOR_VER" eq 'ES153' ) { return ( has_version_delta() && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq 'ES154' ) { + return ( has_version_delta() + && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); } else { return 0; } @@ -1186,6 +1205,12 @@ () } elsif ( "$CUR_VENDOR_VER" eq "ES85" ) { return (has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES86" ) { + return (has_version_delta() + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES9" ) { + return (has_version_delta() + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq "ES123" ) { return (has_version_delta() && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); @@ -1207,6 +1232,9 @@ () } elsif ( "$CUR_VENDOR_VER" eq "ES153" ) { return (has_version_delta() && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES154" ) { + return (has_version_delta() + && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); } else { return 0; } diff --git a/CommonInstall/comp_delta_prereq_RHEL86.pl b/CommonInstall/comp_delta_prereq_RHEL86.pl new file mode 100644 index 0000000..6bd1756 --- /dev/null +++ b/CommonInstall/comp_delta_prereq_RHEL86.pl @@ -0,0 +1,138 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# 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", + "python2", + "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", + "pkgconf", + "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", + "libgcc", + "libgfortran", + "gcc-gfortran", + "libgomp", + "libibverbs", + "libquadmath", + "librdmacm", + "libstdc++", + "libstdc++-devel", + "opensm-libs", + "pkgconf", + "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; diff --git a/CommonInstall/comp_delta_prereq_RHEL9.pl b/CommonInstall/comp_delta_prereq_RHEL9.pl new file mode 100644 index 0000000..a0c18c6 --- /dev/null +++ b/CommonInstall/comp_delta_prereq_RHEL9.pl @@ -0,0 +1,138 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# 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", + "python3", + "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", + "pkgconf", + "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", + "libgcc", + "libgfortran", + "gcc-gfortran", + "libgomp", + "libibverbs", + "libquadmath", + "librdmacm", + "libstdc++", + "libstdc++-devel", + "opensm-libs", + "pkgconf", + "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; diff --git a/CommonInstall/comp_delta_prereq_SLES154.pl b/CommonInstall/comp_delta_prereq_SLES154.pl new file mode 100644 index 0000000..db10421 --- /dev/null +++ b/CommonInstall/comp_delta_prereq_SLES154.pl @@ -0,0 +1,138 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020-2021, Cornelis Networks +# +# 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", + "kmod", + "rdma-core", + "rdma-ndd", + "systemd", + "coreutils", + "grep", + "libosmcomp5", + "libibmad5", + "libibumad3", + "rdma-core-devel", +); +$comp_prereq_hash{'opa_stack_prereq'} = \@opa_stack_prereq; + +my @intel_hfi_prereq = ( + "glibc", + "libgcc_s1", + "bash", + "udev", + "systemd-devel", + "python3-base", + "libedit0", + "libncurses6", + "libnuma1", + "irqbalance", + "libatomic1", +); +$comp_prereq_hash{'intel_hfi_prereq'} = \@intel_hfi_prereq; + +my @mvapich2_gcc_hfi_prereq = ( + "bash", + "glibc", + "libz1", + "mpi-selector", +); +$comp_prereq_hash{'mvapich2_gcc_hfi_prereq'} = \@mvapich2_gcc_hfi_prereq; + +my @mvapich2_intel_hfi_prereq = ( + "bash", + "mpi-selector", +); +$comp_prereq_hash{'mvapich2_intel_hfi_prereq'} = \@mvapich2_intel_hfi_prereq; + +my @openmpi_gcc_hfi_prereq = ( + "glibc", + "bash", + "pkg-config", + "libgcc_s1", + "libgfortran4", + "gcc-fortran", + "libgomp1", + "libibverbs1", + "libquadmath0", + "librdmacm1", + "libstdc++6", + "libz1", + "opensm-devel", + "mpi-selector", +); +$comp_prereq_hash{'openmpi_gcc_hfi_prereq'} = \@openmpi_gcc_hfi_prereq; + +my @openmpi_intel_hfi_prereq = ( + "bash", + "mpi-selector", +); +$comp_prereq_hash{'openmpi_intel_hfi_prereq'} = \@openmpi_intel_hfi_prereq; + +my @mvapich2_prereq = ( + "bash", + "libibverbs1", + "librdmacm1", + "glibc", + "libz1", + "mpi-selector", +); +$comp_prereq_hash{'mvapich2_prereq'} = \@mvapich2_prereq; + +my @openmpi_prereq = ( + "glibc", + "bash", + "libz1", + "pkg-config", + "libgcc_s1", + "libgfortran3", + "gcc-fortran", + "libgomp1", + "libibverbs1", + "libquadmath0", + "librdmacm1", + "libstdc++6", + "libz1", + "opensm-libs3", + "opensm-devel", + "mpi-selector", +); +$comp_prereq_hash{'openmpi_prereq'} = \@openmpi_prereq; diff --git a/CommonInstall/comp_ff_of_prereq_RHEL86.pl b/CommonInstall/comp_ff_of_prereq_RHEL86.pl new file mode 100644 index 0000000..b7dc68f --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_RHEL86.pl @@ -0,0 +1,88 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# 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 @oftools_prereq = ( + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ibacm", + "rdma-core", +); +$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq; + +my @fastfabric_prereq = ( + "atlas", + "bash", + "bc", + "expat", + "expect", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ncurses-libs", + "openssl-libs", + "perl", + "perl-Getopt-Long", + "perl-Socket", + "rdma-core", + "tcl", + "zlib", +); +$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq; + +my @opamgt_sdk_prereq = ( + "bash", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "openssl", + "openssl-devel", + "openssl-libs", + "rdma-core-devel", +); +$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq; diff --git a/CommonInstall/comp_ff_of_prereq_RHEL86.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL86.pl.base new file mode 100644 index 0000000..b7dc68f --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_RHEL86.pl.base @@ -0,0 +1,88 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# 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 @oftools_prereq = ( + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ibacm", + "rdma-core", +); +$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq; + +my @fastfabric_prereq = ( + "atlas", + "bash", + "bc", + "expat", + "expect", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ncurses-libs", + "openssl-libs", + "perl", + "perl-Getopt-Long", + "perl-Socket", + "rdma-core", + "tcl", + "zlib", +); +$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq; + +my @opamgt_sdk_prereq = ( + "bash", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "openssl", + "openssl-devel", + "openssl-libs", + "rdma-core-devel", +); +$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq; diff --git a/CommonInstall/comp_ff_of_prereq_RHEL9.pl b/CommonInstall/comp_ff_of_prereq_RHEL9.pl new file mode 100644 index 0000000..b7dc68f --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_RHEL9.pl @@ -0,0 +1,88 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# 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 @oftools_prereq = ( + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ibacm", + "rdma-core", +); +$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq; + +my @fastfabric_prereq = ( + "atlas", + "bash", + "bc", + "expat", + "expect", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ncurses-libs", + "openssl-libs", + "perl", + "perl-Getopt-Long", + "perl-Socket", + "rdma-core", + "tcl", + "zlib", +); +$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq; + +my @opamgt_sdk_prereq = ( + "bash", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "openssl", + "openssl-devel", + "openssl-libs", + "rdma-core-devel", +); +$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq; diff --git a/CommonInstall/comp_ff_of_prereq_RHEL9.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL9.pl.base new file mode 100644 index 0000000..b7dc68f --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_RHEL9.pl.base @@ -0,0 +1,88 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# 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 @oftools_prereq = ( + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ibacm", + "rdma-core", +); +$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq; + +my @fastfabric_prereq = ( + "atlas", + "bash", + "bc", + "expat", + "expect", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "ncurses-libs", + "openssl-libs", + "perl", + "perl-Getopt-Long", + "perl-Socket", + "rdma-core", + "tcl", + "zlib", +); +$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq; + +my @opamgt_sdk_prereq = ( + "bash", + "glibc", + "libgcc", + "libibumad", + "libibverbs", + "libstdc++", + "openssl", + "openssl-devel", + "openssl-libs", + "rdma-core-devel", +); +$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq; diff --git a/CommonInstall/comp_ff_of_prereq_SLES154.pl b/CommonInstall/comp_ff_of_prereq_SLES154.pl new file mode 100644 index 0000000..114fb4d --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_SLES154.pl @@ -0,0 +1,91 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020-2021, Cornelis Networks +# +# 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 @oftools_prereq = ( + "glibc", + "libgcc_s1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libstdc++6", + "ibacm", +); +$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq; + +my @fastfabric_prereq = ( + "glibc", + "bash", + "expect", + "perl-base", + "tcl", + "libexpat1", + "libgcc_s1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libncurses6", + "libopenssl1_1", + "libstdc++6", + "libz1", + "bc", + "rdma-core", + "rdma-ndd", + "qperf", + "perftest", +); +$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq; + +my @opamgt_sdk_prereq = ( + "bash", + "glibc", + "libgcc_s1", + "libibumad3", + "libibverbs1", + "libopenssl-devel", + "libopenssl1_1", + "libstdc++6", + "openssl", + "rdma-core-devel", + "rdma-ndd", +); +$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq; diff --git a/CommonInstall/comp_ff_of_prereq_SLES154.pl.base b/CommonInstall/comp_ff_of_prereq_SLES154.pl.base new file mode 100644 index 0000000..114fb4d --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_SLES154.pl.base @@ -0,0 +1,91 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020-2021, Cornelis Networks +# +# 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 @oftools_prereq = ( + "glibc", + "libgcc_s1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libstdc++6", + "ibacm", +); +$comp_prereq_hash{'oftools_prereq'} = \@oftools_prereq; + +my @fastfabric_prereq = ( + "glibc", + "bash", + "expect", + "perl-base", + "tcl", + "libexpat1", + "libgcc_s1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libncurses6", + "libopenssl1_1", + "libstdc++6", + "libz1", + "bc", + "rdma-core", + "rdma-ndd", + "qperf", + "perftest", +); +$comp_prereq_hash{'fastfabric_prereq'} = \@fastfabric_prereq; + +my @opamgt_sdk_prereq = ( + "bash", + "glibc", + "libgcc_s1", + "libibumad3", + "libibverbs1", + "libopenssl-devel", + "libopenssl1_1", + "libstdc++6", + "openssl", + "rdma-core-devel", + "rdma-ndd", +); +$comp_prereq_hash{'opamgt_sdk_prereq'} = \@opamgt_sdk_prereq; diff --git a/CommonInstall/comp_fm_prereq_RHEL86.pl b/CommonInstall/comp_fm_prereq_RHEL86.pl new file mode 100644 index 0000000..02e12bb --- /dev/null +++ b/CommonInstall/comp_fm_prereq_RHEL86.pl @@ -0,0 +1,53 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# 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 opafm +my @opafm_prereq = ( + "bash", + "expat", + "glibc", + "libibumad", + "libibverbs", + "openssl-libs", + "rdma-core", + "systemd", + "zlib", +); +$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq; diff --git a/CommonInstall/comp_fm_prereq_RHEL86.pl.base b/CommonInstall/comp_fm_prereq_RHEL86.pl.base new file mode 100644 index 0000000..02e12bb --- /dev/null +++ b/CommonInstall/comp_fm_prereq_RHEL86.pl.base @@ -0,0 +1,53 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# 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 opafm +my @opafm_prereq = ( + "bash", + "expat", + "glibc", + "libibumad", + "libibverbs", + "openssl-libs", + "rdma-core", + "systemd", + "zlib", +); +$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq; diff --git a/CommonInstall/comp_fm_prereq_RHEL9.pl b/CommonInstall/comp_fm_prereq_RHEL9.pl new file mode 100644 index 0000000..02e12bb --- /dev/null +++ b/CommonInstall/comp_fm_prereq_RHEL9.pl @@ -0,0 +1,53 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# 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 opafm +my @opafm_prereq = ( + "bash", + "expat", + "glibc", + "libibumad", + "libibverbs", + "openssl-libs", + "rdma-core", + "systemd", + "zlib", +); +$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq; diff --git a/CommonInstall/comp_fm_prereq_RHEL9.pl.base b/CommonInstall/comp_fm_prereq_RHEL9.pl.base new file mode 100644 index 0000000..02e12bb --- /dev/null +++ b/CommonInstall/comp_fm_prereq_RHEL9.pl.base @@ -0,0 +1,53 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020, Cornelis Networks, Inc. +# +# 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 opafm +my @opafm_prereq = ( + "bash", + "expat", + "glibc", + "libibumad", + "libibverbs", + "openssl-libs", + "rdma-core", + "systemd", + "zlib", +); +$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq; diff --git a/CommonInstall/comp_fm_prereq_SLES154.pl b/CommonInstall/comp_fm_prereq_SLES154.pl new file mode 100644 index 0000000..7f0a687 --- /dev/null +++ b/CommonInstall/comp_fm_prereq_SLES154.pl @@ -0,0 +1,55 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020-2021, Cornelis Networks +# +# 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 opafm +my @opafm_prereq = ( + "glibc", + "bash", + "rdma-core", + "rdma-ndd", + "systemd", + "libexpat1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libopenssl1_1", + "libz1", +); +$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq; diff --git a/CommonInstall/comp_fm_prereq_SLES154.pl.base b/CommonInstall/comp_fm_prereq_SLES154.pl.base new file mode 100644 index 0000000..7f0a687 --- /dev/null +++ b/CommonInstall/comp_fm_prereq_SLES154.pl.base @@ -0,0 +1,55 @@ +#!/usr/bin/perl +## BEGIN_ICS_COPYRIGHT8 **************************************** +# +# Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2020-2021, Cornelis Networks +# +# 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 opafm +my @opafm_prereq = ( + "glibc", + "bash", + "rdma-core", + "rdma-ndd", + "systemd", + "libexpat1", + "libibmad5", + "libibumad3", + "libibverbs1", + "libopenssl1_1", + "libz1", +); +$comp_prereq_hash{'opafm_prereq'} = \@opafm_prereq; diff --git a/CommonInstall/do_mvapich2_build.sh b/CommonInstall/do_mvapich2_build.sh index 58cd8ee..fac78c6 100755 --- a/CommonInstall/do_mvapich2_build.sh +++ b/CommonInstall/do_mvapich2_build.sh @@ -28,7 +28,7 @@ # # END_ICS_COPYRIGHT8 **************************************** -# This file incorporates work covered by the following copyright and permission notice +# This file incorporates work covered by the following copyright and permission notice #[ICS VERSION STRING: unknown] @@ -73,7 +73,8 @@ else fi if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID > 7.3" | bc -l) == 1 ) || \ - ( "$ID" == "sles" && $(echo "$VERSION_ID > 12.2" | bc -l) == 1 ) ]]; then + ( "$ID" == "sles" && $(echo "$VERSION_ID > 12.2" | bc -l) == 1 ) || \ + ( "$ID" == "rocky") ]]; then PREREQ=("rdma-core-devel" "mpi-selector") else PREREQ=("libibverbs-devel" "librdmacm-devel" "mpi-selector") @@ -103,7 +104,7 @@ CheckPreReqs() fi echo exit 2 - fi + fi } Usage() @@ -324,7 +325,7 @@ then choices+=("opa-psm2") PS3="Select MVAPICH2 Transport: " fi - if [ ${#choices[@]} -gt 0 ] + if [ ${#choices[@]} -gt 0 ] then select mvapich2_conf_impl in ${choices[*]} do @@ -426,16 +427,21 @@ then export CFLAGS="-m64 -g -O2" export CPPFLAGS="-m64 -g -O2" export CXXFLAGS="-m64 -g -O2" - export FFLAGS="-m64 -g -O2" export FCFLAGS="-m64 -g -O2" export LDLIBS="-m64 -g -O2 -L/usr/lib64 -L/usr/X11R6/lib64" else + if [[ ( "$ID" == "rocky" && $(echo "$VERSION_ID >= 9.0" | bc -l) == 1 ) || \ + ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 9.0" | bc -l) == 1 ) ]]; then + export CFLAGS="-fcommon" + export FFLAGS="-fallow-argument-mismatch" + else + unset CFLAGS + unset FFLAGS + fi # just to be safe - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset FFLAGS + unset LDFLAGS + unset CPPFLAGS + unset CXXFLAGS unset FCFLAGS unset LDLIBS fi @@ -514,8 +520,12 @@ logfile=make.mvapich2.$interface.$compiler mvapich2_comp_env='CC="gcc -m64" CXX="g++ -m64" F77="gfortran -m64" FC="gfortran -m64"' else mvapich2_comp_env='CC=gcc CXX=g++ F77=gfortran FC=gfortran' - if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then - mvapich2_comp_env="$mvapich2_comp_env CFLAGS='-fPIC'" + if [[ ( "$ID" == "rocky" ) || ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then + if [[ ( $(echo "$VERSION_ID >= 9.0" | bc -l) == 1 ) ]]; then + mvapich2_comp_env="$mvapich2_comp_env CFLAGS=\"-fPIC -fcommon\"" + else + mvapich2_comp_env="$mvapich2_comp_env CFLAGS=\"-fPIC\"" + fi fi fi else @@ -524,9 +534,13 @@ logfile=make.mvapich2.$interface.$compiler mvapich2_comp_env='CC="gcc -m64" CXX="g++ -m64" F77="g77 -m64" FC="/bin/false"' else mvapich2_comp_env='CC=gcc CXX=g++ F77=g77 FC=/bin/false' - if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then - mvapich2_comp_env="$mvapich2_comp_env CFLAGS='-fPIC'" - fi + if [[ ( "$ID" == "rocky" ) || ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then + if [[ ( $(echo "$VERSION_ID >= 9.0" | bc -l) == 1 ) ]]; then + mvapich2_comp_env="$mvapich2_comp_env CFLAGS=\"-fPIC -fcommon\"" + else + mvapich2_comp_env="$mvapich2_comp_env CFLAGS=\"-fPIC\"" + fi + fi fi fi;; @@ -545,7 +559,7 @@ logfile=make.mvapich2.$interface.$compiler intel) disable_auto_requires="--define 'disable_auto_requires 1'" - if [ "$mvapich2_conf_shared_libs" = 1 ] + if [ "$mvapich2_conf_shared_libs" = 1 ] then mvapich2_comp_env='CC=icc CXX=icpc F77=ifort FC=ifort' else @@ -667,7 +681,7 @@ logfile=make.mvapich2.$interface.$compiler echo "error: mpitests_mvapich2_$compiler$mvapich2_rpm_suffix Build ERROR: bad exit code" exit 1 fi - + if [ "$iflag" = n ] then mv $RPM_DIR/RPMS/$target_cpu/mpitests_mvapich2_$compiler$mvapich2_rpm_suffix-$mpitests_fullversion.$target_cpu.rpm $DESTDIR diff --git a/CommonInstall/do_openmpi_build.sh b/CommonInstall/do_openmpi_build.sh index e6e16b4..2f6d180 100755 --- a/CommonInstall/do_openmpi_build.sh +++ b/CommonInstall/do_openmpi_build.sh @@ -2,6 +2,7 @@ # BEGIN_ICS_COPYRIGHT8 **************************************** # # Copyright (c) 2015-2020, Intel Corporation +# Copyright (c) 2022, Cornelis Networks # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -63,6 +64,8 @@ ID="" VERSION_ID="" +DEF_CONFIG_OPTIONS='--with-hwloc=internal --with-libevent=internal --with-pmix=internal' + if [ -e /etc/os-release ]; then . /etc/os-release if [[ "$ID" == "sle_hpc" ]]; then @@ -124,7 +127,7 @@ Usage() echo " VERSION is openmpi version (eg. 1.0.0)" >&2 echo " CONFIG_OPTIONS - additional OpenMPI configuration options to be" >&2 echo " specified via configure_options parameter to srpm" >&2 - echo " Default is ''" >&2 + echo " Default is '$DEF_CONFIG_OPTIONS'" >&2 echo " INSTALL_ROOT - location of system image in which to install." >&2 echo " Default is '/'" >&2 echo "" >&2 @@ -308,7 +311,7 @@ fi # if -d (skip_prompt) the only option provided, ./configure will run with # no paramters and build what is auto-detected -openmpi_conf_psm='' +openmpi_conf='' # we no longer supports verbs. openmpi_verbs='--enable-mca-no-build=btl-openib --without-verbs' @@ -316,7 +319,7 @@ openmpi_verbs='--enable-mca-no-build=btl-openib --without-verbs' if [ "$Qflag" = y ] then PREREQ+=('infinipath-psm-devel') - openmpi_conf_psm='--with-psm=/usr ' + openmpi_conf='--with-psm=/usr ' # PSM indicated by qlc suffix so user can ID PSM vs OFI or PSM2 MPIs openmpi_path_suffix="-qlc" openmpi_rpm_suffix="_qlc" @@ -326,7 +329,7 @@ fi if [ "$Oflag" = y ] then PREREQ+=('libpsm2-devel' 'libfabric-devel') - openmpi_conf_psm=" $openmpi_conf_psm --with-psm2=/usr --with-libfabric=/usr " + openmpi_conf=" $openmpi_conf --with-psm2=/usr --with-libfabric=/usr " # PSM2 indicated by hfi suffix so user can ID from PSM or OFI MPIs openmpi_path_suffix="-hfi" openmpi_rpm_suffix="_hfi" @@ -336,7 +339,7 @@ fi if [ "$Cflag" = y ] then PREREQ+=('libpsm2-devel' 'cuda-cudart-dev') - openmpi_conf_psm=" $openmpi_conf_psm --with-psm2=/usr --with-cuda=/usr/local/cuda " + openmpi_conf=" $openmpi_conf --with-psm2=/usr --with-cuda=/usr/local/cuda " # CUDA indicated by -cuda suffix so user can ID from PSM2 without cuda, PSM or OFI MPIs openmpi_path_suffix="-cuda-hfi" openmpi_rpm_suffix="_cuda_hfi" @@ -377,7 +380,7 @@ logfile=make.openmpi.$interface.$compiler mpitests_version=$(ls $mpitests_srpm 2>/dev/null|head -1|cut -f2 -d-) mpitests_fullversion=$(ls $mpitests_srpm 2>/dev/null|head -1|cut -f2- -d-|sed -e 's/.src.rpm//') MPICH_PREFIX=${MPICH_PREFIX:-$STACK_PREFIX/mpi/$compiler/openmpi-$openmpi_version$openmpi_path_suffix} - CONFIG_OPTIONS=${CONFIG_OPTIONS:-""} + CONFIG_OPTIONS=${CONFIG_OPTIONS:-${DEF_CONFIG_OPTIONS}} if [ x"$openmpi_version" = x"" ] then @@ -437,7 +440,7 @@ logfile=make.openmpi.$interface.$compiler case "$compiler" in gcc) - if [[ ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then + if [[ ( "$ID" == "rocky" ) || ( "$ID" == "rhel" && $(echo "$VERSION_ID >= 8.0" | bc -l) == 1 ) ]]; then openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS=\"-O3 -fPIC\"" else openmpi_comp_env="$openmpi_comp_env CC=gcc CFLAGS=-O3" @@ -453,9 +456,9 @@ logfile=make.openmpi.$interface.$compiler openmpi_comp_env="$openmpi_comp_env F77=gfortran FC=gfortran" elif have_comp g77 then - openmpi_comp_env="$openmpi_comp_env F77=g77 --disable-mpi-f90" + openmpi_comp_env="$openmpi_comp_env F77=g77 " else - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f77 --disable-mpi-f90" + openmpi_comp_env="$openmpi_comp_env --disable-mpi-fortran" fi;; pathscale) @@ -471,7 +474,7 @@ logfile=make.openmpi.$interface.$compiler then openmpi_comp_env="$openmpi_comp_env F77=pathf90 FC=pathf90" else - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f77 --disable-mpi-f90" + openmpi_comp_env="$openmpi_comp_env --disable-mpi-fortran" fi # test for fedora core 6 or redhat EL5 if { [ -f /etc/fedora-release ] && { uname -r|grep fc6; }; } \ @@ -496,13 +499,13 @@ logfile=make.openmpi.$interface.$compiler then openmpi_comp_env="$openmpi_comp_env F77=pgf77" else - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f77" + openmpi_comp_env="$openmpi_comp_env --disable-mpi-fortran" fi if have_comp pgf90 then openmpi_comp_env="$openmpi_comp_env FC=pgf90 FCFLAGS=-O2" else - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f90" + openmpi_comp_env="$openmpi_comp_env --disable-mpi-fortran" fi;; intel) @@ -518,7 +521,7 @@ logfile=make.openmpi.$interface.$compiler then openmpi_comp_env="$openmpi_comp_env F77=ifort FC=ifort" else - openmpi_comp_env="$openmpi_comp_env --disable-mpi-f77 --disable-mpi-f90" + openmpi_comp_env="$openmpi_comp_env --disable-mpi-fortran" fi;; *) @@ -565,7 +568,7 @@ logfile=make.openmpi.$interface.$compiler --define '_defaultdocdir $MPICH_PREFIX/doc/..' \ --define '_mandir %{_prefix}/share/man' \ --define 'mflags -j 4' \ - --define 'configure_options $CONFIG_OPTIONS $openmpi_ldflags $openmpi_comp_env $openmpi_conf_psm --with-devel-headers --disable-oshmem $openmpi_verbs' \ + --define 'configure_options $CONFIG_OPTIONS $openmpi_ldflags $openmpi_comp_env $openmpi_conf --with-devel-headers --disable-oshmem $openmpi_verbs' \ --define 'use_default_rpm_opt_flags $use_default_rpm_opt_flags' \ $disable_auto_requires" cmd="$cmd \ @@ -604,6 +607,7 @@ logfile=make.openmpi.$interface.$compiler echo "Building test programs $mpitests_version for OpenMPI MPI $openmpi_version..." # mpitests uses buildroot instead of build_root, play it safe for future # and define both + export LD_LIBRARY_PATH=$MPICH_PREFIX/lib64:$LD_LIBRARY_PATH cmd="$pref_env rpmbuild --rebuild \ --define '_topdir $RPM_DIR' \ --buildroot '$BUILD_ROOT' \ diff --git a/CommonInstall/main_omnipathwrap_delta.pl b/CommonInstall/main_omnipathwrap_delta.pl index 932a42c..2a870e2 100644 --- a/CommonInstall/main_omnipathwrap_delta.pl +++ b/CommonInstall/main_omnipathwrap_delta.pl @@ -82,6 +82,8 @@ @OmniPathAllComponents ); my @Components_sles15_sp3 = ( "opa_stack", @OmniPathAllComponents ); +my @Components_sles15_sp4 = ( "opa_stack", + @OmniPathAllComponents ); my @Components_rhel74 = ( "opa_stack", "mpi_selector", @OmniPathAllComponents ); my @Components_rhel75 = ( "opa_stack", "mpi_selector", @@ -104,6 +106,10 @@ @OmniPathAllComponents ); my @Components_rhel85 = ( "opa_stack", "mpi_selector", @OmniPathAllComponents ); +my @Components_rhel86 = ( "opa_stack", "mpi_selector", + @OmniPathAllComponents ); +my @Components_rhel9 = ( "opa_stack", "mpi_selector", + @OmniPathAllComponents ); @Components = ( ); @@ -220,7 +226,7 @@ Hidden => 0, Disabled => 0, IsOFA => 0, KernelRpms => [ ], FirmwareRpms => [ ], - UserRpms => [ "opa-basic-tools", "opa-address-resolution" ], + UserRpms => [ "opa-basic-tools", "opa-address-resolution", "opa-address-resolution-devel" ], DebugRpms => [ ], HasStart => 1, HasFirmware => 0, DefaultStart => 0, StartPreReq => " opa_stack ", # TBD @@ -250,7 +256,7 @@ Hidden => 0, Disabled => 0, IsOFA => 0, KernelRpms => [ ], FirmwareRpms => [ ], - UserRpms => [ "opa-fastfabric", "opa-mpi-apps" ], + UserRpms => [ "opa-fastfabric", "opa-mpi-apps", "opa-snapconfig" ], DebugRpms => [ ], HasStart => 0, HasFirmware => 0, DefaultStart => 0, StartPreReq => " opa_stack ", @@ -1041,6 +1047,66 @@ }, ); +my %intel_hfi_rhel86_comp_info = ( + "intel_hfi" => { Name => "Cornelis HFI Components", + DefaultInstall => $State_Install, + SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"), + PreReq => " opa_stack ", CoReq => " oftools ", + # TBD - HasFirmware - FW update + Hidden => 0, Disabled => 0, IsOFA => 1, + KernelRpms => [ ], + FirmwareRpms => [ + "hfi1-firmware", "hfi1-firmware_debug" + ], + UserRpms => [ #"libhfi1", "libhfi1-static", + "libpsm2", + "libpsm2-devel", "libpsm2-compat", + "libfabric", "libfabric-devel", + "libfabric-psm2", "libfabric-verbs", + "hfi1-diagtools-sw", "hfidiags", + ], + DebugRpms => [ #"hfi1_debuginfo", + "hfi1-diagtools-sw-debuginfo", + "libpsm2-debuginfo", #"libhfi1-debuginfo" + ], + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => " opa_stack ", + StartComponents => [ "intel_hfi" ], + StartupScript => "", + StartupParams => [ ] + }, +); + +my %intel_hfi_rhel9_comp_info = ( + "intel_hfi" => { Name => "Cornelis HFI Components", + DefaultInstall => $State_Install, + SrcDir => file_glob("./CornelisOPX-OFA_DELTA.*"), + PreReq => " opa_stack ", CoReq => " oftools ", + # TBD - HasFirmware - FW update + Hidden => 0, Disabled => 0, IsOFA => 1, + KernelRpms => [ ], + FirmwareRpms => [ + "hfi1-firmware", "hfi1-firmware_debug" + ], + UserRpms => [ #"libhfi1", "libhfi1-static", + "libpsm2", + "libpsm2-devel", "libpsm2-compat", + "libfabric", "libfabric-devel", + "libfabric-psm2", "libfabric-verbs", + "hfi1-diagtools-sw", "hfidiags", + ], + DebugRpms => [ #"hfi1_debuginfo", + "hfi1-diagtools-sw-debuginfo", + "libpsm2-debuginfo", #"libhfi1-debuginfo" + ], + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => " opa_stack ", + StartComponents => [ "intel_hfi" ], + StartupScript => "", + StartupParams => [ ] + }, +); + # For SLES12sp3 that has different name for libpsm2 my %intel_hfi_sles123_comp_info = ( "intel_hfi" => { Name => "Cornelis HFI Components", @@ -1435,6 +1501,22 @@ sub init_components %opa_stack_dev_comp_info, %opa_stack_rhel_comp_info, ); + } elsif ( "$CUR_VENDOR_VER" eq "ES86" ) { + @Components = ( @Components_rhel86 ); + @SubComponents = ( @SubComponents_newer ); + %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info, + %intel_hfi_rhel86_comp_info, + %opa_stack_dev_comp_info, + %opa_stack_rhel_comp_info, + ); + } elsif ( "$CUR_VENDOR_VER" eq "ES9" ) { + @Components = ( @Components_rhel9 ); + @SubComponents = ( @SubComponents_newer ); + %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info, + %intel_hfi_rhel85_comp_info, + %opa_stack_dev_comp_info, + %opa_stack_rhel_comp_info, + ); } elsif ( "$CUR_VENDOR_VER" eq "ES15" ) { @Components = ( @Components_sles15 ); @SubComponents = ( @SubComponents_newer ); @@ -1467,6 +1549,14 @@ sub init_components %opa_stack_dev_comp_info, %opa_stack_sles15_comp_info, ); + } elsif ( "$CUR_VENDOR_VER" eq "ES154" ) { + @Components = ( @Components_sles15_sp4 ); + @SubComponents = ( @SubComponents_newer ); + %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info, + %intel_hfi_sles15_comp_info, + %opa_stack_dev_comp_info, + %opa_stack_sles15_comp_info, + ); } else { # unknown or unsupported distro, leave lists empty # verify_distrib_files will catch unsupported distro diff --git a/CommonInstall/overrides_delta.pl b/CommonInstall/overrides_delta.pl index e142ba5..679a2f4 100644 --- a/CommonInstall/overrides_delta.pl +++ b/CommonInstall/overrides_delta.pl @@ -107,6 +107,14 @@ "opa_stack_dev", "delta_ipoib", "delta_debug", ); +my @delta_Components_rhel86 = ( "opa_stack", "mpi_selector", "intel_hfi", + "opa_stack_dev", + "delta_ipoib", + "delta_debug", ); +my @delta_Components_rhel9 = ( "opa_stack", "mpi_selector", "intel_hfi", + "opa_stack_dev", + "delta_ipoib", + "delta_debug", ); my @delta_Components_sles15 = ( "opa_stack", "intel_hfi", "opa_stack_dev", "delta_ipoib", @@ -123,6 +131,10 @@ "opa_stack_dev", "delta_ipoib", "delta_debug", ); +my @delta_Components_sles15_sp4 = ( "opa_stack", "intel_hfi", + "opa_stack_dev", + "delta_ipoib", + "delta_debug", ); @Components = ( ); # RHEL7.2, ibacm is a full component with rpms to install @@ -169,6 +181,10 @@ () @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 "ES9" ) { + @Components = ( @delta_Components_rhel9 ); } elsif ( "$CUR_VENDOR_VER" eq "ES15" ) { @Components = ( @delta_Components_sles15 ); } elsif ( "$CUR_VENDOR_VER" eq "ES151" ) { @@ -177,6 +193,8 @@ () @Components = ( @delta_Components_sles15_sp2 ); } elsif ( "$CUR_VENDOR_VER" eq "ES153" ) { @Components = ( @delta_Components_sles15_sp3 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES154" ) { + @Components = ( @delta_Components_sles15_sp4 ); } else { # unsupported OS @Components = ( ); diff --git a/CommonInstall/util_rpm.pl b/CommonInstall/util_rpm.pl index 0701616..f460820 100755 --- a/CommonInstall/util_rpm.pl +++ b/CommonInstall/util_rpm.pl @@ -727,7 +727,7 @@ ($$) } else { my $osver = rpm_tr_os_version("$mode"); # OS version # we expect 1 match, ignore all other filenames returned - if ( "$CUR_VENDOR_VER" eq 'ES122' || "$CUR_VENDOR_VER" eq 'ES123' || "$CUR_VENDOR_VER" eq 'ES124' || "$CUR_VENDOR_VER" eq 'ES125' ||"$CUR_VENDOR_VER" eq 'ES15' || "$CUR_VENDOR_VER" eq 'ES151' || "$CUR_VENDOR_VER" eq 'ES152' || "$CUR_VENDOR_VER" eq 'ES153' ) { + if ( "$CUR_VENDOR_VER" eq 'ES122' || "$CUR_VENDOR_VER" eq 'ES123' || "$CUR_VENDOR_VER" eq 'ES124' || "$CUR_VENDOR_VER" eq 'ES125' ||"$CUR_VENDOR_VER" eq 'ES15' || "$CUR_VENDOR_VER" eq 'ES151' || "$CUR_VENDOR_VER" eq 'ES152' || "$CUR_VENDOR_VER" eq 'ES153' || "$CUR_VENDOR_VER" eq 'ES154' ) { DebugPrint("Checking for Kernel Rpm: ${rpmpath}-${osver}_k*.${cpu}.rpm\n"); $rpmfile = file_glob("${rpmpath}-${osver}_k*.${cpu}.rpm"); } else { diff --git a/Esm/ib/src/config/fm_xml.c b/Esm/ib/src/config/fm_xml.c index 43b7e6d..a2aef23 100644 --- a/Esm/ib/src/config/fm_xml.c +++ b/Esm/ib/src/config/fm_xml.c @@ -4685,13 +4685,6 @@ VirtualFabrics_t* reRenderVirtualFabricsConfig(uint32_t fm, VirtualFabrics_t *ol "or PA Service ID configured in an Application", cfgtype, vfip->name); goto fail; } - // make sure that either All or AllMgmtAllowed is included in Admin fabric - this rule was added - // to make sure IBTA works for PR112665 - if (!is_all_or_allmgmt_full) { - RENDER_VF_LOGGER(printError, "%s: VF(%s) must have or configured in a Member", - cfgtype, vfip->name); - goto fail; - } } else if (vfip->apps.select_sa || checkVFSID(vfip, STL_PM_SERVICE_ID) || vfip->apps.select_pm diff --git a/MakeTools/patch_version/README.md b/MakeTools/patch_version/README.md new file mode 100644 index 0000000..4880a13 --- /dev/null +++ b/MakeTools/patch_version/README.md @@ -0,0 +1,60 @@ +# Building and modifying patch_brand tool + +## Where patch_brand normally exists: +``` +$ which patch_brand +/usr/local/ics/bin/patch_brand +``` + +## Usage for patch_brand: +``` +$ patch_brand -h +patch_brand: invalid option -- 'h' +Usage: patch_brand [-m marker] brand [file ...] +``` + +## How embedded build runs patch_brand: +This line in Makerules/Maketargets.bsp is run: +`$(PATCH_BRAND) "$(BUILD_BRAND)" $(EXECUTABLE)` +It will appear as follows in the capture build output for embedded: +`$ patch_brand "" build.STL1.q7.release/STL1.q7` +Note: The empty brand string tells patch_brand, aka, patch_version.c, to use DEFAULT_BRAND. + +## How to tell if the file has the default brand of Intel: +``` +grep Intel /STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 +Binary file ../STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 matches +``` + +## How to build patch_version by itself (make your changes in opa-dev branch only): +``` +cd MakeTools/patch_version/ +target linux +setrel +setver ##choose 1 (which is probably the default Linux that was booted) +export PROJ_FILE_DIR=OpenIb_Host +make +``` +You will find patch_brand executable in your current directory. + +## How to run patch_version to test your change: +`./patch_brand “” /STL1_Firmware/Firmware/build.release*/STL1.q7` +For example: +``` +./patch_brand "" ~/HEAD-10_8/ifs-all/STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 +Patching /home/usrinivasan/HEAD-10_8/ifs-all/STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 with brand 'Cornelis' +``` + +## How to tell if the file has the default brand of Cornelis: +`grep Cornelis /STL1_Firmware/Firmware/build.release*/STL1.q7` +For example: +``` +grep "THIS_IS_THE_ICS_BRAND:Cornelis" /home/usrinivasan/HEAD-10_8/ifs-all/STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 +Binary file /home/usrinivasan/HEAD-10_8/ifs-all/STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 matches +``` +## Finally, verify that a grep for Intel yields nothing. +`grep "THIS_IS_THE_ICS_BRAND:Intel" /STL1_Firmware/Firmware/build.STL1.q7.release/STL1.q7 + + + + diff --git a/MakeTools/patch_version/patch_version.c b/MakeTools/patch_version/patch_version.c index 6592b94..8097922 100755 --- a/MakeTools/patch_version/patch_version.c +++ b/MakeTools/patch_version/patch_version.c @@ -8,6 +8,7 @@ /* BEGIN_ICS_COPYRIGHT7 **************************************** Copyright (c) 2015-2020, Intel Corporation +Copyright (c) 2021, Cornelis Networks, Inc. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -67,7 +68,7 @@ and/or the product takes a long amount of time to compile. patch_brand brand [file ...] @param release_tag - version tag of the form R#_#M#P#I# or R#_#A#I# or R#_#B#I# -@param brand - a branding string such as "Intel" +@param brand - a branding string such as "Cornelis Networks" @param file - object/exe file(s) to place the #.#.#.# style version string in If no files are specified, the program merely performs the simpler behaviour of outputing the #.#.#.# @@ -107,7 +108,7 @@ and/or the product takes a long amount of time to compile. return(version); } - #define ICS_BUILD_BRAND "THIS_IS_THE_ICS_BRAND:Intel\000 " + #define ICS_BUILD_BRAND "THIS_IS_THE_ICS_BRAND:Cornelis Networks\000 " const char* GetCodeBrand(void) { static const char* BuildBrand=ICS_BUILD_BRAND; @@ -142,8 +143,8 @@ and/or the product takes a long amount of time to compile. #define ICS_BUILD_VERSION "THIS_IS_THE_ICS_VERSION_NUMBER:@(#)000.000.000.000B000" #define ICS_BUILD_INTERNAL_VERSION "THIS_IS_THE_ICS_INTERNAL_VERSION_NUMBER:@(#)000.000.000.000B000I0000" -#define ICS_BUILD_BRAND "THIS_IS_THE_ICS_BRAND:Intel\000 " -#define DEFAULT_BRAND "Intel" +#define ICS_BUILD_BRAND "THIS_IS_THE_ICS_BRAND:Cornelis\000 " +#define DEFAULT_BRAND "Cornelis" typedef enum { B_FALSE=0, B_TRUE } boolean; diff --git a/OpenIb_Host/LINUX/Makefile b/OpenIb_Host/LINUX/Makefile index 3ee43d9..c5d707b 100644 --- a/OpenIb_Host/LINUX/Makefile +++ b/OpenIb_Host/LINUX/Makefile @@ -118,6 +118,12 @@ endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES85" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_ff_of_prereq_RHEL85.pl endif +ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES86" + PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_ff_of_prereq_RHEL86.pl +endif +ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES9" + PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_ff_of_prereq_RHEL9.pl +endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES123" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_ff_of_prereq_SLES123.pl endif @@ -139,6 +145,9 @@ endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES153" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_ff_of_prereq_SLES153.pl endif +ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES154" + PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_ff_of_prereq_SLES153.pl +endif COMP_SOURCES= \ $(TL_DIR)/CommonInstall/comp_oftools.pl \ diff --git a/OpenIb_Host/build.env b/OpenIb_Host/build.env index d2996da..e0ee410 100644 --- a/OpenIb_Host/build.env +++ b/OpenIb_Host/build.env @@ -1,6 +1,6 @@ # Adjust the environment variables if necessary export PRODUCT=OPENIB_FF -export RELEASE_TAG=10_11_1_3_1 +export RELEASE_TAG=10_12_1_0_6 export BUILD_CONFIG=${BUILD_CONFIG:-"release"} export BUILD_WITH_STACK=OPENIB export LDENVFS= diff --git a/OpenIb_Host/build_label b/OpenIb_Host/build_label index 99444ba..a06f29f 100644 --- a/OpenIb_Host/build_label +++ b/OpenIb_Host/build_label @@ -1 +1 @@ -Build of OPENIB_FF 02/28/22 15:18 Tag: OPENIB_FF_LINUX_opa-10_11_10_11_1_3_1 +Build of OPENIB_FF 12/01/22 16:44 Tag: OPENIB_FF_LINUX_opa-10_12_10_12_1_0_6 diff --git a/OpenIb_Host/mpi-apps.spec.in b/OpenIb_Host/mpi-apps.spec.in index cefe555..b740a29 100644 --- a/OpenIb_Host/mpi-apps.spec.in +++ b/OpenIb_Host/mpi-apps.spec.in @@ -17,6 +17,7 @@ Contains applications and source for testing MPI performance in conjunction with IFSComponent: Tools_FF __RPM_VERSION.__RPM_RELEASE __RPM_DBG +%define __strip /bin/true %prep %setup -q -c diff --git a/TestTools/mpi.exp b/TestTools/mpi.exp index f3b7e29..bc5d3ce 100644 --- a/TestTools/mpi.exp +++ b/TestTools/mpi.exp @@ -613,7 +613,7 @@ File: TestTools/mpi.exp" case_setup case_cleanup { unix_cmd 20 0 "export MPI_CMD_ARGS=" } - send_unix_cmd "$env(MPICH_PREFIX)/bin/mpirun $mpiapi_env -np $np -allow-run-as-root --map-by node -machinefile mpi_hosts \$MPI_CMD_ARGS $openmpi_env ./$mpi_cmd $mpi_args; echo DONE" + send_unix_cmd "LD_LIBRARY_PATH=$env(MPICH_PREFIX)/lib64:\$LD_LIBRARY_PATH $env(MPICH_PREFIX)/bin/mpirun $mpiapi_env -np $np -allow-run-as-root --map-by node -machinefile mpi_hosts \$MPI_CMD_ARGS $openmpi_env ./$mpi_cmd $mpi_args; echo DONE" if { $show_perf } { set perf_var perf diff --git a/TestTools/target.exp b/TestTools/target.exp index 8d8311a..ddf7f71 100644 --- a/TestTools/target.exp +++ b/TestTools/target.exp @@ -1098,7 +1098,7 @@ proc target_get_stack_type { { checkrun "y"} { host "" } } { set iba_not_installed [ get_exit_status 60 ] # see if Open IB installed, 0 -> yes - send_unix_cmd {test -e /etc/init.d/openibd -o -e /lib/modules/`uname -r`/kernel/drivers/infiniband/core/ib_umad.ko -o -e /lib/modules/`uname -r`/kernel/drivers/infiniband/core/ib_umad.ko.xz} + send_unix_cmd {test -e /etc/init.d/openibd -o -e /lib/modules/`uname -r`/kernel/drivers/infiniband/core/ib_umad.ko -o -e /lib/modules/`uname -r`/kernel/drivers/infiniband/core/ib_umad.ko.xz -o -e /lib/modules/`uname -r`/kernel/drivers/infiniband/core/ib_umad.ko.zst} set openib_not_installed [ get_exit_status 60 ] # newer distros include openib, so if both appear installed also assume iba diff --git a/opa-ff.spec.in b/opa-ff.spec.in index a35a002..b5811da 100644 --- a/opa-ff.spec.in +++ b/opa-ff.spec.in @@ -1,5 +1,5 @@ Name: opa -Version: 10.11.1.3 +Version: 10.12.1.0 Release: 1%{?dist} Summary: Cornelis Omni-Path basic tools and libraries for fabric managment. @@ -18,7 +18,7 @@ __RPM_DEBUG_PKG %description This package contains the tools necessary to manage an Cornelis(TM) Omni-Path Express fabric. -IFSComponent: Tools_FF 10.11.1.3.1%{?dist} +IFSComponent: Tools_FF 10.12.1.0.6%{?dist} %package basic-tools Summary: Managment level tools and scripts. @@ -37,7 +37,7 @@ Epoch: 1 %description basic-tools Contains basic tools for fabric managment necessary on all compute nodes. -IFSComponent: Tools_FF 10.11.1.3.1%{?dist} +IFSComponent: Tools_FF 10.12.1.0.6%{?dist} %package fastfabric Summary: Management level tools and scripts. @@ -50,7 +50,7 @@ Epoch: 1 %description fastfabric Contains tools for managing fabric on a managment node. -IFSComponent: Tools_FF 10.11.1.3.1%{?dist} +IFSComponent: Tools_FF 10.12.1.0.6%{?dist} %package address-resolution Summary: Contains Address Resolution manager @@ -64,7 +64,7 @@ Epoch: 1 %description address-resolution This package contains the ibacm distributed SA provider (dsap) for name and address resolution on OPA platform. It also contains the library and tools to access the shared memory database exported by dsap. -IFSComponent: Tools_FF 10.11.1.3.1%{?dist} +IFSComponent: Tools_FF 10.12.1.0.6%{?dist} %package libopamgt Summary: Omni-Path management API library @@ -73,7 +73,7 @@ Requires: __RPM_REQ_OPAMGT %description libopamgt This package contains the library necessary to build applications that interface with an Omni-Path FM. -IFSComponent: Tools_FF 10.11.1.3.1%{?dist} +IFSComponent: Tools_FF 10.12.1.0.6%{?dist} %package libopamgt-devel @@ -83,7 +83,7 @@ Requires: __RPM_REQ_OPAMGT_DEV %description libopamgt-devel This package contains the necessary headers for opamgt development. -IFSComponent: Tools_FF 10.11.1.3.1%{?dist} +IFSComponent: Tools_FF 10.12.1.0.6%{?dist} %prep #rm -rf %{_builddir}/*