Skip to content

Commit 78ad3a4

Browse files
committed
Update on "Set up CI"
[ghstack-poisoned]
2 parents bfce802 + 325c05c commit 78ad3a4

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

.github/scripts/setup-env.sh

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,10 @@ conda create \
3939
--name ci \
4040
--quiet --yes \
4141
python="${PYTHON_VERSION}" pip \
42-
ninja cmake \
43-
libpng \
44-
'ffmpeg<4.3'
42+
ninja cmake
4543
conda activate ci
46-
conda install --quiet --yes libjpeg-turbo -c pytorch
4744
pip install --progress-bar=off --upgrade setuptools
4845

49-
# See https://github.com/pytorch/vision/issues/6790
50-
if [[ "${PYTHON_VERSION}" != "3.11" ]]; then
51-
pip install --progress-bar=off av!=10.0.0
52-
fi
53-
5446
echo '::endgroup::'
5547

5648
if [[ "${OS_TYPE}" == windows && "${GPU_ARCH_TYPE}" == cuda ]]; then
@@ -94,7 +86,7 @@ if [[ $GPU_ARCH_TYPE == 'cuda' ]]; then
9486
fi
9587
echo '::endgroup::'
9688

97-
echo '::group::Install third party dependencies prior to TorchVision install'
89+
echo '::group::Install third party dependencies prior to extension-cpp install'
9890
# Installing with `easy_install`, e.g. `python setup.py install` or `python setup.py develop`, has some quirks when
9991
# when pulling in third-party dependencies. For example:
10092
# - On Windows, we often hit an SSL error although `pip` can install just fine.
@@ -106,11 +98,9 @@ python setup.py egg_info
10698
# optional dependencies come in non-standard syntax after a blank line. Thus, we just extract the header.
10799
sed -e '/^$/,$d' *.egg-info/requires.txt | tee requirements.txt
108100
pip install --progress-bar=off -r requirements.txt
109-
# test dependency
110-
pip install numpy
111101
echo '::endgroup::'
112102

113-
echo '::group::Install TorchVision'
103+
echo '::group::Install extension-cpp'
114104
python setup.py develop
115105
echo '::endgroup::'
116106

.github/scripts/unittest.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ set -euo pipefail
88
eval "$($(which conda) shell.bash hook)" && conda deactivate && conda activate ci
99

1010
echo '::group::Install testing utilities'
11-
# TODO: remove the <8 constraint on pytest when https://github.com/pytorch/vision/issues/8238 is closed
12-
pip install --progress-bar=off "pytest<8" pytest-mock pytest-cov expecttest!=0.2.0
11+
pip install --progress-bar=off pytest pytest-mock pytest-cov expecttest numpy
1312
echo '::endgroup::'
1413

1514
pytest test/ --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v

0 commit comments

Comments
 (0)