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

Update build rules and patches for darwin_arm64 platform. #19037

Merged
merged 13 commits into from
Oct 10, 2021

Conversation

gjoliver
Copy link
Member

@gjoliver gjoliver commented Oct 1, 2021

Changes include:

Update nelhage/rules_boost package from current version (08/5/2020) to 5/27/2021 version.
Remove rules_boost-undefine-boost_fallthrough.patch, since BOOST_FALLTHROUGH seems to be defined now.
Minor changes to rules_boost-windows-linkopts.patch to use default condition to add -lpthread flag for all platforms.
Add darwin_arm64 config to BUILD files for lib civetweb pulled in via prometheu dependency.

Why are these changes needed?

Build fixes for Apple M1 laptop.

Related issue number

#16621

Checks

  • I've run scripts/format.sh to lint the changes in this PR.
  • I've included any doc changes needed for https://docs.ray.io/en/master/.
  • [*] I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/
  • Testing Strategy
    • [*] Unit tests
    • Release tests
    • This PR is not tested :(

@gjoliver gjoliver requested a review from wuisawesome October 1, 2021 16:58
@wuisawesome wuisawesome self-assigned this Oct 1, 2021
@gjoliver
Copy link
Member Author

gjoliver commented Oct 1, 2021

Let's see if the CI tests pass.

Copy link
Contributor

@wuisawesome wuisawesome left a comment

Choose a reason for hiding this comment

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

I'm so excited for this to work

@gjoliver
Copy link
Member Author

gjoliver commented Oct 1, 2021

don't merge until the tests pass :)

@wuisawesome
Copy link
Contributor



bazel-out/k8-fastbuild/bin/_virtual_includes/ray_api/boost/throw_exception.hpp:23:10: fatal error: boost/assert/source_location.hpp: No such file or directory
--
  | 23 \| #include <boost/assert/source_location.hpp>
  | \|          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  | compilation terminated.
  | Target //:example failed to build

ripperoni, looks like we'll need some other changes?

@gjoliver
Copy link
Member Author

gjoliver commented Oct 1, 2021

huh ... it's ok, we will get there 😮‍💨

@gjoliver
Copy link
Member Author

gjoliver commented Oct 2, 2021

huh, windows build is actually working now. the 2 tests failed are both timeouts that have been failing all day.

@fredtony
Copy link

fredtony commented Oct 6, 2021

I'm very interested in this PR and associated issue. Thank you guys for working on it. I am a TA in a course on RL and they will be using rllib for the project. We are hoping to plug up this gap to allow everyone to run it locally, even students with an M1 Mac. Is there any way I can help to this up and running?

@gjoliver
Copy link
Member Author

gjoliver commented Oct 6, 2021

I'm very interested in this PR and associated issue. Thank you guys for working on it. I am a TA in a course on RL and they will be using rllib for the project. We are hoping to plug up this gap to allow everyone to run it locally, even students with an M1 Mac. Is there any way I can help to this up and running?

Thanks for the message Tony. This is already pretty much working.
I didn't push it over the finish line because of some fire fighting work lately.
I will kick of another round of CI and hopefully merge this soon.

@gjoliver gjoliver force-pushed the m1-build branch 3 times, most recently from d21f2cf to a584eb4 Compare October 8, 2021 22:32
Jun Gong added 9 commits October 8, 2021 22:11
Changes include:

Update nelhage/rules_boost package from current version (08/5/2020) to 5/27/2021 version.
Remove rules_boost-undefine-boost_fallthrough.patch, since BOOST_FALLTHROUGH seems to be defined now.
Minor changes to rules_boost-windows-linkopts.patch to use default condition to add -lpthread flag for all platforms.
Add darwin_arm64 config to BUILD files for lib civetweb pulled in via prometheu dependency.
boost/bind.hpp and global namespace placeholders are deprecated.
@gjoliver
Copy link
Member Author

finally all green. I even fixed a bunch of deprecation warnings caused by boost/bind.hpp.
ready to be merged.

@pcmoritz
Copy link
Contributor

Great work, really glad to see this!

@pcmoritz pcmoritz merged commit 635010d into ray-project:master Oct 10, 2021
@pcmoritz pcmoritz mentioned this pull request Nov 11, 2021
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.

4 participants