merlin/bridge: load user subcomponent for networkIF #2407
Conversation
|
Status Flag 'Pre-Test Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging |
src/sst/elements/merlin/bridge.h
Outdated
| nic.nic = loadAnonymousSubComponent<SST::Interfaces::SimpleNetwork> | ||
| ("merlin.linkcontrol", "networkIF", id, | ||
| ComponentInfo::SHARE_PORTS | ComponentInfo::INSERT_STATS, if_params, 1 /* vns */); | ||
| nic.nic = loadUserSubComponent<SST::Interfaces::SimpleNetwork> |
There was a problem hiding this comment.
This should really use one slot name (networkIF), with multiple instances using an index. In the c++ code, this would use the SubComponentSlotInfo object to load the user subcomponents. The definition of the class is in baseComponent.h and you would get if by calling:
getSubComponentSlotInfo("networkIF")
This object allows you to query which indices have been loaded with a user subcomponent.
The code would look something like:
SubComponentSlotInfo* info = getSubComponentSlotInfo("networkIF");
if ( !info ) {
// Create anonymous subcomponent
}
info->create<SimpleNetwork>(id, ComponentInfo::SHARE_PORTS, 1)
There are also other functions that could be used to do more complete error checking to see if the right number of subcomponents had been added, etc.
There was a problem hiding this comment.
OK, thank you for the fast response and detailed explanation on how to properly support this. I updated the code to behave as follows:
- load anonymous subcomponent if no info
- load anonymous component if id is not populated (for half-anonymous case)
- load user component if id is populated
- fatal out if more than two slots are given
I was passing "networkIF1" to NetworkInterface._instanceNetworkInterfaceBackCompat beforehand; I changed it to "networkIF" with slot 1 and it works great!
pymerlin expects to override a SimpleNetwork subcomponent with its own network subcomponent (e.g., LinkControl). When using a Bridge, this subcomponent is ignored and link initialization crashes on SST::Link::sendUntimedData when trying to access a null rtr object. This patch extends the Bridge component to use the user subcomponent if the subcomponent slot is populated and if not then fall back to using an anonymous subcomponent as before.
heyitsanthony
force-pushed
the
anthony/bridge-user-networkIF
branch
from
dce20a6
to
c273614
Compare
|
Status Flag 'Pre-Test Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging |
|
Status Flag 'Pre-Test Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED by label AT: PRE-TEST INSPECTED! Autotester is Removing Label; this inspection will remain valid until a new commit to source branch is performed. |
|
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: SST__AutotestGen2_NewFW_sst-test_OMPI-4.1.4_PY3.6_sst-elements
Build InformationTest Name: SST__AutotestGen2_NewFW_sst-test_OMPI-4.1.4_PY3.6_sst-elements_Make-Dist
Build InformationTest Name: SST__AutotestGen2_NewFW_sst-test_OMPI-4.1.4_PY3.6_sst-elements_MT-2
Build InformationTest Name: SST__AutotestGen2_NewFW_sst-test_OMPI-4.1.4_PY3.6_sst-elements_MR-2
Build InformationTest Name: SST__AutotestGen2_NewFW_OSX-14-XC15-ARM2_OMPI-4.1.6_PY3.10_sst-elements
Using Repos:
Pull Request Author: heyitsanthony |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: SST__AutotestGen2_NewFW_sst-test_OMPI-4.1.4_PY3.6_sst-elements
Build InformationTest Name: SST__AutotestGen2_NewFW_sst-test_OMPI-4.1.4_PY3.6_sst-elements_Make-Dist
Build InformationTest Name: SST__AutotestGen2_NewFW_sst-test_OMPI-4.1.4_PY3.6_sst-elements_MT-2
Build InformationTest Name: SST__AutotestGen2_NewFW_sst-test_OMPI-4.1.4_PY3.6_sst-elements_MR-2
Build InformationTest Name: SST__AutotestGen2_NewFW_OSX-14-XC15-ARM2_OMPI-4.1.6_PY3.10_sst-elements
|
|
Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging |
|
All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur... |
|
All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur... |
|
Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ feldergast ]! |
|
Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged |
|
Merge on Pull Request# 2407: IS A SUCCESS - Pull Request successfully merged |
pymerlin expects to override a SimpleNetwork subcomponent with its own network subcomponent (e.g., LinkControl). When using a Bridge, this subcomponent is ignored and link initialization crashes on SST::Link::sendUntimedData when trying to access a null rtr object. This patch extends the Bridge component to use the user subcomponent if set and if not then fall back to using an anonymous subcomponent as before.