Skip to content

GitLab

Unverified Commit 02d3d6db authored by Andrey Talman's avatar Andrey Talman Committed by GitHub
Browse files

Fix aarch64 builds (#7872)

parent c486bb14
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
packaging/pre_build_script.sh
View file @ 02d3d6db
...@@ -11,7 +11,7 @@ if [[ "$(uname)" == Darwin ]]; then ...@@ -11,7 +11,7 @@ if [[ "$(uname)" == Darwin ]]; then
conda install -yq wget conda install -yq wget
fi fi
if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" || "$ARCH" == "aarch64" ]]; then if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then
# Install libpng from Anaconda (defaults) # Install libpng from Anaconda (defaults)
conda install libpng -yq conda install libpng -yq
conda install -yq ffmpeg=4.2 libjpeg-turbo -c pytorch conda install -yq ffmpeg=4.2 libjpeg-turbo -c pytorch
...@@ -22,8 +22,13 @@ if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" || "$ARCH" == "aarch64" ]]; th ...@@ -22,8 +22,13 @@ if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" || "$ARCH" == "aarch64" ]]; th
bin_path=$(dirname $python_exec) bin_path=$(dirname $python_exec)
cp "$bin_path/Library/bin/libjpeg.dll" torchvision cp "$bin_path/Library/bin/libjpeg.dll" torchvision
fi fi
else else
if [[ "$ARCH" == "aarch64" ]]; then
conda install libpng -yq
conda install -yq ffmpeg=4.2 libjpeg-turbo -c pytorch-nightly
fi
# Install native CentOS libJPEG, freetype and GnuTLS # Install native CentOS libJPEG, freetype and GnuTLS
yum install -y libjpeg-turbo-devel freetype gnutls yum install -y libjpeg-turbo-devel freetype gnutls
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment