From 6133b2fe5b39b605c0d695bce37cdfa498a4d477 Mon Sep 17 00:00:00 2001 From: Scott Breyer Date: Tue, 13 Apr 2021 11:02:37 -0400 Subject: [PATCH] Update to latest from build 10.11.0.0.574 (IFS 10.11.0.0.577) --- CommonInstall/Makefile | 16 +- CommonInstall/comp_delta.pl | 10 ++ CommonInstall/comp_delta_prereq_RHEL83.pl | 138 ++++++++++++++++++ CommonInstall/comp_delta_prereq_SLES124.pl | 1 - CommonInstall/comp_delta_prereq_SLES125.pl | 1 - CommonInstall/comp_delta_prereq_SLES151.pl | 1 - CommonInstall/comp_delta_prereq_SLES152.pl | 1 - CommonInstall/comp_ff_of_prereq_RHEL83.pl | 88 +++++++++++ .../comp_ff_of_prereq_RHEL83.pl.base | 88 +++++++++++ CommonInstall/comp_fm_prereq_RHEL83.pl | 53 +++++++ CommonInstall/comp_fm_prereq_RHEL83.pl.base | 53 +++++++ CommonInstall/main_omnipathwrap_delta.pl | 41 ++++++ CommonInstall/overrides_delta.pl | 7 + Esm/Makefile.linux | 4 + Esm/build.env | 2 +- Esm/build_label | 2 +- MakeTools/get_comp.sh | 8 +- Topology/fabricdata.c | 49 ++++--- Topology/route.c | 18 +-- 19 files changed, 531 insertions(+), 50 deletions(-) create mode 100644 CommonInstall/comp_delta_prereq_RHEL83.pl create mode 100644 CommonInstall/comp_ff_of_prereq_RHEL83.pl create mode 100644 CommonInstall/comp_ff_of_prereq_RHEL83.pl.base create mode 100644 CommonInstall/comp_fm_prereq_RHEL83.pl create mode 100644 CommonInstall/comp_fm_prereq_RHEL83.pl.base diff --git a/CommonInstall/Makefile b/CommonInstall/Makefile index 2f11768b..e350ec0a 100644 --- a/CommonInstall/Makefile +++ b/CommonInstall/Makefile @@ -1,6 +1,7 @@ # 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: @@ -97,11 +98,12 @@ CLEAN_TARGETS_MISC = CLEAN_TARGETS = $(OBJECTS) $(RSCOBJECTS) $(IDL_TARGETS) $(CLEAN_TARGETS_MISC) # other files to remove during clobber phase CLOBBER_TARGETS_MISC= comp_ff_of_prereq_RHEL72.pl comp_ff_of_prereq_RHEL73.pl comp_ff_of_prereq_RHEL74.pl comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl \ - comp_ff_of_prereq_RHEL77.pl comp_ff_of_prereq_RHEL8.pl comp_ff_of_prereq_RHEL81.pl comp_ff_of_prereq_RHEL82.pl comp_ff_of_prereq_SLES122.pl \ - comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl comp_ff_of_prereq_SLES152.pl \ - comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL77.pl \ - comp_fm_prereq_RHEL8.pl comp_fm_prereq_RHEL81.pl comp_fm_prereq_RHEL82.pl comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl \ - comp_fm_prereq_SLES15.pl comp_fm_prereq_SLES151.pl comp_fm_prereq_SLES152.pl + comp_ff_of_prereq_RHEL77.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_SLES122.pl comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl \ + comp_ff_of_prereq_SLES152.pl comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl comp_fm_prereq_RHEL75.pl \ + comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL77.pl comp_fm_prereq_RHEL8.pl comp_fm_prereq_RHEL81.pl comp_fm_prereq_RHEL82.pl \ + comp_fm_prereq_RHEL83.pl comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl comp_fm_prereq_SLES15.pl \ + comp_fm_prereq_SLES151.pl comp_fm_prereq_SLES152.pl # sub-directory to install to within bin BIN_SUBDIR = # sub-directory to install to within include @@ -129,12 +131,12 @@ LOCALDEPLIBS = FF_FILES = comp_ff_of_prereq_RHEL72.pl comp_ff_of_prereq_RHEL73.pl comp_ff_of_prereq_RHEL74.pl \ comp_ff_of_prereq_RHEL75.pl comp_ff_of_prereq_RHEL76.pl comp_ff_of_prereq_RHEL77.pl comp_ff_of_prereq_RHEL78.pl \ - comp_ff_of_prereq_RHEL8.pl comp_ff_of_prereq_RHEL81.pl comp_ff_of_prereq_RHEL82.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_SLES122.pl comp_ff_of_prereq_SLES123.pl comp_ff_of_prereq_SLES124.pl \ comp_ff_of_prereq_SLES15.pl comp_ff_of_prereq_SLES151.pl comp_ff_of_prereq_SLES152.pl FM_FILES = comp_fm_prereq_RHEL72.pl comp_fm_prereq_RHEL73.pl comp_fm_prereq_RHEL74.pl \ comp_fm_prereq_RHEL75.pl comp_fm_prereq_RHEL76.pl comp_fm_prereq_RHEL77.pl comp_fm_prereq_RHEL78.pl \ - comp_fm_prereq_RHEL8.pl comp_fm_prereq_RHEL81.pl comp_fm_prereq_RHEL82.pl \ + comp_fm_prereq_RHEL8.pl comp_fm_prereq_RHEL81.pl comp_fm_prereq_RHEL82.pl comp_fm_prereq_RHEL83.pl \ comp_fm_prereq_SLES122.pl comp_fm_prereq_SLES123.pl comp_fm_prereq_SLES124.pl \ comp_fm_prereq_SLES15.pl comp_fm_prereq_SLES151.pl comp_fm_prereq_SLES152.pl diff --git a/CommonInstall/comp_delta.pl b/CommonInstall/comp_delta.pl index e549931a..efb9ad67 100755 --- a/CommonInstall/comp_delta.pl +++ b/CommonInstall/comp_delta.pl @@ -2,6 +2,7 @@ # 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: @@ -86,6 +87,7 @@ my @delta_kernel_srpms_rhel8 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel81 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel82 = ( 'kmod-ifs-kernel-updates' ); +my @delta_kernel_srpms_rhel83 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms = ( ); # This provides information for all kernel srpms @@ -169,6 +171,8 @@ ($) } else { @delta_kernel_srpms = (@delta_kernel_srpms_rhel74); } + } elsif ( "$CUR_VENDOR_VER" eq "ES83" ) { + @delta_kernel_srpms = ( @delta_kernel_srpms_rhel83 ); } elsif ( "$CUR_VENDOR_VER" eq "ES82" ) { @delta_kernel_srpms = ( @delta_kernel_srpms_rhel82 ); } elsif ( "$CUR_VENDOR_VER" eq "ES81" ) { @@ -806,6 +810,9 @@ () return ( has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } + } elsif ( "$CUR_VENDOR_VER" eq "ES83" ) { + return ( has_version_delta() + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq "ES82" ) { return ( has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); @@ -1151,6 +1158,9 @@ () } elsif ( "$CUR_VENDOR_VER" eq "ES82" ) { return (has_version_delta() && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES83" ) { + 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)); diff --git a/CommonInstall/comp_delta_prereq_RHEL83.pl b/CommonInstall/comp_delta_prereq_RHEL83.pl new file mode 100644 index 00000000..6bd17567 --- /dev/null +++ b/CommonInstall/comp_delta_prereq_RHEL83.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_SLES124.pl b/CommonInstall/comp_delta_prereq_SLES124.pl index 5d1bcc07..f8e4323e 100644 --- a/CommonInstall/comp_delta_prereq_SLES124.pl +++ b/CommonInstall/comp_delta_prereq_SLES124.pl @@ -86,7 +86,6 @@ my @openmpi_gcc_hfi_prereq = ( "glibc", "bash", - "libpsm_infinipath1", "pkg-config", "libgcc_s1", "libgfortran3", diff --git a/CommonInstall/comp_delta_prereq_SLES125.pl b/CommonInstall/comp_delta_prereq_SLES125.pl index 6d7cec1d..b6da6c6a 100644 --- a/CommonInstall/comp_delta_prereq_SLES125.pl +++ b/CommonInstall/comp_delta_prereq_SLES125.pl @@ -85,7 +85,6 @@ my @openmpi_gcc_hfi_prereq = ( "glibc", "bash", - "libpsm_infinipath1", "pkg-config", "libgcc_s1", "libgfortran3", diff --git a/CommonInstall/comp_delta_prereq_SLES151.pl b/CommonInstall/comp_delta_prereq_SLES151.pl index 60aeb984..ed4f1f6b 100644 --- a/CommonInstall/comp_delta_prereq_SLES151.pl +++ b/CommonInstall/comp_delta_prereq_SLES151.pl @@ -85,7 +85,6 @@ my @openmpi_gcc_hfi_prereq = ( "glibc", "bash", - "libpsm_infinipath1", "pkg-config", "libgcc_s1", "libgfortran4", diff --git a/CommonInstall/comp_delta_prereq_SLES152.pl b/CommonInstall/comp_delta_prereq_SLES152.pl index ccac779f..4e4383fd 100644 --- a/CommonInstall/comp_delta_prereq_SLES152.pl +++ b/CommonInstall/comp_delta_prereq_SLES152.pl @@ -85,7 +85,6 @@ my @openmpi_gcc_hfi_prereq = ( "glibc", "bash", - "libpsm_infinipath1", "pkg-config", "libgcc_s1", "libgfortran4", diff --git a/CommonInstall/comp_ff_of_prereq_RHEL83.pl b/CommonInstall/comp_ff_of_prereq_RHEL83.pl new file mode 100644 index 00000000..b7dc68f1 --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_RHEL83.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_RHEL83.pl.base b/CommonInstall/comp_ff_of_prereq_RHEL83.pl.base new file mode 100644 index 00000000..b7dc68f1 --- /dev/null +++ b/CommonInstall/comp_ff_of_prereq_RHEL83.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_fm_prereq_RHEL83.pl b/CommonInstall/comp_fm_prereq_RHEL83.pl new file mode 100644 index 00000000..02e12bb0 --- /dev/null +++ b/CommonInstall/comp_fm_prereq_RHEL83.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_RHEL83.pl.base b/CommonInstall/comp_fm_prereq_RHEL83.pl.base new file mode 100644 index 00000000..02e12bb0 --- /dev/null +++ b/CommonInstall/comp_fm_prereq_RHEL83.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/main_omnipathwrap_delta.pl b/CommonInstall/main_omnipathwrap_delta.pl index 1b4688d1..a38a003f 100644 --- a/CommonInstall/main_omnipathwrap_delta.pl +++ b/CommonInstall/main_omnipathwrap_delta.pl @@ -2,6 +2,7 @@ # 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: @@ -95,6 +96,8 @@ @OmniPathAllComponents ); my @Components_rhel82 = ( "opa_stack", "mpi_selector", @OmniPathAllComponents ); +my @Components_rhel83 = ( "opa_stack", "mpi_selector", + @OmniPathAllComponents ); @Components = ( ); @@ -942,6 +945,36 @@ }, ); +my %intel_hfi_rhel83_comp_info = ( + "intel_hfi" => { Name => "Intel HFI Components", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-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 => "Intel HFI Components", @@ -1312,6 +1345,14 @@ sub init_components %opa_stack_dev_comp_info, %opa_stack_rhel_comp_info, ); + } elsif ( "$CUR_VENDOR_VER" eq "ES83" ) { + @Components = ( @Components_rhel83 ); + @SubComponents = ( @SubComponents_newer ); + %ComponentInfo = ( %ComponentInfo, %ibacm_comp_info, + %intel_hfi_rhel83_comp_info, + %opa_stack_dev_comp_info, + %opa_stack_rhel_comp_info, + ); } elsif ( "$CUR_VENDOR_VER" eq "ES15" ) { @Components = ( @Components_sles15 ); @SubComponents = ( @SubComponents_newer ); diff --git a/CommonInstall/overrides_delta.pl b/CommonInstall/overrides_delta.pl index 7882823b..e009fca6 100644 --- a/CommonInstall/overrides_delta.pl +++ b/CommonInstall/overrides_delta.pl @@ -2,6 +2,7 @@ # 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: @@ -94,6 +95,10 @@ "opa_stack_dev", "delta_ipoib", "delta_debug", ); +my @delta_Components_rhel83 = ( "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", @@ -146,6 +151,8 @@ () @Components = ( @delta_Components_rhel81 ); } elsif ( "$CUR_VENDOR_VER" eq "ES82" ) { @Components = ( @delta_Components_rhel82 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES83" ) { + @Components = ( @delta_Components_rhel83 ); } elsif ( "$CUR_VENDOR_VER" eq "ES15" ) { @Components = ( @delta_Components_sles15 ); } elsif ( "$CUR_VENDOR_VER" eq "ES151" ) { diff --git a/Esm/Makefile.linux b/Esm/Makefile.linux index 4ab2ebb3..f8b3ea27 100644 --- a/Esm/Makefile.linux +++ b/Esm/Makefile.linux @@ -1,6 +1,7 @@ # 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: @@ -145,6 +146,9 @@ endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES82" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL82.pl endif +ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES83" + PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_RHEL83.pl +endif ifeq "$(BUILD_TARGET_OS_VENDOR_VERSION)" "ES122" PREREQ_SOURCE= $(TL_DIR)/CommonInstall/comp_fm_prereq_SLES122.pl endif diff --git a/Esm/build.env b/Esm/build.env index e515431f..fec03874 100644 --- a/Esm/build.env +++ b/Esm/build.env @@ -1,6 +1,6 @@ # Adjust the environment variables if necessary export PRODUCT=VIEO_HOST -export RELEASE_TAG=10_10_3_2_2 +export RELEASE_TAG=10_11_0_0_574 export BUILD_CONFIG=${BUILD_CONFIG:-"release"} export BUILD_WITH_STACK=OPENIB export LDENVFS= diff --git a/Esm/build_label b/Esm/build_label index 91793c2d..414fb0e0 100644 --- a/Esm/build_label +++ b/Esm/build_label @@ -1 +1 @@ -Build of VIEO_HOST 11/20/20 00:46 Tag: VIEO_HOST_LINUX_opa-10_10_10_10_3_2_2 +Build of VIEO_HOST 03/29/21 23:41 Tag: VIEO_HOST_LINUX_opa-10_11_10_11_0_0_574 diff --git a/MakeTools/get_comp.sh b/MakeTools/get_comp.sh index fea09df9..85062abe 100644 --- a/MakeTools/get_comp.sh +++ b/MakeTools/get_comp.sh @@ -62,10 +62,10 @@ ## instead of an ftp. ## ## SCPSERVER - host to get packages from via SCP. Takes the form: -## "server" or "user@server:. Defaults to "phcvs2@phlsvlogin02" +## "server" or "user@server:. Defaults to "scm@cn-login01" ## ## SCPTOP - root directory to get SCP files from. Takes the form: -## "directory". Defaults to "/nfs/site/proj/stlbuilds". +## "directory". Defaults to "/nfs/shares/stlbuilds". ## ## This is designed for use in higher level scripts and makefiles, as such it ## will only download files which have not already been downloaded. @@ -101,8 +101,8 @@ shift 3 # These variables control where the pre-built packages are pulled from. # See documentation above. export FTPSERVER=${FTPSERVER:-"ftp:ftp@kop-sds-ftp"} -export SCPTOP=${SCPTOP:-"/nfs/site/proj/stlbuilds"} -export SCPSERVER=${SCPSERVER:-"phcvs2@awylogin01.aw.intel.com"}:$SCPTOP +export SCPTOP=${SCPTOP:-"/nfs/shares/stlbuilds"} +export SCPSERVER=${SCPSERVER:-"scm@cn-login01.cornelisnetworks.com"}:$SCPTOP # ftp_get_files is defined in newer versions of devtools if ! type ftp_get_files > /dev/null 2>/dev/null diff --git a/Topology/fabricdata.c b/Topology/fabricdata.c index f037d6f6..c89d6265 100644 --- a/Topology/fabricdata.c +++ b/Topology/fabricdata.c @@ -2549,7 +2549,7 @@ static void* CLFabricDataBuildRouteGraphThread(void *context) srcHcaLstp = QListNext(&fabricp->FIs, srcHcaLstp), l++) { clDeviceData_t *src_hfip = (clDeviceData_t *)QListObj(srcHcaLstp); - if (verbose >= 3) { + if (verbose >= 4) { timeGetCallback(&((clThreadContext_t *)context)->sTime, &g_cl_lock); printf("[%d] START build all routes from %s (SLID 0x%08x)\n", (int)thrdId, src_hfip->nodep->NodeDesc.NodeString, src_hfip->Lid); @@ -2722,7 +2722,7 @@ static void* CLFabricDataBuildRouteGraphThread(void *context) } } - if (verbose >= 3) { + if (verbose >= 4) { timeGetCallback(&((clThreadContext_t *)context)->eTime, &g_cl_lock); printf("[%d] END build all routes from %s (SLID 0x%08x); elapsed time(usec)=%d, (sec)=%d\n", (int)thrdId, src_hfip->nodep->NodeDesc.NodeString, src_hfip->Lid, @@ -3005,7 +3005,7 @@ static int CLDijkstraCheckDistancesAndRoutes(clGraphData_t *graphp, uint32 **dis } } - if (verbose >= 3) + if (verbose >= 4) printf("Check route summary : %d dependency graph routes have errors\n", errors); return errors; @@ -3101,7 +3101,7 @@ NodeData* CLDataAddDevice(FabricData_t *fabricp, NodeData *nodep, STL_LID lid, i else QListInsertTail(&fabricp->Switches, &ccDevicep->AllDeviceTypesEntry); //PYTHON: fabric.switches.append(device) if (verbose >= 4 && !quiet) - ProgressPrint(TRUE, "Add %s %s with GUID 0x%016"PRIx64" and LID 0x%08x", + ProgressPrint(FALSE, "Add %s %s with GUID 0x%016"PRIx64" and LID 0x%08x", StlNodeTypeToText(nodep->NodeInfo.NodeType), (char *)nodep->NodeDesc.NodeString, nodep->NodeInfo.NodeGUID, @@ -3169,7 +3169,7 @@ FSTATUS CLDataAddConnection(FabricData_t *fabricp, PortData *portp1, PortData *p ccConnp->VL = portp1->pQOS->SC2VLMaps[Enum_SCVLt].SCVLMap[sc]; if (verbose >= 4 && !quiet) - ProgressPrint(TRUE, "Add connection 0x%016"PRIx64":%3.3u to 0x%016"PRIx64":%3.3u at rate %s", + ProgressPrint(FALSE, "Add connection 0x%016"PRIx64":%3.3u to 0x%016"PRIx64":%3.3u at rate %s", portp1->nodep->NodeInfo.NodeGUID, portp1->PortNum, portp2->nodep->NodeInfo.NodeGUID, portp2->PortNum, StlStaticRateToText(portp1->rate)); } @@ -3227,7 +3227,7 @@ FSTATUS CLDataAddRoute(FabricData_t *fabricp, STL_LID slid, STL_LID dlid, PortDa //PYTHON: fabric.routes += 1 fabricp->RouteCount++; if (verbose >= 4 && !quiet) - ProgressPrint(TRUE, "Add route SLID 0x%08x to DLID 0x%08x at GUID 0x%016"PRIx64" using port %3.3u", + ProgressPrint(FALSE, "Add route SLID 0x%08x to DLID 0x%08x at GUID 0x%016"PRIx64" port %3.3u", slid, dlid, sportp->nodep->NodeInfo.NodeGUID, sportp->PortNum); } } @@ -3261,6 +3261,7 @@ FSTATUS CLFabricDataBuildRouteGraph(FabricData_t *fabricp, ValidateCLRouteSumma ValidateCreditLoopRoutesContext_t *cp = (ValidateCreditLoopRoutesContext_t *)context; int xmlFmt = (cp->format == 1) ? 1 : 0; int verbose = (xmlFmt) ? 0 : cp->detail; + int singleThreaded = 1; uint32 maxHcaListEntry = QListCount(&fabricp->FIs) / CL_MAX_THREADS; clThreadContext_t *threadContexts; @@ -3278,7 +3279,7 @@ FSTATUS CLFabricDataBuildRouteGraph(FabricData_t *fabricp, ValidateCLRouteSumma return status; } - if (!xmlFmt && verbose >= 3) { + if (!xmlFmt && verbose >= 4) { timeGetCallback(&sTime, &g_cl_lock); printf("START build graphical layout of all the routes\n"); } @@ -3286,7 +3287,7 @@ FSTATUS CLFabricDataBuildRouteGraph(FabricData_t *fabricp, ValidateCLRouteSumma pthread_mutex_init(&g_cl_lock, NULL); //PYTHON: for src_hfi in fabric.hfis : - if (QListCount(&fabricp->FIs) < 100) { + if ((singleThreaded) || (QListCount(&fabricp->FIs) < 100)) { threadContexts[0].srcHcaList = QListHead(&fabricp->FIs); // determine whether to start worker thread @@ -3349,7 +3350,7 @@ FSTATUS CLFabricDataBuildRouteGraph(FabricData_t *fabricp, ValidateCLRouteSumma if (!cp->quiet) ProgressPrint(TRUE, "Done Building Graphical Layout of All Routes"); - if (!xmlFmt && verbose >= 3) { + if (!xmlFmt && verbose >= 4) { timeGetCallback(&eTime, &g_cl_lock); printf("END build graphical layout of all the routes; elapsed time(usec)=%d, (sec)=%d\n", (int)(eTime - sTime), ((int)(eTime - sTime)) / CL_TIME_DIVISOR); @@ -3358,7 +3359,7 @@ FSTATUS CLFabricDataBuildRouteGraph(FabricData_t *fabricp, ValidateCLRouteSumma // // report routes summary if (hops_histogram != NULL) { - if (verbose >= 3) + if (verbose >= 4) routeSummaryCallback(present_routes, missing_routes, hops_histogram_entries, hops_histogram, context); MemoryDeallocate(hops_histogram); } @@ -3408,7 +3409,7 @@ void CLGraphDataPrune(clGraphData_t *graphp, ValidateCLTimeGetCallback_t timeGet uint32 ii, vv, progress = 1, round = 0; uint64_t sTime = 0, eTime = 0; - if (verbose >= 3 && !quiet) { + if (verbose >= 4 && !quiet) { timeGetCallback(&sTime, &g_cl_lock); ProgressPrint(TRUE, "START pruning of graphical layout of all the routes"); } @@ -3430,7 +3431,7 @@ void CLGraphDataPrune(clGraphData_t *graphp, ValidateCLTimeGetCallback_t timeGet for (ii = 0; ii < vertexp->InboundCount; ii++) { if (vertexp->Inbound[ii] >= 0) { if (verbose >= 4 && !quiet) - ProgressPrint(TRUE, "Remove arc id %d since vertex id %d is pure sink", + ProgressPrint(FALSE, "Remove arc id %d since vertex id %d is pure sink", vertexp->Inbound[ii], vertexp->Id); //PYTHON: self.del_arc(arc_id); CLGraphDataDelArc(graphp, vertexp->Inbound[ii]); @@ -3446,7 +3447,7 @@ void CLGraphDataPrune(clGraphData_t *graphp, ValidateCLTimeGetCallback_t timeGet for (ii = 0; ii < vertexp->OutboundCount; ii++) { if (vertexp->Outbound[ii] >= 0) { if (verbose >= 4 && !quiet) - ProgressPrint(TRUE, "Remove arc id %d since vertex id %d is pure source", + ProgressPrint(FALSE, "Remove arc id %d since vertex id %d is pure source", vertexp->Outbound[ii], vertexp->Id); //PYTHON: self.del_arc(arc_id); CLGraphDataDelArc(graphp, vertexp->Outbound[ii]); @@ -3464,7 +3465,7 @@ void CLGraphDataPrune(clGraphData_t *graphp, ValidateCLTimeGetCallback_t timeGet ProgressPrint(TRUE, "Graph pruning round %d : deleted %d arcs", round, progress); } - if (verbose >= 3 && !quiet) { + if (verbose >= 4 && !quiet) { timeGetCallback(&eTime, &g_cl_lock); ProgressPrint(TRUE, "END pruning of graphical layout of all the routes; elapsed time(usec)=%d, (sec)=%d", (int)(eTime - sTime), ((int)(eTime - sTime)) / CL_TIME_DIVISOR); @@ -3512,7 +3513,7 @@ FSTATUS CLDijkstraFindDistancesAndRoutes(clGraphData_t *graphp, clDijkstraDistan //PYTHON: num_vertices = graph.num_vertices numVertices = graphp->NumVertices; - if (verbose >= 3) + if (verbose >= 4) printf("Calculating distances for %d vertices in graph\n", numVertices); //PYTHON: for i in graph.vertices : @@ -3735,7 +3736,7 @@ FSTATUS CLDijkstraFindDistancesAndRoutes(clGraphData_t *graphp, clDijkstraDistan } } - if (verbose >= 3) + if (verbose >= 4) printf("Maximum distance is %d\n", maxDistance); // deallocate temporary buffers @@ -3821,10 +3822,8 @@ void CLDijkstraFindCycles(FabricData_t *fabricp, uint32 step; clVertixData_t *j; - if (dii || verbose >= 3) { + if (dii || verbose >= 4) { (void)linkSummaryCallback(i->Id, ib_connection_source_to_str(fabricp, i->Connection), dii, 1, indent, context); - if (verbose >= 4) - (void)pathSummaryCallback(fabricp, i->Connection, indent + 4, context); } j = i; //PYTHON: j = i @@ -3847,8 +3846,9 @@ void CLDijkstraFindCycles(FabricData_t *fabricp, if (drp->routes) { //PYTHON: for step in range(0, dii) : for (step = 0; step < dii; step++) { - (void)linkStepSummaryCallback(j->Id, ib_connection_source_to_str(fabricp, j->Connection), step, 1, indent + 4, context); - if (verbose >= 4) + if (verbose >= 2) + (void)linkStepSummaryCallback(j->Id, ib_connection_source_to_str(fabricp, j->Connection), step, 1, indent + 4, context); + if (verbose >= 3) (void)pathSummaryCallback(fabricp, j->Connection, indent + 8, context); // insert XML token to indicate the end of link step summary section if (xmlFmt) @@ -3868,8 +3868,9 @@ void CLDijkstraFindCycles(FabricData_t *fabricp, for (step = 0; step < dii; step++) { uint32 jj; - (void)linkStepSummaryCallback(j->Id, ib_connection_source_to_str(fabricp, j->Connection), step, 1, indent + 4, context); - if (verbose >= 4) + if (verbose >= 2) + (void)linkStepSummaryCallback(j->Id, ib_connection_source_to_str(fabricp, j->Connection), step, 1, indent + 4, context); + if (verbose >= 3) (void)pathSummaryCallback(fabricp, j->Connection, indent + 8, context); // insert XML token to indicate the end of link step summary section if (xmlFmt) @@ -3940,7 +3941,7 @@ void CLDijkstraFindCycles(FabricData_t *fabricp, } } - if (verbose >= 3) { + if (verbose >= 4) { if (!cycles) printf("Routes are deadlock free!\n"); else { diff --git a/Topology/route.c b/Topology/route.c index d3b0ffa9..bd5b1260 100644 --- a/Topology/route.c +++ b/Topology/route.c @@ -1705,7 +1705,7 @@ FSTATUS ValidateAllCreditLoopRoutes(FabricData_t *fabricp, EUI64 portGuid, uint8 detail = cp->detail; xmlFmt = (cp->format == 1) ? 1 : 0; - if (!xmlFmt && cp->detail >= 3) { + if (!xmlFmt && cp->detail >= 4) { timeGetCallback(&sTotalTime, &g_cl_lock); timeGetCallback(&sTime, &g_cl_lock); printf("START build all the routes\n"); @@ -1722,7 +1722,7 @@ FSTATUS ValidateAllCreditLoopRoutes(FabricData_t *fabricp, EUI64 portGuid, uint8 // collect routing information between all endnodes within the fabric for (n1 = QListHead(&fabricp->AllFIs); n1 != NULL; n1 = QListNext(&fabricp->AllFIs, n1)) { NodeData *nodep1 = (NodeData *)QListObj(n1); - if (!xmlFmt && cp->detail >= 3) { + if (!xmlFmt && cp->detail >= 4) { printf("START build all routes from %s\n", nodep1->NodeDesc.NodeString); } @@ -1756,7 +1756,7 @@ FSTATUS ValidateAllCreditLoopRoutes(FabricData_t *fabricp, EUI64 portGuid, uint8 } } } - if (!xmlFmt && cp->detail >= 3) { + if (!xmlFmt && cp->detail >= 4) { printf("END build all routes from %s\n", nodep1->NodeDesc.NodeString); printf("%d of %d HFI nodes completed\n", ++nodeCount, QListCount(&fabricp->AllFIs)); } else { @@ -1766,7 +1766,7 @@ FSTATUS ValidateAllCreditLoopRoutes(FabricData_t *fabricp, EUI64 portGuid, uint8 } } - if (!xmlFmt && cp->detail >= 3) { + if (!xmlFmt && cp->detail >= 4) { timeGetCallback(&eTime, &g_cl_lock); printf("END build all the routes; elapsed time(usec)=%d, (sec)=%d\n", (int)(eTime - sTime), ((int)(eTime - sTime)) / CL_TIME_DIVISOR); @@ -1787,7 +1787,7 @@ FSTATUS ValidateAllCreditLoopRoutes(FabricData_t *fabricp, EUI64 portGuid, uint8 if (!CLFabricDataBuildRouteGraph(fabricp, routeSummaryCallback, timeGetCallback, cp, usedSLs)) { clGraphData_t *graphp; - if (detail >= 3) { + if (detail >= 4) { //PYTHON: full_graph.summary('Full graph') (void)CLGraphDataSummary(&fabricp->Graph, (xmlFmt) ? "FullGraph" : "Full graph", dataSummaryCallback, cp); } @@ -1796,7 +1796,7 @@ FSTATUS ValidateAllCreditLoopRoutes(FabricData_t *fabricp, EUI64 portGuid, uint8 //PYTHON: pruned_graph.prune() (void)CLGraphDataPrune(&fabricp->Graph, timeGetCallback, detail, cp->quiet); - if (detail >= 3) { + if (detail >= 4) { //PYTHON: pruned_graph.summary('Pruned graph') (void)CLGraphDataSummary(&fabricp->Graph, (xmlFmt) ? "PrunedGraph" : "Pruned graph", dataSummaryCallback, cp); } @@ -1817,7 +1817,7 @@ FSTATUS ValidateAllCreditLoopRoutes(FabricData_t *fabricp, EUI64 portGuid, uint8 //PYTHON: while split_graph : while (graphp) { - if (detail >= 3) { + if (detail >= 4) { if (xmlFmt) sprintf(title, "SplitGraph%d", count); else @@ -1845,7 +1845,7 @@ FSTATUS ValidateAllCreditLoopRoutes(FabricData_t *fabricp, EUI64 portGuid, uint8 count += 1; } - if (detail >= 3 && count > 1) + if (detail >= 4 && count > 1) printf("Dependencies split into %d disconnected graphs\n", count); } @@ -1855,7 +1855,7 @@ FSTATUS ValidateAllCreditLoopRoutes(FabricData_t *fabricp, EUI64 portGuid, uint8 fprintf(stderr, "Warning, failed to deallocate route credit loop data\n"); } - if (!xmlFmt && cp->detail >= 3) { + if (!xmlFmt && cp->detail >= 4) { timeGetCallback(&eTotalTime, &g_cl_lock); printf("END Credit loop validation; elapsed time(usec)=%12"PRIu64", (sec)=%12"PRIu64"\n", (eTotalTime - sTotalTime), ((eTotalTime - sTotalTime)) / CL_TIME_DIVISOR);