File tree Expand file tree Collapse file tree 3 files changed +17
-3
lines changed Expand file tree Collapse file tree 3 files changed +17
-3
lines changed Original file line number Diff line number Diff line change @@ -26,6 +26,11 @@ install_ubuntu() {
2626 libssl-dev \
2727 zip
2828
29+ # These libraries are needed by TorchVision
30+ apt-get install -y --no-install-recommends \
31+ libjpeg-dev \
32+ libpng-dev
33+
2934 # Cleanup package manager
3035 apt-get autoclean && apt-get clean
3136 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Original file line number Diff line number Diff line change @@ -31,8 +31,16 @@ install_miniconda() {
3131
3232install_python () {
3333 pushd /opt/conda
34- # Install the correct Python version
34+ # Install the selected Python version for CI jobs
3535 as_ci_user conda create -n " py_${PYTHON_VERSION} " -y --file /opt/conda/conda-env-ci.txt python=" ${PYTHON_VERSION} "
36+
37+ # From https://github.com/pytorch/pytorch/blob/main/.ci/docker/common/install_conda.sh
38+ if [[ $( uname -m) == " aarch64" ]]; then
39+ conda_install " openblas==0.3.28=*openmp*"
40+ else
41+ conda_install mkl=2022.1.0 mkl-include=2022.1.0
42+ fi
43+
3644 popd
3745}
3846
@@ -53,7 +61,7 @@ fix_conda_ubuntu_libstdcxx() {
5361 # PyTorch sev: https://github.com/pytorch/pytorch/issues/105248
5462 # Ref: https://github.com/pytorch/pytorch/blob/main/.ci/docker/common/install_conda.sh
5563 if grep -e " 2[02].04." /etc/issue > /dev/null; then
56- rm " /opt/conda/envs/py_${PYTHON_VERSION} /lib/libstdc++.so.6 "
64+ rm /opt/conda/envs/py_${PYTHON_VERSION} /lib/libstdc++.so*
5765 fi
5866}
5967
Original file line number Diff line number Diff line change 3131 # The generic Linux job chooses to use base env, not the one setup by the image
3232 CONDA_ENV=$(conda env list --json | jq -r ".envs | .[-1]")
3333 conda activate "${CONDA_ENV}"
34-
34+
3535 # For mypy linting, we need to first install executorch first so that
3636 # it builds the python package information.
3737 BUILD_TOOL="cmake"
7474 docker-image : executorch-ubuntu-22.04-linter
7575 fetch-depth : 0
7676 ref : ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
77+ timeout : 90
7778 script : |
7879 FILES_NEEDS_FORMAT=$(/opt/google-java-format -n extension/android/src/main/java/org/pytorch/executorch/*.java \
7980 examples/demo-apps/android/ExecuTorchDemo/app/src/main/java/com/example/executorchdemo/*.java \
You can’t perform that action at this time.
0 commit comments