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: upgrade hwloc #1766

Merged
merged 2 commits into from
Nov 18, 2024
Merged

fix: upgrade hwloc #1766

merged 2 commits into from
Nov 18, 2024

Conversation

jmg-duarte
Copy link
Contributor

When running rust-fil-proofs under Rust 1.81 the following warning is issued:

warning: the following packages contain code that will be rejected by a future version of Rust: bitflags v0.7.0
note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1`

The package depending on bitflags 0.7.0 is hwloc, which has been replaced by hwloc2.
Understandably, hwloc (the original library) has suffered changes as well, which are reflected in hwloc2.

The main one being the removal of allowed_cpuset, according to the hwloc upgrading guide (https://www.open-mpi.org/projects/hwloc/doc/v2.8.0/a00374.php#upgrade_to_api_2x_allowed) these cpuset should be enough given that the INCLUDE_DISALLOWED flag hasn't been passed (and as far as I know, it isn't a default).

This PR attempts to address these issues.

@cryptonemo
Copy link
Collaborator

Hello @jmg-duarte -- thanks for submitting this, we'll take a look!

@jmg-duarte
Copy link
Contributor Author

jmg-duarte commented Nov 14, 2024

@cryptonemo I just noticed the stacked::vanilla::cores::tests::test_cores is failing

I can't quite understand why since the docs I pointed too seem to indicate it should work?
Either way, I'm keen on getting this merged, I may need some pointers where to look for references though.

Thanks!

@cryptonemo
Copy link
Collaborator

@cryptonemo I just noticed the stacked::vanilla::cores::tests::test_cores is failing

I can't quite understand why since the docs I pointed too seem to indicate it should work? Either way, I'm keen on getting this merged, I may need some pointers where to look for references though.

Thanks!

That particular test can fail if other tests are running at the same time. CI should isolate it properly.

@jmg-duarte
Copy link
Contributor Author

If hwloc2 does not cut it, the alternative I found is hwlocality, it requires more changes but at least it is maintained 😓

@cryptonemo
Copy link
Collaborator

If hwloc2 does not cut it, the alternative I found is hwlocality, it requires more changes but at least it is maintained 😓

CI aside, what we need for this to 'cut it' is to determine if there's any noticeable (negative) performance impact on multicore-sdr sealing (in particular for production sector sizes of 32/64GiB). Gathering that data will take some time.

@cryptonemo
Copy link
Collaborator

My testing of production sectors checks out(!) @DrPeterVanNostrand @vmx Any inputs, or good to go?

Copy link
Contributor

@vmx vmx left a comment

Choose a reason for hiding this comment

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

@cryptonemo Thanks for testing it out. I think then it's good to go.

@cryptonemo cryptonemo merged commit 1a7cff3 into filecoin-project:master Nov 18, 2024
10 checks passed
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.

3 participants