Datasets:

fals3
/

cvevc_commits

Modalities:

Formats:

Size:

Libraries:

Dataset card Data Studio Files Files and versions

Dataset Viewer

Auto-converted to Parquet

Subset (2)

non_patches · 8.66M rows

Split (3)

train · 3.81M rows

commit_id stringlengths 40 40	owner stringclasses 29 values	repo stringclasses 30 values	commit_message stringlengths 1 409k	diff stringlengths 147 117M	label int64 0 0
b5eaf8d7a4170fcd25dcf939ac7fca7cfcab3e41	01org	opa-fm	Update to latest from build 10.5.1.0.1 (IFS 10.5.1.0.2)	commit b5eaf8d7a4170fcd25dcf939ac7fca7cfcab3e41 Author: Scott Breyer <[email protected]> Date: Mon Sep 18 14:57:58 2017 -0400 Update to latest from build 10.5.1.0.1 (IFS 10.5.1.0.2) diff --git a/CommonInstall/main_omnipathwrap_delta.pl b/CommonInstall/main_omnipathwrap_delta.pl index fcd0fbc..6b00a7c 100644 --- a/CommonInstall/main_omnipathwrap_delta.pl +++ b/CommonInstall/main_omnipathwrap_delta.pl @@ -436,7 +436,7 @@ my %ComponentInfo_rhel72 = ( DefaultInstall => $State_Install, SrcDir => file_glob("./IntelOPA-Tools."), DriverSubdir => "", - PreReq => " opa_stack ", CoReq => " opa_stack ", + PreReq => " opa_stack ibacm ", CoReq => " opa_stack ", Hidden => 0, Disabled => 0, HasStart => 1, HasFirmware => 0, DefaultStart => 0, StartPreReq => " opa_stack ", # TBD diff --git a/Esm/ib/src/smi/sm/sm_qos.c b/Esm/ib/src/smi/sm/sm_qos.c index 539f450..8fef69a 100644 --- a/Esm/ib/src/smi/sm/sm_qos.c +++ b/Esm/ib/src/smi/sm/sm_qos.c @@ -2276,11 +2276,11 @@ sm_aggregateToBfrctrl(Node_t * nodep, STL_AGGREGATE * aggr) do { Port_t portp = sm_get_port(nodep, startPort + i); - if (!sm_valid_port(portp)) continue; - - portp->portData->bufCtrlTable = ((STL_BUFFER_CONTROL_TABLE)data); - portp->portData->current.bfrctrl = 1; - BSWAP_STL_BUFFER_CONTROL_TABLE(&(portp->portData->bufCtrlTable)); + if (sm_valid_port(portp)) { + portp->portData->bufCtrlTable = ((STL_BUFFER_CONTROL_TABLE*)data); + portp->portData->current.bfrctrl = 1; + BSWAP_STL_BUFFER_CONTROL_TABLE(&(portp->portData->bufCtrlTable)); + } data += STL_BFRCTRLTAB_PAD_SIZE; } while (++i < count); diff --git a/opa-fm.spec.in b/opa-fm.spec.in index 11404e2..f409549 100644 --- a/opa-fm.spec.in +++ b/opa-fm.spec.in @@ -29,8 +29,8 @@ #[ICS VERSION STRING: unknown] Name: opa-fm -Version: 10.5.0.0 -Release: 136%{?dist} +Version: 10.5.1.0 +Release: 1%{?dist} Summary: Intel Omni-Path Fabric Management Software License: GPLv2 or BSD	0
536c98a5d7c6c96509c8c8334d4ab1fbb21dfd0e	01org	opa-fm	Correct version in spec file	commit 536c98a5d7c6c96509c8c8334d4ab1fbb21dfd0e Author: Scott Breyer <[email protected]> Date: Thu Apr 22 11:35:24 2021 -0400 Correct version in spec file diff --git a/opa-fm.spec.in b/opa-fm.spec.in index a6b041c..d63f18f 100644 --- a/opa-fm.spec.in +++ b/opa-fm.spec.in @@ -29,8 +29,8 @@ #[ICS VERSION STRING: unknown] Name: opa-fm -Version: 10.10.3.0 -Release: 11%{?dist} +Version: 10.11.0.0 +Release: 574%{?dist} %if 0%{?rhel} Epoch: 1 %endif	0
d12979a8ed6e508a9c33972561a80c3af9cb6ae8	01org	opa-fm	Revert "Add script for building (S)RPMs" This reverts commit 3117bba5cf249fd9e721d7273b645fa7f49ca076.	commit d12979a8ed6e508a9c33972561a80c3af9cb6ae8 Author: Brendan Cunningham <[email protected]> Date: Thu Sep 24 15:34:41 2015 -0400 Revert "Add script for building (S)RPMs" This reverts commit 3117bba5cf249fd9e721d7273b645fa7f49ca076. diff --git a/build_rpms.bash b/build_rpms.bash deleted file mode 100755 index 1bfc2bf..0000000 --- a/build_rpms.bash +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -mkdir -p $HOME/rpmbuild/{SOURCES,RPMS,SRPMS} -tar czf $HOME/rpmbuild/SOURCES/opa-fm.tar.gz --exclude-vcs . -rpmbuild -ba ./opafm.spec	0
1a257f708ed6548e09f41cc26b6600b3c28466b4	01org	opa-fm	Advance release number for latest change	commit 1a257f708ed6548e09f41cc26b6600b3c28466b4 Author: Scott Breyer <[email protected]> Date: Tue Jun 5 11:42:27 2018 -0400 Advance release number for latest change diff --git a/Esm/build.env b/Esm/build.env index 7e4d2b8..cec6a88 100644 --- a/Esm/build.env +++ b/Esm/build.env @@ -1,5 +1,5 @@ # Adjust the environment variables if necessary export PRODUCT=VIEO_HOST -export RELEASE_TAG=10_7_0_0_143 +export RELEASE_TAG=10_7_0_0_144 export BUILD_CONFIG=${BUILD_CONFIG:-"release"} export BUILD_WITH_STACK=OPENIB diff --git a/opa-fm.spec.in b/opa-fm.spec.in index b684635..eab77b9 100644 --- a/opa-fm.spec.in +++ b/opa-fm.spec.in @@ -30,7 +30,7 @@ #[ICS VERSION STRING: unknown] Name: opa-fm Version: 10.7.0.0 -Release: 143%{?dist} +Release: 144%{?dist} Summary: Intel Omni-Path Fabric Management Software License: GPLv2 or BSD	0
ec1b6bfbfef7e4f8124437e7be41ce858616456a	01org	opa-fm	Update to latest from build 10.3.0.0.81 (FM 10.3.0.0.67)	commit ec1b6bfbfef7e4f8124437e7be41ce858616456a Author: Scott Breyer <[email protected]> Date: Wed Nov 16 17:16:34 2016 -0500 Update to latest from build 10.3.0.0.81 (FM 10.3.0.0.67) diff --git a/CommonInstall/comp_delta.pl b/CommonInstall/comp_delta.pl index 8818af4..d1893aa 100755 --- a/CommonInstall/comp_delta.pl +++ b/CommonInstall/comp_delta.pl @@ -110,6 +110,54 @@ my @delta_components_rhel70 = ( my @delta_components_sles = ( @delta_components_other ); +my @delta_components_rhel70 = ( + "opa_stack", # Kernel drivers. + "ibacm", # OFA IB communication manager assistant. + "intel_hfi", # HFI drivers + "delta_ipoib", # ipoib module. + "mpi_selector", + "mvapich2", + "openmpi", + "gasnet", + "openshmem", + "opa_stack_dev", # dev libraries. + "delta_mpisrc", # Source bundle for MPIs. + "mpiRest", # PGI, Intel mpi variants. + "delta_debug", # must be last real component +); + +my @delta_components_sles12_sp2 = ( + "opa_stack", # Kernel drivers. + "intel_hfi", # HFI drivers + "delta_ipoib", # ipoib module. + "mpi_selector", + "mvapich2", + "openmpi", + "gasnet", + "openshmem", + "opa_stack_dev", # dev libraries. + "delta_mpisrc", # Source bundle for MPIs. + "mpiRest", # PGI, Intel mpi variants. + "hfi1_uefi", + "delta_debug", # must be last real component +); + +my @delta_components_rhel73 = ( + "opa_stack", # Kernel drivers. + "intel_hfi", # HFI drivers + "delta_ipoib", # ipoib module. + "mpi_selector", + "mvapich2", + "openmpi", + "gasnet", + "openshmem", + "opa_stack_dev", # dev libraries. + "delta_mpisrc", # Source bundle for MPIs. + "mpiRest", # PGI, Intel mpi variants. + "hfi1_uefi", + "delta_debug", # must be last real component +); + my @delta_components = ( ); @@ -166,6 +214,40 @@ my %intel_hfi_comp_info = ( }, ); +my %intel_hfi_sles12_sp2_comp_info = ( + 'intel_hfi' => { + KernelRpms => [ ], + UserRpms => [ "libpsm2", + "libpsm2-devel", "libpsm2-compat", + "hfi1-diagtools-sw", "hfidiags", + "hfi1-firmware", "hfi1-firmware_debug" + ], + DebugRpms => [ "hfi1-diagtools-sw-debuginfo", + "libpsm2-debuginfo" + ], + Drivers => "", + StartupScript => "", + StartupParams => [ ], + }, +); + +my %intel_hfi_rhel73_comp_info = ( + 'intel_hfi' => { + KernelRpms => [ ], + UserRpms => [ "libpsm2", + "libpsm2-devel", "libpsm2-compat", + "hfi1-diagtools-sw", "hfidiags", + "hfi1-firmware", "hfi1-firmware_debug" + ], + DebugRpms => [ "hfi1-diagtools-sw-debuginfo", + "libpsm2-debuginfo" + ], + Drivers => "", + StartupScript => "", + StartupParams => [ ], + }, +); + my %ib_wfr_lite_comp_info = ( 'ib_wfr_lite' => { KernelRpms => [ ], @@ -274,8 +356,30 @@ my %opa_stack_dev_rhel70_comp_info = ( my %opa_stack_dev_rhel72_comp_info = ( 'opa_stack_dev' => { - KernelRpms => [ "ifs-kernel-updates-devel" ], - UserRpms => [ "ibacm-devel" ], + KernelRpms => [ ], + UserRpms => [ "ifs-kernel-updates-devel", "ibacm-devel" ], + DebugRpms => [ ], + Drivers => "", # none + StartupScript => "", + StartupParams => [ ], + }, +); + +my %opa_stack_dev_sles12_sp2_comp_info = ( + 'opa_stack_dev' => { + KernelRpms => [ ], + UserRpms => [ "ifs-kernel-updates-devel" ], + DebugRpms => [ ], + Drivers => "", # none + StartupScript => "", + StartupParams => [ ], + }, +); + +my %opa_stack_dev_rhel73_comp_info = ( + 'opa_stack_dev' => { + KernelRpms => [ ], + UserRpms => [ ], DebugRpms => [ ], Drivers => "", # none StartupScript => "", @@ -359,7 +463,7 @@ my %opa_stack_other_comp_info = ( my %opa_stack_rhel72_comp_info = ( 'opa_stack' => { - KernelRpms => [ "ifs-kernel-updates" ], # special case + KernelRpms => [ "kmod-ifs-kernel-updates" ], # special case UserRpms => [ "opa-scripts", "srptools", ], @@ -405,6 +509,28 @@ my %opa_stack_sles_comp_info = ( }, ); +my %opa_stack_sles12_sp2_comp_info = ( + 'opa_stack' => { + KernelRpms => [ "ifs-kernel-updates-kmp-default" ], # special case + UserRpms => [ "opa-scripts" ], + DebugRpms => [ ], + Drivers => "", + StartupScript => "opa", + StartupParams => [ "ARPTABLE_TUNING" ], + }, +); + +my %opa_stack_rhel73_comp_info = ( + 'opa_stack' => { + KernelRpms => [ "kmod-ifs-kernel-updates" ], # special case + UserRpms => [ "opa-scripts" ], + DebugRpms => [ ], + Drivers => "", + StartupScript => "opa", + StartupParams => [ "ARPTABLE_TUNING" ], + }, +); + my %delta_comp_info_other = ( %opa_stack_other_comp_info, %ibacm_comp_info, @@ -476,6 +602,39 @@ my %delta_comp_info_sles = ( %delta_debug_comp_info, ); +my %delta_comp_info_sles12_sp2 = ( + %opa_stack_sles12_sp2_comp_info, + %intel_hfi_sles12_sp2_comp_info, + %ib_wfr_lite_comp_info, + %delta_ipoib_comp_info, + %mpi_selector_comp_info, + %mvapich2_comp_info, + %openmpi_comp_info, + %gasnet_comp_info, + %openshmem_comp_info, + %opa_stack_dev_sles12_sp2_comp_info, + %delta_mpisrc_comp_info, + %mpiRest_comp_info, + %hfi1_uefi_comp_info, + %delta_debug_comp_info, +); + +my %delta_comp_info_rhel73 = ( + %opa_stack_rhel73_comp_info, + %intel_hfi_rhel73_comp_info, + %ib_wfr_lite_comp_info, + %delta_ipoib_comp_info, + %mpi_selector_comp_info, + %mvapich2_comp_info, + %openmpi_comp_info, + %gasnet_comp_info, + %openshmem_comp_info, + %delta_mpisrc_comp_info, + %mpiRest_comp_info, + %hfi1_uefi_comp_info, + %delta_debug_comp_info, +); + my %delta_comp_info = ( ); # options for building compat-rdma srpm and what platforms they @@ -490,9 +649,11 @@ my %delta_kernel_ib_options = ( # all kernel srpms # these are in the order we must build/process them to meet basic dependencies my @delta_kernel_srpms_other = ( 'compat-rdma' ); -my @delta_kernel_srpms_rhel72 = ( 'ifs-kernel-updates' ); +my @delta_kernel_srpms_rhel72 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms_rhel70 = ( 'compat-rdma' ); my @delta_kernel_srpms_sles = ( 'compat-rdma' ); +my @delta_kernel_srpms_sles12_sp2 = ( 'ifs-kernel-updates-kmp-default' ); +my @delta_kernel_srpms_rhel73 = ( 'kmod-ifs-kernel-updates' ); my @delta_kernel_srpms = ( ); # all user space srpms @@ -521,6 +682,18 @@ my @delta_user_srpms_sles = ( "mvapich2", "openmpi", "gasnet", "openshmem", "openshmem-test-suite", "shmem-benchmarks", "srptools", "libibmad5", "infiniband-diags", "hfi1_uefi" ); +my @delta_user_srpms_sles12_sp2 = ( + "opa-scripts", "mpi-selector", + "libpsm2", "hfi1-diagtools-sw", "hfidiags", "hfi1-firmware", "hfi1-firmware_debug", + "mvapich2", "openmpi", "gasnet", "openshmem", "openshmem-test-suite", + "shmem-benchmarks", "hfi1_uefi" +); +my @delta_user_srpms_rhel73 = ( + "opa-scripts", "mpi-selector", + "libpsm2", "hfi1-diagtools-sw", "hfidiags", "hfi1-firmware", "hfi1-firmware_debug", + "mvapich2", "openmpi", "gasnet", "openshmem", "openshmem-test-suite", + "shmem-benchmarks", "hfi1_uefi" +); my @delta_user_srpms = ( ); # rpms not presently automatically built @@ -773,9 +946,18 @@ my %hfi1_uefi_srpm_info = ( }, ); -my %ifs_kernel_updates_rhel72_srpm_info = ( - "ifs-kernel-updates" => { Available => "", - Builds => "ifs-kernel-updates ifs-kernel-updates-devel", +my %kmp_ifs_kernel_updates_srpm_info = ( + "ifs-kernel-updates-kmp-default" => { Available => "", + Builds => "ifs-kernel-updates-kmp-default ifs-kernel-updates-devel", + PostReq => "ifs-kernel-updates-devel", + PartOf => "", # filled in at runtime + BuildPrereq => [], + }, +); + +my %kmod_ifs_kernel_updates_srpm_info = ( + "kmod-ifs-kernel-updates" => { Available => "", + Builds => "kmod-ifs-kernel-updates ifs-kernel-updates-devel", PostReq => "ifs-kernel-updates-devel", PartOf => "", # filled in at runtime BuildPrereq => [], @@ -808,7 +990,7 @@ my %delta_srpm_info_other = ( ); my %delta_srpm_info_rhel72 = ( - %ifs_kernel_updates_rhel72_srpm_info, + %kmod_ifs_kernel_updates_srpm_info, %hfi1_psm_srpm_info, %libhfi1_srpm_info, %hfi1_diagtools_sw_srpm_info, @@ -881,6 +1063,43 @@ my %delta_srpm_info_sles = ( %hfi1_uefi_srpm_info, ); +my %delta_srpm_info_sles12_sp2 = ( + %kmp_ifs_kernel_updates_srpm_info, + %hfi1_psm_srpm_info, + %hfi1_diagtools_sw_srpm_info, + %hfidiags_srpm_info, + %hfi1_firmware_srpm_info, + %hfi1_firmware_debug_srpm_info, + %opa_scripts_srpm_info, + %mpi_selector_srpm_info, + %mvapich2_srpm_info, + %openmpi_srpm_info, + %gasnet_srpm_info, + %openshmem_srpm_info, + %openshmem_test_suite_srpm_info, + %shmem_benchmarks_srpm_info, + %infiniband_diags_srpm_info, + %hfi1_uefi_srpm_info, +); + +my %delta_srpm_info_rhel73 = ( + %kmod_ifs_kernel_updates_srpm_info, + %hfi1_psm_srpm_info, + %hfi1_diagtools_sw_srpm_info, + %hfidiags_srpm_info, + %hfi1_firmware_srpm_info, + %hfi1_firmware_debug_srpm_info, + %opa_scripts_srpm_info, + %mpi_selector_srpm_info, + %mvapich2_srpm_info, + %openmpi_srpm_info, + %gasnet_srpm_info, + %openshmem_srpm_info, + %openshmem_test_suite_srpm_info, + %shmem_benchmarks_srpm_info, + %infiniband_diags_srpm_info, + %hfi1_uefi_srpm_info, +); my %delta_srpm_info = ( ); @@ -931,6 +1150,19 @@ sub init_delta_rpm_info($) @delta_kernel_srpms = ( @delta_kernel_srpms_sles ); @delta_user_srpms = ( @delta_user_srpms_sles ); %delta_srpm_info = ( %delta_srpm_info_sles ); + } elsif ("$CUR_DISTRO_VENDOR" eq 'SuSE' + && "$CUR_VENDOR_VER" eq 'ES122') { + @delta_components = ( @delta_components_sles12_sp2 ); + %delta_comp_info = ( %delta_comp_info_sles12_sp2 ); + @delta_kernel_srpms = ( @delta_kernel_srpms_sles12_sp2 ); + @delta_user_srpms = ( @delta_user_srpms_sles12_sp2 ); + %delta_srpm_info = ( %delta_srpm_info_sles12_sp2 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES73" ) { + @delta_components = ( @delta_components_rhel73 ); + %delta_comp_info = ( %delta_comp_info_rhel73 ); + @delta_kernel_srpms = ( @delta_kernel_srpms_rhel73 ); + @delta_user_srpms = ( @delta_user_srpms_rhel73 ); + %delta_srpm_info = ( %delta_srpm_info_rhel73 ); } elsif ( "$CUR_VENDOR_VER" eq "ES72" ) { @delta_components = ( @delta_components_rhel72 ); %delta_comp_info = ( %delta_comp_info_rhel72 ); @@ -1090,8 +1322,8 @@ sub delta_rpm_install_list($$$@) { if ($delta_rpm_info{$package}{'Available'} ) { if ( "$delta_rpm_info{$package}{'Mode'}" eq "kernel" ) { - if ( "$CUR_VENDOR_VER" eq "ES72" ) { - if ( " $package " =~ / ifs-kernel-updates / ) { + if ( "$CUR_VENDOR_VER" eq "ES72" \|\| "$CUR_VENDOR_VER" eq "ES73" \|\| "$CUR_VENDOR_VER" eq "ES122" ) { + if ( $package =~ /ifs-kernel-updates/ ) { next if ( $skip_kernelib); $ret = 1; } @@ -1420,6 +1652,10 @@ sub build_srpm($$$$$) $SRC_RPM = delta_srpm_file($srcdir, "libibmad-.src.rpm"); } elsif ("$srpm" eq "openshmem") { $SRC_RPM = delta_srpm_file($srcdir, "${srpm}_.src.rpm"); + } elsif ("$srpm" eq "kmod-ifs-kernel-updates") { + $SRC_RPM = delta_srpm_file($srcdir, "ifs-kernel-updates.src.rpm"); + } elsif ("$srpm" eq "ifs-kernel-updates-kmp-default") { + $SRC_RPM = delta_srpm_file($srcdir, "ifs-kernel-updates.src.rpm"); } # convert a few variables into the names used in OFED's build_rpm @@ -2363,9 +2599,12 @@ sub available_opa_stack() sub installed_delta_opa_stack() { my $driver_subdir=$ComponentInfo{'opa_stack'}{'DriverSubdir'}; - if ( "$CUR_VENDOR_VER" eq "ES72" ) { + if ( "$CUR_VENDOR_VER" eq "ES72" \|\| "$CUR_VENDOR_VER" eq "ES73" ) { + return ( -e "$ROOT$BASE_DIR/version_delta" + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq 'ES122' ) { return ( -e "$ROOT$BASE_DIR/version_delta" - && rpm_is_installed("ifs-kernel-updates", $CUR_OS_VER)); + && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); } elsif ( "$CUR_VENDOR_VER" eq 'ES12' \|\| "$CUR_VENDOR_VER" eq 'ES121' ) { return (rpm_is_installed("libibumad3", "user") && -e "$ROOT$BASE_DIR/version_delta" @@ -2628,10 +2867,14 @@ sub available_intel_hfi() sub installed_intel_hfi() { my $driver_subdir=$ComponentInfo{'intel_hfi'}{'DriverSubdir'}; - if ( "$CUR_VENDOR_VER" eq "ES72" ) { + if ( "$CUR_VENDOR_VER" eq "ES72" \|\| "$CUR_VENDOR_VER" eq "ES73" ) { return (rpm_is_installed("libhfi1", "user") && -e "$ROOT$BASE_DIR/version_delta" - && rpm_is_installed("ifs-kernel-updates", $CUR_OS_VER)); + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER)); + } elsif ( "$CUR_VENDOR_VER" eq "ES122" ) { + return (rpm_is_installed("libhfi1verbs-rdmav2", "user") + && -e "$ROOT$BASE_DIR/version_delta" + && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER)); } else { return (rpm_is_installed("libhfi1", "user") && -e "$ROOT$BASE_DIR/version_delta" @@ -2985,9 +3228,12 @@ sub available_delta_ipoib() sub installed_delta_ipoib() { my $driver_subdir=$ComponentInfo{'delta_ipoib'}{'DriverSubdir'}; - if ( "$CUR_VENDOR_VER" eq "ES72" ) { + if ( "$CUR_VENDOR_VER" eq "ES72" \|\| "$CUR_VENDOR_VER" eq "ES73" ) { + return ((-e "$ROOT$BASE_DIR/version_delta" + && rpm_is_installed("kmod-ifs-kernel-updates", $CUR_OS_VER))); + } elsif ( "$CUR_VENDOR_VER" eq "ES122" ) { return ((-e "$ROOT$BASE_DIR/version_delta" - && rpm_is_installed("ifs-kernel-updates", $CUR_OS_VER))); + && rpm_is_installed("ifs-kernel-updates-kmp-default", $CUR_OS_VER))); } else { return ((-e "$ROOT$BASE_DIR/version_delta" && rpm_is_installed("compat-rdma", $CUR_OS_VER))); diff --git a/CommonInstall/limits.conf.SuSE.ES122 b/CommonInstall/limits.conf.SuSE.ES122 new file mode 100644 index 0000000..97ec4a3 --- /dev/null +++ b/CommonInstall/limits.conf.SuSE.ES122 @@ -0,0 +1,9 @@ +# -- All OPA Settings Start here -- +# [ICS VERSION STRING: unknown] +# User space Infiniband verbs require memlock permissions +# if desired you can limit these permissions to the users permitted to use OPA +# and/or reduce the limits. Keep in mind this limit is per user +# (not per process) +* hard memlock unlimited +* soft memlock unlimited +# -- All OPA Settings End here -- diff --git a/CommonInstall/limits.conf.redhat.ES73 b/CommonInstall/limits.conf.redhat.ES73 new file mode 100644 index 0000000..97ec4a3 --- /dev/null +++ b/CommonInstall/limits.conf.redhat.ES73 @@ -0,0 +1,9 @@ +# -- All OPA Settings Start here -- +# [ICS VERSION STRING: unknown] +# User space Infiniband verbs require memlock permissions +# if desired you can limit these permissions to the users permitted to use OPA +# and/or reduce the limits. Keep in mind this limit is per user +# (not per process) +* hard memlock unlimited +* soft memlock unlimited +# -- All OPA Settings End here -- diff --git a/CommonInstall/main_delta.pl b/CommonInstall/main_delta.pl index ca0a91e..65f7bd9 100755 --- a/CommonInstall/main_delta.pl +++ b/CommonInstall/main_delta.pl @@ -69,6 +69,14 @@ my @Components_rhel72 = ( "opa_stack", "ibacm", "intel_hfi", "mpi_selector", "delta_mpisrc", "hfi1_uefi", "delta_debug", ); +my @Components_sles12_sp2 = ( "opa_stack", "intel_hfi", "mpi_selector", + "delta_ipoib", + "opa_stack_dev", + "gasnet", "openshmem", + "mvapich2", "openmpi", + "delta_mpisrc", + "hfi1_uefi", + "delta_debug", ); @Components = ( ); # delta_debug must be last @@ -390,6 +398,130 @@ my %ComponentInfo_rhel72 = ( }, ); +my %ComponentInfo_sles12_sp2 = ( + # our special WrapperComponent, limited use + "opa_config_delta" => { Name => "opa_config_delta", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "", + PreReq => "", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "opa_stack" => { Name => "OFA OPA Stack", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "updates", + PreReq => "", CoReq => "", + # TBD - HasFirmware - FW update + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => "", + StartComponents => [ "opa_stack" ], + }, + "intel_hfi" => { Name => "Intel HFI Components", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "updates", + PreReq => " opa_stack ", CoReq => "", + # TBD - HasFirmware - FW update + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => " opa_stack ", + StartComponents => [ "intel_hfi" ], + }, + "mpi_selector" => { Name => "MPI selector", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 1, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "delta_ipoib" => { Name => "OFA IP over IB", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "updates", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => " opa_stack ", + StartComponents => [ "delta_ipoib" ], + }, + "mvapich2" => { Name => "MVAPICH2 (verbs,gcc)", + DefaultInstall => $State_DoNotInstall, + SrcDir => ".", DriverSubdir => "", + PreReq => " intel_hfi opa_stack mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "openmpi" => { Name => "OpenMPI (verbs,gcc)", + DefaultInstall => $State_DoNotInstall, + SrcDir => ".", DriverSubdir => "", + PreReq => " intel_hfi opa_stack mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "gasnet" => { Name => "Gasnet HFI (gcc)", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "", + PreReq => " intel_hfi opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "openshmem" => { Name => "OpenSHMEM HFI (gcc)", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "", + PreReq => " intel_hfi opa_stack gasnet", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "opa_stack_dev" => { Name => "OFA OPA Development", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "delta_mpisrc" =>{ Name => "MPI Source", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "", + PreReq => " opa_stack opa_stack_dev mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "delta_debug" =>{ Name => "OFA Debug Info", + DefaultInstall => $State_DoNotInstall, + SrcDir => ".", DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "hfi1_uefi" => { Name => "Pre-Boot Components", + DefaultInstall => $State_DoNotInstall, + SrcDir => ".", DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + ); + + %ComponentInfo = ( ); # translate from startup script name to component/subcomponent name @@ -419,6 +551,9 @@ sub init_components if ( "$CUR_VENDOR_VER" eq "ES72" ) { @Components = ( @Components_rhel72 ); %ComponentInfo = ( %ComponentInfo_rhel72 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES122" ) { + @Components = ( @Components_sles12_sp2 ); + %ComponentInfo = ( %ComponentInfo_sles12_sp2 ); } else { @Components = ( @Components_other ); %ComponentInfo = ( %ComponentInfo_other ); diff --git a/CommonInstall/main_omnipathwrap_delta.pl b/CommonInstall/main_omnipathwrap_delta.pl index 1a20d95..9f8d9c8 100644 --- a/CommonInstall/main_omnipathwrap_delta.pl +++ b/CommonInstall/main_omnipathwrap_delta.pl @@ -74,6 +74,20 @@ my @Components_rhel72 = ( "opa_stack", "ibacm", "mpi_selector", "intel_hfi", "gasnet", "openshmem", "mvapich2", "openmpi", "delta_mpisrc", "hfi1_uefi", "delta_debug", ); +my @Components_sles12_sp2 = ( "opa_stack", "mpi_selector", "intel_hfi", + "oftools", "opa_stack_dev", "fastfabric", + "delta_ipoib", "opafm", + @OmniPathAllComponents, + "gasnet", "openshmem", + "mvapich2", "openmpi", + "delta_mpisrc", "hfi1_uefi", "delta_debug", ); +my @Components_rhel73 = ( "opa_stack", "mpi_selector", "intel_hfi", + "oftools", "opa_stack_dev", "fastfabric", + "delta_ipoib", "opafm", + @OmniPathAllComponents, + "gasnet", "openshmem", + "mvapich2", "openmpi", + "delta_mpisrc", "hfi1_uefi", "delta_debug", ); @Components = ( ); # delta_debug must be last @@ -571,6 +585,425 @@ my %ComponentInfo_rhel72 = ( }, ); +my %ComponentInfo_sles12_sp2 = ( + # our special WrapperComponent, limited use + "opaconfig" => { Name => "opaconfig", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "", + PreReq => "", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, + StartPreReq => "", + StartComponents => [ ], + }, + # "ofed" is only used for source_comp + "ofed_delta" => { Name => "OFA_DELTA", + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + }, + "opa_stack" => { Name => "OFA OPA Stack", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "updates", + PreReq => "", CoReq => " oftools ", + # TBD - HasFirmware - FW update + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => "", + StartComponents => [ "opa_stack" ], + }, + "intel_hfi" => { Name => "Intel HFI Components", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "updates", + PreReq => " opa_stack ", CoReq => " oftools ", + # TBD - HasFirmware - FW update + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => " opa_stack ", + StartComponents => [ "intel_hfi" ], + }, + "oftools" => { Name => "OPA Tools", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-Tools."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => " opa_stack ", + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 0, + StartPreReq => " opa_stack ", # TBD + StartComponents => [ ], + }, + "mpi_selector" => { Name => "MPI selector", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 1, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "opa_stack_dev" => { Name => "OFA OPA Development", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "fastfabric" => { Name => "FastFabric", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-Tools."), + DriverSubdir => "", + PreReq => " opa_stack oftools ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => " opa_stack ", + StartComponents => [ ], + }, + "delta_ipoib" => { Name => "OFA IP over IB", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "updates", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => " opa_stack ", + StartComponents => [ "delta_ipoib" ], + }, + "mvapich2" => { Name => "MVAPICH2 (verbs,gcc)", + DefaultInstall => $State_DoNotInstall, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack mpi_selector intel_hfi ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "openmpi" => { Name => "OpenMPI (verbs,gcc)", + DefaultInstall => $State_DoNotInstall, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack mpi_selector intel_hfi ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "gasnet" => { Name => "GASNet (hfi,gcc)", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack intel_hfi ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "openshmem" => { Name => "OpenSHMEM (hfi,gcc)", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack gasnet intel_hfi ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "mvapich2_gcc_hfi" => { Name => "MVAPICH2 (hfi,gcc)", + DefaultInstall => $State_Install, + SrcDir => file_glob ("./OFED_MPIS."), + DriverSubdir => "", + PreReq => " opa_stack intel_hfi mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "mvapich2_intel_hfi" => { Name => "MVAPICH2 (hfi,Intel)", + DefaultInstall => $State_Install, + SrcDir => file_glob ("./OFED_MPIS."), + DriverSubdir => "", + PreReq => " opa_stack intel_hfi mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "openmpi_gcc_hfi" => { Name => "OpenMPI (hfi,gcc)", + DefaultInstall => $State_Install, + SrcDir => file_glob ("./OFED_MPIS."), + DriverSubdir => "", + PreReq => " opa_stack intel_hfi mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "openmpi_intel_hfi" => { Name => "OpenMPI (hfi,Intel)", + DefaultInstall => $State_Install, + SrcDir => file_glob ("./OFED_MPIS."), + DriverSubdir => "", + PreReq => " opa_stack intel_hfi mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "delta_mpisrc" =>{ Name => "MPI Source", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack opa_stack_dev mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "opafm" => { Name => "OPA FM", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-FM."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 0, + StartPreReq => " opa_stack ", + #StartComponents => [ "qlgc_fm", "qlgc_fm_snmp"], + StartComponents => [ "opafm" ], + }, + "delta_debug" => { Name => "OFA Debug Info", + DefaultInstall => $State_DoNotInstall, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "hfi1_uefi" => { Name => "Pre-Boot Components", + DefaultInstall => $State_DoNotInstall, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + ); +my %ComponentInfo_rhel73 = ( + # our special WrapperComponent, limited use + "opaconfig" => { Name => "opaconfig", + DefaultInstall => $State_Install, + SrcDir => ".", DriverSubdir => "", + PreReq => "", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, + StartPreReq => "", + StartComponents => [ ], + }, + # "ofed" is only used for source_comp + "ofed_delta" => { Name => "OFA_DELTA", + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + }, + "opa_stack" => { Name => "OFA OPA Stack", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "updates", + PreReq => "", CoReq => " oftools ", + # TBD - HasFirmware - FW update + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => "", + StartComponents => [ "opa_stack" ], + }, + "intel_hfi" => { Name => "Intel HFI Components", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "updates", + PreReq => " opa_stack ", CoReq => " oftools ", + # TBD - HasFirmware - FW update + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => " opa_stack ", + StartComponents => [ "intel_hfi" ], + }, + "oftools" => { Name => "OPA Tools", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-Tools."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => " opa_stack ", + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 0, + StartPreReq => " opa_stack ", # TBD + StartComponents => [ ], + }, + "mpi_selector" => { Name => "MPI selector", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 1, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "opa_stack_dev" => { Name => "OFA OPA Development", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "fastfabric" => { Name => "FastFabric", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-Tools."), + DriverSubdir => "", + PreReq => " opa_stack oftools ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => " opa_stack ", + StartComponents => [ ], + }, + "delta_ipoib" => { Name => "OFA IP over IB", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "updates", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 1, + StartPreReq => " opa_stack ", + StartComponents => [ "delta_ipoib" ], + }, + "mvapich2" => { Name => "MVAPICH2 (verbs,gcc)", + DefaultInstall => $State_DoNotInstall, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack mpi_selector intel_hfi ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "openmpi" => { Name => "OpenMPI (verbs,gcc)", + DefaultInstall => $State_DoNotInstall, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack mpi_selector intel_hfi ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "gasnet" => { Name => "GASNet (hfi,gcc)", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack intel_hfi ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "openshmem" => { Name => "OpenSHMEM (hfi,gcc)", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack gasnet intel_hfi ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "mvapich2_gcc_hfi" => { Name => "MVAPICH2 (hfi,gcc)", + DefaultInstall => $State_Install, + SrcDir => file_glob ("./OFED_MPIS."), + DriverSubdir => "", + PreReq => " opa_stack intel_hfi mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "mvapich2_intel_hfi" => { Name => "MVAPICH2 (hfi,Intel)", + DefaultInstall => $State_Install, + SrcDir => file_glob ("./OFED_MPIS."), + DriverSubdir => "", + PreReq => " opa_stack intel_hfi mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "openmpi_gcc_hfi" => { Name => "OpenMPI (hfi,gcc)", + DefaultInstall => $State_Install, + SrcDir => file_glob ("./OFED_MPIS."), + DriverSubdir => "", + PreReq => " opa_stack intel_hfi mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "openmpi_intel_hfi" => { Name => "OpenMPI (hfi,Intel)", + DefaultInstall => $State_Install, + SrcDir => file_glob ("./OFED_MPIS."), + DriverSubdir => "", + PreReq => " opa_stack intel_hfi mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "delta_mpisrc" =>{ Name => "MPI Source", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack opa_stack_dev mpi_selector ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "opafm" => { Name => "OPA FM", + DefaultInstall => $State_Install, + SrcDir => file_glob("./IntelOPA-FM."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 1, HasFirmware => 0, DefaultStart => 0, + StartPreReq => " opa_stack ", + #StartComponents => [ "qlgc_fm", "qlgc_fm_snmp"], + StartComponents => [ "opafm" ], + }, + "delta_debug" => { Name => "OFA Debug Info", + DefaultInstall => $State_DoNotInstall, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + "hfi1_uefi" => { Name => "Pre-Boot Components", + DefaultInstall => $State_DoNotInstall, + SrcDir => file_glob("./IntelOPA-OFED_DELTA."), + DriverSubdir => "", + PreReq => " opa_stack ", CoReq => "", + Hidden => 0, Disabled => 0, + HasStart => 0, HasFirmware => 0, DefaultStart => 0, + StartPreReq => "", + StartComponents => [ ], + }, + ); + %ComponentInfo = ( ); # translate from startup script name to component/subcomponent name @@ -604,6 +1037,12 @@ sub init_components if ( "$CUR_VENDOR_VER" eq "ES72" ) { @Components = ( @Components_rhel72 ); %ComponentInfo = ( %ComponentInfo_rhel72 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES122" ) { + @Components = ( @Components_sles12_sp2 ); + %ComponentInfo = ( %ComponentInfo_sles12_sp2 ); + } elsif ( "$CUR_VENDOR_VER" eq "ES73" ) { + @Components = ( @Components_rhel73 ); + %ComponentInfo = ( %ComponentInfo_rhel73 ); } else { @Components = ( @Components_other ); %ComponentInfo = ( %ComponentInfo_other ); diff --git a/CommonInstall/util_rpm.pl b/CommonInstall/util_rpm.pl index 2ea9fdc..e42cf03 100755 --- a/CommonInstall/util_rpm.pl +++ b/CommonInstall/util_rpm.pl @@ -320,7 +320,7 @@ sub rpm_check_os_prereqs_internal($$@) # TBD - openSUSE has libstdc++42 # TBD - openSUSE11.2 has libstdc++44 } elsif ("$package" eq "libstdc++" && "$CUR_DISTRO_VENDOR" eq 'SuSE' - && ("$CUR_VENDOR_VER" eq 'ES12' \|\| "$CUR_VENDOR_VER" eq 'ES121')) { + && ("$CUR_VENDOR_VER" eq 'ES12' \|\| "$CUR_VENDOR_VER" eq 'ES121' \|\| "$CUR_VENDOR_VER" eq 'ES122')) { $package="libstdc++6"; } elsif ("$package" eq "libstdc++-devel" && "$CUR_DISTRO_VENDOR" eq 'SuSE' && "$CUR_VENDOR_VER" eq 'ES11') { @@ -720,8 +720,13 @@ sub rpm_resolve($$$) } else { my $osver = rpm_tr_os_version("$mode"); # OS version # we expect 1 match, ignore all other filenames returned - DebugPrint("Checking for Kernel Rpm: $rpmdir/${package}-[0-9].[0-9][0-9].${osver}-[0-9].${cpu}.rpm\n"); - $rpmfile = file_glob("$rpmdir/${package}-[0-9].[0-9][0-9].${osver}-[0-9].${cpu}.rpm"); + if ( "$CUR_VENDOR_VER" eq 'ES122' ) { + DebugPrint("Checking for Kernel Rpm: $rpmdir/${package}-${osver}_k.${cpu}.rpm\n"); + $rpmfile = file_glob("$rpmdir/${package}-${osver}_k.${cpu}.rpm"); + } else { + DebugPrint("Checking for Kernel Rpm: $rpmdir/${package}-[0-9].[0-9][0-9].${osver}-[0-9].${cpu}.rpm\n"); + $rpmfile = file_glob("$rpmdir/${package}-[0-9].[0-9][0-9].${osver}-[0-9].${cpu}.rpm"); + } if ( "$rpmfile" eq "" \|\| ! -e "$rpmfile" ) { DebugPrint("Checking for Kernel Rpm: $rpmdir/${package}-${osver}-[0-9].${cpu}.rpm\n"); $rpmfile = file_glob("$rpmdir/${package}-${osver}-[0-9].${cpu}.rpm"); diff --git a/Esm/build.env b/Esm/build.env index 37551f7..8e9a739 100644 --- a/Esm/build.env +++ b/Esm/build.env @@ -1,5 +1,5 @@ # Adjust the environment variables if necessary export PRODUCT=VIEO_HOST -export RELEASE_TAG=10_3_0_0_56 +export RELEASE_TAG=10_3_0_0_67 export BUILD_CONFIG=${BUILD_CONFIG:-"release"} export BUILD_WITH_STACK=OPENIB diff --git a/Esm/build_label b/Esm/build_label index da4696e..27f63cd 100644 --- a/Esm/build_label +++ b/Esm/build_label @@ -1 +1 @@ -Build of VIEO_HOST 09/22/16 00:24 Tag: VIEO_HOST_LINUX_stl1-branch_10_3_0_0_56 +Build of VIEO_HOST 11/01/16 10:04 Tag: VIEO_HOST_LINUX_opa-10_3_10_3_0_0_67 diff --git a/Esm/ib/src/linux/startup/opafmd.c b/Esm/ib/src/linux/startup/opafmd.c index 6f9b11f..d7e7910 100644 --- a/Esm/ib/src/linux/startup/opafmd.c +++ b/Esm/ib/src/linux/startup/opafmd.c @@ -329,7 +329,7 @@ int parseInput(char buf){ } thread->instance = i; thread->component = c; - pthread_create(&thread_id[c], NULL, &kill_thread, thread); + pthread_create(&thread_id[iFM_NUM_COMPONENTS+c], NULL, &kill_thread, thread); } } for(i = 0; i < FM_MAX_INSTANCES; ++i){ diff --git a/Esm/ib/src/pm/pm/pm_dispatch.c b/Esm/ib/src/pm/pm/pm_dispatch.c index d6834ec..39c490d 100644 --- a/Esm/ib/src/pm/pm/pm_dispatch.c +++ b/Esm/ib/src/pm/pm/pm_dispatch.c @@ -1287,37 +1287,30 @@ nomerge: size_t CalculatePortInPacket(PmDispatcherNode_t dispnode, PmDispatcherPacket_t disppacket) { - uint8 NumVLs = 0; + uint8 NumVLs = 0; switch (dispnode->info.state) { case PM_DISP_NODE_NONE: return(-1); case PM_DISP_NODE_CLASS_INFO: return(-1); case PM_DISP_NODE_GET_DATACOUNTERS: - if (pm_config.process_vl_counters){ - if (disppacket->numPorts){ - NumVLs = disppacket->DispPorts[0].dispNodeSwPort->NumVLs; - } - else { - NumVLs = dispnode->info.nextPort->NumVLs; - } - } - if (dispnode->info.pmnodep->nodeType == STL_NODE_SW) - return( sizeof(struct _port_dpctrs)+(NumVLs-1)sizeof(struct _vls_dpctrs) ); + if (pm_config.process_vl_counters) { + if (!disppacket->numVLs) + disppacket->numVLs = dispnode->info.nextPort->NumVLs; + NumVLs = disppacket->numVLs; + } + if (dispnode->info.pmnodep->nodeType == STL_NODE_SW) + return(sizeof(struct _port_dpctrs) + (NumVLs - 1) sizeof(struct _vls_dpctrs)); else - return( sizeof(STL_PORT_STATUS_RSP)+(NumVLs-1)sizeof(struct _vls_pctrs) ); + return(sizeof(STL_PORT_STATUS_RSP) + (NumVLs - 1) sizeof(struct _vls_pctrs)); case PM_DISP_NODE_GET_ERRORCOUNTERS: - if (pm_config.process_vl_counters){ - if (disppacket->numPorts){ - NumVLs = disppacket->DispPorts[0].dispNodeSwPort->NumVLs; - } - else { - NumVLs = dispnode->info.nextPort->NumVLs; - } - } - return( sizeof(struct _port_epctrs)+(NumVLs-1)sizeof(struct _vls_epctrs) ); + if (pm_config.process_vl_counters) { + if (!disppacket->numVLs) + disppacket->numVLs = dispnode->info.nextPort->NumVLs; + NumVLs = disppacket->numVLs; + } + return(sizeof(struct _port_epctrs) + (NumVLs - 1) sizeof(struct _vls_epctrs)); case PM_DISP_NODE_CLR_PORT_STATUS: return(0); case PM_DISP_NODE_DONE: return(-1); - } return(-1); } diff --git a/Esm/ib/src/pm/pm/pm_topology.h b/Esm/ib/src/pm/pm/pm_topology.h index 42ae7f3..cdd9f3e 100644 --- a/Esm/ib/src/pm/pm/pm_topology.h +++ b/Esm/ib/src/pm/pm/pm_topology.h @@ -649,7 +649,8 @@ typedef struct PmDispatcherPort_s { typedef struct PmDispatcherPacket_s { uint64 PortSelectMask[4]; // Ports in Packet uint32 VLSelectMask; - uint8 numPorts; + uint8 numPorts; + uint8 numVLs; struct PmDispatcherNode_s dispnode; // setup once at boot PmDispatcherPort_t DispPorts; } PmDispatcherPacket_t; diff --git a/Esm/ib/src/smi/sm/sm_topology.c b/Esm/ib/src/smi/sm/sm_topology.c index a65ab39..2620fa4 100644 --- a/Esm/ib/src/smi/sm/sm_topology.c +++ b/Esm/ib/src/smi/sm/sm_topology.c @@ -1636,40 +1636,61 @@ unlock_bail: return(VSTATUS_BAD); } - // is the SM bit set? If not, our port went away, reinitialize. - // If we are an HFI, our neighbor is a switch, and MgmtAllowed is not set, reinitialize. - if (!(portp->portData->portInfo.CapabilityMask.AsReg32 & PI_CM_IS_SM) \|\| - (nodep->nodeInfo.NodeType == NI_TYPE_CA && - portp->portData->portInfo.PortNeighborMode.NeighborNodeType == STL_NEIGH_NODE_TYPE_SW && - !portp->portData->portInfo.PortNeighborMode.MgmtAllowed)) { - - if (!(portp->portData->portInfo.CapabilityMask.AsReg32 & PI_CM_IS_SM)) { - IB_LOG_ERROR0("SM bit not set in capability mask"); - } else { - IB_LOG_ERROR0("MgmtAllowed bit not set in neighbor node."); - } + (void)memset((void )portp->path, 0, 64); - do { - if (topology_main_exit == 1) { + // Make sure we still have permission to send SMAs. + do { + STL_PARTITION_TABLE pkeyTable = {{{0}}}; + + if(topology_main_exit) { #ifdef __VXWORKS__ - ESM_LOG_ESMINFO("topology_discovery: SM has been stopped", 0); - IB_EXIT(__func__, VSTATUS_OK); + ESM_LOG_ESMINFO("Topology Task exiting OK.", 0); #endif - return VSTATUS_OK; + return(VSTATUS_BAD); + } + + // Don't check the pkey table till we are in at least INIT state, + // because the pkeys might change during LNI. + status = SM_Get_PortInfo(fd_topology, (1<<24) \| STL_SM_CONF_START_ATTR_MOD, portp->path, &(portp->portData->portInfo)); + + if (status != VSTATUS_OK) { + IB_LOG_ERRORRC("Can't get local PortInfo, status:", status); + vs_thread_sleep(5 VTIMER_1S); + continue; + } else if (portp->portData->portInfo.PortStates.s.PortState < IB_PORT_INIT) { + IB_LOG_WARN_FMT(__func__, "Local port is not yet in INIT."); + status = VSTATUS_BAD; + vs_thread_sleep(5 * VTIMER_1S); + continue; + } + + status = SM_Get_PKeyTable(fd_topology, 1<<24, portp->path, &pkeyTable, 0); + + if ((status != VSTATUS_OK) \|\| + (pkeyTable.PartitionTableBlock[STL_DEFAULT_FM_PKEY_IDX].AsReg16 != + STL_DEFAULT_FM_PKEY)) { + + if (status != VSTATUS_OK) { + IB_LOG_ERRORRC("Could not retrieve local PKey table. Status: ", status); + vs_thread_sleep(5 * VTIMER_1S); + continue; } - status = vs_wrlock(&old_topology_lock); - if (status != VSTATUS_OK) continue; - status = topology_initialize(); - (void)vs_rwunlock(&old_topology_lock); - } while (status != VSTATUS_OK); - sm_topop->routingModule->funcs.post_process_discovery(sm_topop, VSTATUS_BAD, routingContext); - if (portp->portData->portInfo.PortStates.s.PortState == IB_PORT_DOWN) { - IB_LOG_ERROR0("SM port state is down"); + + // Force the pkey. + IB_LOG_ERROR_FMT(__func__, + "FM Pkey 0x%x not present in the local Pkey table.", + STL_DEFAULT_FM_PKEY); + + // For 10.3 only. For 10.4 we need to rework how + // re-initialization of the local port is handled. + IB_LOG_WARN_FMT(__func__, + "Setting FM Pkey 0x%x in the local Pkey table.", + STL_DEFAULT_FM_PKEY); + status = sm_set_local_port_pkey(&nodep->nodeInfo); } - return VSTATUS_BAD; - } + } while (status != VSTATUS_OK); - (void)memset((void )portp->path, 0, 64); + IB_LOG_INFO_FMT(__func__, "Local Port and PKey are okay."); / * add ourselves to the SM list during first sweep diff --git a/IbaTools/FastFabric/opafastfabric.pl b/IbaTools/FastFabric/opafastfabric.pl index ac4b8e1..d3ae0f4 100755 --- a/IbaTools/FastFabric/opafastfabric.pl +++ b/IbaTools/FastFabric/opafastfabric.pl @@ -2456,7 +2456,7 @@ QUERY: if ( $query ) { goto QUERY; } - $FabricChassisPackages="$all_packages"; + $FabricChassisPackages="$packages"; $parallel=1; print "After push, the firmware may be optionally selected or booted\n"; if (GetYesNo("Would you like to run the firmware now?", "n") ) { @@ -2490,7 +2490,7 @@ QUERY: } } until (GetYesNo("Are you sure you want to proceed?", "n") ); if ( "$action" ne "skip" ) { - my $pathnames=expand_pathnames($FabricChassisPackages); + my $pathnames=expand_pathnames($all_packages); if ( $parallel ) { return run_fabric_cmd("$BIN_DIR/opachassisadmin $Sopt -F $FabricChassisFile -P '$pathnames' -a $action upgrade"); } else { @@ -3103,7 +3103,7 @@ sub ext_mgmt_sw_fwpush print "The following firmware files will be used:\n"; $all_packages =~ s/^/ /mg; print "$all_packages"; - $FabricExtMgmtSwPackages="$all_packages"; + $FabricExtMgmtSwPackages="$packages"; $parallel=1; print "After upgrade, the switch may be optionally rebooted\n"; if (GetYesNo("Would you like to reboot the switch after the update?", "n") ) { @@ -3142,7 +3142,7 @@ sub ext_mgmt_sw_fwpush } } until (GetYesNo("Are you sure you want to proceed?", "n") ); if ( "$action" ne "skip" ) { - my $pathnames=expand_pathnames($FabricExtMgmtSwPackages); + my $pathnames=expand_pathnames($all_packages); if ( $parallel ) { return run_fabric_cmd("$BIN_DIR/opaswitchadmin $Oopt -L $FabricExtMgmtSwFile -P '$pathnames' -a $action upgrade"); } else { diff --git a/opa-fm.spec b/opa-fm.spec index 4e552b6..1702b09 100644 --- a/opa-fm.spec +++ b/opa-fm.spec @@ -30,7 +30,7 @@ #[ICS VERSION STRING: unknown] Name: opa-fm Version: 10.3.0.0 -Release: 56%{?dist} +Release: 67%{?dist} Summary: Intel Omni-Path Fabric Management Software License: GPLv2 or BSD	0
34a181bb1a98d09f80a18d8f5a3926caa1a5f202	01org	opa-fm	Update to latest from build 10.3.0.0.58 (FM 10.3.0.0.56)	"commit 34a181bb1a98d09f80a18d8f5a3926caa1a5f202\nAuthor: Anton Bodner <[email protected]>\nDat(...TRUNCATED)	0
6133b2fe5b39b605c0d695bce37cdfa498a4d477	01org	opa-fm	Update to latest from build 10.11.0.0.574 (IFS 10.11.0.0.577)	"commit 6133b2fe5b39b605c0d695bce37cdfa498a4d477\nAuthor: Scott Breyer <scott.breyer@cornelisnetwork(...TRUNCATED)	0
3bee63ead16ac385e00c671636ebd787d35e7358	01org	opa-fm	Update to latest from build 10.11.2.0.3 (OPXS 10.11.2.0.3)	"commit 3bee63ead16ac385e00c671636ebd787d35e7358\nAuthor: Greg Kresge <greg.kresge@cornelisnetworks.(...TRUNCATED)	0
f26ab6dce0d2d9c98d1485cef5ef8d3f8772f382	01org	opa-fm	Updated to latest from build 10.0.0.0.697	"commit f26ab6dce0d2d9c98d1485cef5ef8d3f8772f382\nAuthor: Scott Breyer <[email protected]>\nD(...TRUNCATED)	0
6148f7ad6596dd39756639b925d07b088c7341ca	01org	opa-fm	Update to latest from build 10.5.0.0.136 (IFS 10.5.0.0.155)	"commit 6148f7ad6596dd39756639b925d07b088c7341ca\nAuthor: Scott Breyer <[email protected]>\nD(...TRUNCATED)	0

End of preview. Expand in Data Studio

README.md exists but content is empty.

Downloads last month: 341

Size of the auto-converted Parquet files:

Number of rows: