-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Install FMT and download ccache on MacOS #10933
Conversation
✅ Deploy Preview for meta-velox canceled.
|
3043891
to
19cc4d0
Compare
@@ -35,7 +35,7 @@ PYTHON_VENV=${PYHTON_VENV:-"${SCRIPTDIR}/../.venv"} | |||
NPROC=$(getconf _NPROCESSORS_ONLN) | |||
|
|||
DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)} | |||
MACOS_VELOX_DEPS="bison boost double-conversion flex fmt gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 simdjson snappy thrift xz xsimd zstd" | |||
MACOS_VELOX_DEPS="bison boost double-conversion flex gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 simdjson snappy thrift xz xsimd zstd" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will not be enough. Problem is that line 39 installs ccache. This brings in fmt11 as well. And since we have the ordering issues will still use fmt11 regardless of whether or not it is installed in the CI script.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good point! Let's remove ccache for now and add it back in #10920
.github/workflows/macos.yml
Outdated
@@ -93,12 +93,6 @@ jobs: | |||
- name: Build | |||
run: | | |||
cmake --build _build/$BUILD_TYPE -j $NJOBS | |||
ccache -s | |||
|
|||
- uses: assignUser/stash/save@v1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just do if: false
and also add it to the restore step
5c9f8dc
to
4fe1473
Compare
@assignUser thanks for the feedback! |
4fe1473
to
d4d75a3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: pleas squash the commits.
Why the bot will squash them anyway before pushing? |
d4d75a3
to
33da18b
Compare
@czentgr, @assignUser suggested we could download ccache instead. I implemented this. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for fix @majetideepak
@kgpai has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
@@ -77,6 +77,9 @@ function install_build_prerequisites { | |||
python3 -m venv ${PYTHON_VENV} | |||
fi | |||
source ${PYTHON_VENV}/bin/activate; pip3 install cmake-format regex pyyaml | |||
wget -O ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-darwin.tar.gz | |||
tar -xf ccache.tar.gz | |||
mv ccache-4.10.2-darwin/ccache /usr/local/bin/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mmhh, this might be restricted. For the same reason we want INSTALL_PREFIX on macOS.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be okay. We install minio here as well.
Conbench analyzed the 1 benchmark run on commit There were no benchmark performance regressions. 🎉 The full Conbench report has more details. |
In "Install FMT and download ccache on MacOS (facebookincubator#10933)", wget was used to download ccache in setup-macos.sh. However, wget is not pre-installed on MacOs by default, and the following error was thrown: + wget -O ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-darwin.tar.gz ../scripts/setup-macos.sh: line 80: wget: command not found + tar -xf ccache.tar.gz tar: Error opening archive: Failed to open 'ccache.tar.gz' This commit changes wget to curl, which is guaranteed to be pre-installed on MacOS.
In "Install FMT and download ccache on MacOS (facebookincubator#10933)", wget was used to download ccache in setup-macos.sh. However, wget is not pre-installed on MacOs by default, and the following error was thrown: + wget -O ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-darwin.tar.gz ../scripts/setup-macos.sh: line 80: wget: command not found + tar -xf ccache.tar.gz tar: Error opening archive: Failed to open 'ccache.tar.gz' This commit changes wget to curl, which is guaranteed to be pre-installed on MacOS.
Summary: In "Install FMT and download ccache on MacOS (#10933)", wget was used to download ccache in setup-macos.sh. However, wget is not pre-installed on MacOs by default, and the following error was thrown: ``` + wget -O ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-darwin.tar.gz ../scripts/setup-macos.sh: line 80: wget: command not found + tar -xf ccache.tar.gz tar: Error opening archive: Failed to open 'ccache.tar.gz' ``` This commit changes wget to curl, which is guaranteed to be pre-installed on MacOS. Pull Request resolved: #10995 Reviewed By: pedroerp Differential Revision: D62646279 Pulled By: kevinwilfong fbshipit-source-id: aaa2365ae013bb012f25556d4741e3a08ea7ef82
Brew fmt11 is not supported.
ccache brings in fmt11 from brew.
The brew fmt11 headers are taking precedence over bundled headers.
Bundle fmt and download prebuilt ccache that is statically linked.
We will fix the header include issue in #10920.
Resolves #10936