Skip to content

Conversation

@pmeier
Copy link
Contributor

@pmeier pmeier commented Mar 1, 2023

This PR does two things:

  1. Per title. In the same vein as we did for the Linux jobs, we will continue to run the macOS jobs on CircleCI for a few weeks to see if everything runs smoothly. This also gives a chance to iron out stuff like Surface failing tests on GHA #7364.
  2. Merge the M1 workflows into the same workflow as the regular x86_64 ones.

cc @seemethere

@pmeier pmeier marked this pull request as draft March 2, 2023 13:27
@pmeier pmeier marked this pull request as ready for review March 3, 2023 15:01
Comment on lines +301 to +302
print(f" libpng include path: {jpeg_include}")
print(f" libpng lib path: {jpeg_lib}")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Small drive-by that helped me debug. We do the same for PNG already:

vision/setup.py

Lines 278 to 279 in 0e62c34

print(f" libpng version: {png_version}")
print(f" libpng include path: {png_include}")

I wasn't able to get the version of the library in a way that would hold for all operating systems. I guess knowing the location is good enough.

Comment on lines +24 to +32
# The x86 macOS runners, e.g. the GitHub Actions native "macos-12" runner, has some JPEG libraries installed by default
# that interfere with our build. We uninstall them here and use the one from conda below.
if [[ "${OS_TYPE}" == "macos" && $(uname -m) == x86_64 ]]; then
JPEG_LIBS=$(brew list | grep jpeg)
echo $JPEG_LIBS
for lib in $JPEG_LIBS; do
brew uninstall --ignore-dependencies --force $lib || true
done
fi
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We are doing the same for the macOS wheel workflows:

# Uninstall Conflicting jpeg brew formulae
jpeg_packages=$(brew list | grep jpeg)
echo "Existing Jpeg-related Brew libraries"
echo $jpeg_packages
for pkg in $jpeg_packages; do
brew uninstall --ignore-dependencies --force $pkg || true
done

@pmeier pmeier requested review from NicolasHug and osalpekar March 3, 2023 15:05
Copy link
Member

@osalpekar osalpekar 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!

@pmeier pmeier merged commit 91b5769 into pytorch:main Mar 8, 2023
@pmeier pmeier deleted the macos-gha branch March 8, 2023 11:58
@github-actions
Copy link

github-actions bot commented Mar 8, 2023

Hey @pmeier!

You merged this PR, but no labels were added. The list of valid labels is available at https://github.com/pytorch/vision/blob/main/.github/process_commit.py

@pmeier pmeier mentioned this pull request Mar 9, 2023
21 tasks
facebook-github-bot pushed a commit that referenced this pull request Mar 30, 2023
Reviewed By: vmoens

Differential Revision: D44416613

fbshipit-source-id: 5a1ff6c8d7636e77a081809eaf1c848ca4c06a3f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants