Skip to content

Commit 151efc4

Browse files
authored
Simplify commands by removing CONDA_RUN variable
Removed usage of CONDA_RUN variable for various commands in the workflow.
1 parent d25c3d5 commit 151efc4

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

.github/workflows/linux_cuda_wheel.yaml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,36 +100,34 @@ jobs:
100100
run: |
101101
# Note: xorg-libxau was addded to fix a problem with ffmpeg 4. We should consider removing it.
102102
conda install libnpp cuda-nvrtc=${{ matrix.cuda-version }} cuda-toolkit=${{ matrix.cuda-version }} cuda-cudart=${{ matrix.cuda-version }} cuda-driver-dev=${{ matrix.cuda-version }} ffmpeg=${{ matrix.ffmpeg-version-for-tests }} xorg-libxau
103-
echo "CONDA_PREFIX=${CONDA_PREFIX}" >> "${GITHUB_ENV}"
104-
echo "CONDA_RUN=$(which conda) run -p ${CONDA_PREFIX} --no-capture-output" >> "${GITHUB_ENV}"
105103
- name: Check env
106104
run: |
107-
${CONDA_RUN} env
108-
${CONDA_RUN} conda info
109-
${CONDA_RUN} nvidia-smi
110-
${CONDA_RUN} conda list
105+
env
106+
conda info
107+
nvidia-smi
108+
conda list
111109
- name: Assert ffmpeg exists
112110
run: |
113-
${CONDA_RUN} ffmpeg -buildconf
111+
ffmpeg -buildconf
114112
- name: Update pip
115113
run: ${CONDA_RUN} python -m pip install --upgrade pip
116114
- name: Install PyTorch
117115
run: |
118-
${CONDA_RUN} python -m pip install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu${{ env.cuda_version_without_periods }}
119-
${CONDA_RUN} python -c 'import torch; print(f"{torch.__version__}"); print(f"{torch.__file__}"); print(f"{torch.cuda.is_available()=}")'
116+
conda run python -m pip install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu${{ env.cuda_version_without_periods }}
117+
conda run python -c 'import torch; print(f"{torch.__version__}"); print(f"{torch.__file__}"); print(f"{torch.cuda.is_available()=}")'
120118
- name: Install torchcodec from the wheel
121119
run: |
122120
wheel_path=`find pytorch/torchcodec/dist -type f -name "*cu${{ env.cuda_version_without_periods }}-cp${{ env.python_version_without_periods }}*.whl"`
123121
echo Installing $wheel_path
124-
${CONDA_RUN} python -m pip install $wheel_path -vvv
122+
python -m pip install $wheel_path -vvv
125123
126124
- name: Check out repo
127125
uses: actions/checkout@v3
128126

129127
- name: Install test dependencies
130128
run: |
131129
# Ideally we would find a way to get those dependencies from pyproject.toml
132-
${CONDA_RUN} python -m pip install numpy pytest pillow
130+
python -m pip install numpy pytest pillow
133131
134132
- name: Delete the src/ folder just for fun
135133
run: |
@@ -147,7 +145,7 @@ jobs:
147145
ls
148146
- name: Run Python tests
149147
run: |
150-
${CONDA_RUN} FAIL_WITHOUT_CUDA=1 pytest --override-ini="addopts=-v" test --tb=short
148+
FAIL_WITHOUT_CUDA=1 pytest --override-ini="addopts=-v" test --tb=short
151149
- name: Run Python benchmark
152150
run: |
153-
${CONDA_RUN} time python benchmarks/decoders/gpu_benchmark.py --devices=cuda:0,cpu --resize_devices=none
151+
time python benchmarks/decoders/gpu_benchmark.py --devices=cuda:0,cpu --resize_devices=none

0 commit comments

Comments
 (0)