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

JGF simplification #1293

Merged
merged 6 commits into from
Sep 30, 2024
Merged

Conversation

jameshcorbett
Copy link
Member

Posting this as a WIP so I can link to it / work against it in flux-coral2.

jameshcorbett added a commit to jameshcorbett/flux-coral2 that referenced this pull request Sep 5, 2024
Problem: JGF is too large, as described in flux-framework#193.

As a first step to shrink it, do not output default values, instead
skipping them and letting the JGF reader supply them.

Depends on changes introduced in flux-sched by
flux-framework/flux-sched/pull/1293.
@jameshcorbett jameshcorbett force-pushed the jgf-simplification branch 4 times, most recently from 6efc769 to 3f7adc8 Compare September 18, 2024 05:52
jameshcorbett added a commit to jameshcorbett/flux-coral2 that referenced this pull request Sep 18, 2024
Problem: JGF is too large, as described in flux-framework#193.

As a first step to shrink it, do not output default values, instead
skipping them and letting the JGF reader supply them.

Depends on changes introduced in flux-sched by
flux-framework/flux-sched/pull/1293.
@jameshcorbett jameshcorbett force-pushed the jgf-simplification branch 3 times, most recently from 1a640ad to 4e92c1e Compare September 18, 2024 06:07
@jameshcorbett
Copy link
Member Author

OK, tests are failing, but I think it's generally working properly--the flux-coral2 testsuite runs successfully with the JGF generated from this branch. So remaining work is eliminating the path fields (which will require looking at edges, not sure how to do this yet) and then getting the tests to pass.

@jameshcorbett jameshcorbett mentioned this pull request Sep 19, 2024
@jameshcorbett jameshcorbett force-pushed the jgf-simplification branch 3 times, most recently from 250a48c to 751621f Compare September 24, 2024 01:09
@jameshcorbett
Copy link
Member Author

Ok, only t1018-rv1-bootstrap2.t is failing now.

@jameshcorbett jameshcorbett force-pushed the jgf-simplification branch 2 times, most recently from 90628a4 to 4716478 Compare September 26, 2024 23:29
@jameshcorbett jameshcorbett marked this pull request as ready for review September 26, 2024 23:30
Problem: the JGF reader's vertex-unpacking logic is unnecessarily
complicated.

Simplify it.
Problem: as described in flux-framework#1255, JGF is too large and unwieldy,
with lots of redundant and repeated data.

To begin to cut back, make most vertex metadata optional.
Problem: the Python JGF writer is too verbose, and outputs a
lot of redundant data which the jgf reader should be able to
construct for itself.

Change the writer to output only non-default entries.
Problem: the python JGF writer no longer outputs certain vertex
metadata, but the tests expect it to be there.

Change the tests to no longer look for the eliminated metadata.
Problem: the timeouts waiting for files to appear in t1018 are
incredibly long. If the file is going to appear, it should appear
within twenty seconds.

Reduce the timeout from 10 minutes to 20 seconds.
Problem: the JGF writer supplies the ID of nodes based on the
hostname suffix (assuming it exists), which determines which nodes
are matched first under policies like high and low. However, the
JGF reader could just as easily supply the ID itself, thereby
reducing the size of JGF.

Make the reader supply the ID instead of the writer.
@jameshcorbett
Copy link
Member Author

Thanks, rebased with master, setting MWP.

@jameshcorbett jameshcorbett added the merge-when-passing mergify.io - merge PR automatically once CI passes label Sep 30, 2024
@mergify mergify bot merged commit d21d455 into flux-framework:master Sep 30, 2024
20 of 21 checks passed
@jameshcorbett jameshcorbett deleted the jgf-simplification branch September 30, 2024 22:40
Copy link

codecov bot commented Sep 30, 2024

Codecov Report

Attention: Patch coverage is 72.00000% with 21 lines in your changes missing coverage. Please review.

Project coverage is 75.3%. Comparing base (a042bbf) to head (6785369).
Report is 7 commits behind head on master.

Files with missing lines Patch % Lines
resource/readers/resource_reader_jgf.cpp 67.4% 14 Missing ⚠️
src/python/fluxion/resourcegraph/V1.py 78.1% 7 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff            @@
##           master   #1293     +/-   ##
========================================
- Coverage    75.3%   75.3%   -0.1%     
========================================
  Files         111     111             
  Lines       15262   15298     +36     
========================================
+ Hits        11505   11530     +25     
- Misses       3757    3768     +11     
Files with missing lines Coverage Δ
resource/readers/resource_reader_jgf.hpp 100.0% <ø> (ø)
src/python/fluxion/resourcegraph/V1.py 86.7% <78.1%> (-5.3%) ⬇️
resource/readers/resource_reader_jgf.cpp 70.2% <67.4%> (+0.3%) ⬆️

jameshcorbett added a commit to jameshcorbett/flux-coral2 that referenced this pull request Sep 30, 2024
Problem: JGF is too large, as described in flux-framework#193.

As a first step to shrink it, do not output default values, instead
skipping them and letting the JGF reader supply them.

Depends on changes introduced in flux-sched by
flux-framework/flux-sched/pull/1293.
jameshcorbett added a commit to jameshcorbett/flux-coral2 that referenced this pull request Oct 1, 2024
Problem: JGF is too large, as described in flux-framework#193.

As a first step to shrink it, do not output default values, instead
skipping them and letting the JGF reader supply them.

Depends on changes introduced in flux-sched by
flux-framework/flux-sched/pull/1293.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge-when-passing mergify.io - merge PR automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants