Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for reading hwloc xml files generated from Sierra compute nodes #310

Merged
merged 2 commits into from Apr 10, 2018

Conversation

dongahn
Copy link
Member

@dongahn dongahn commented Apr 10, 2018

Per discussion at #308:

Incorporate @trws' patch to handle group type.

Add a test case using hwloc xml files collected from Sierra nodes.

Add @TWRS' patch.

Need this on the hwloc generated from LLNL's Sierra machine.

hwloc-ls --version reports 1.11.2
Generate and add xml files using lstopo on 4 Sierra compute nodes.

Run a smoke test to validate that `resrc` likes the format.
@dongahn dongahn requested review from trws and SteVwonder April 10, 2018 01:15
Copy link
Member

@SteVwonder SteVwonder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks @dongahn!

@codecov-io
Copy link

codecov-io commented Apr 10, 2018

Codecov Report

Merging #310 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #310      +/-   ##
==========================================
+ Coverage   74.11%   74.12%   +<.01%     
==========================================
  Files          49       49              
  Lines        9287     9290       +3     
==========================================
+ Hits         6883     6886       +3     
  Misses       2404     2404
Impacted Files Coverage Δ
resrc/resrc.c 83.12% <100%> (+0.07%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cc03941...055bb80. Read the comment docs.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.008%) to 75.859% when pulling 055bb80 on dongahn:sierra-hwloc into cc03941 on flux-framework:master.

@SteVwonder
Copy link
Member

@dongahn, do you have a preference for what gets merged first, between this PR and #305?

@dongahn
Copy link
Member Author

dongahn commented Apr 10, 2018

No I don't. But I think this can go in first now that it looks like i will have to fix a CI failure on the other PR...

@SteVwonder SteVwonder merged commit 722e241 into flux-framework:master Apr 10, 2018
@grondo grondo mentioned this pull request May 11, 2018
@dongahn dongahn deleted the sierra-hwloc branch July 13, 2019 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants