Skip to content

Commit d2634d8

Browse files
author
Caroline Chen
committed
Fix Linux smoke tests (#1906)
1 parent c910212 commit d2634d8

File tree

3 files changed

+62
-23
lines changed

3 files changed

+62
-23
lines changed

.circleci/config.yml

Lines changed: 35 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.circleci/config.yml.in

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,8 @@ binary_common: &binary_common
9393
smoke_test_common: &smoke_test_common
9494
<<: *binary_common
9595
docker:
96-
- image: 308535385114.dkr.ecr.us-east-1.amazonaws.com/torchaudio/smoke_test:56c846a5-acaa-41a7-92f5-46ec66186c61
97-
aws_auth:
98-
aws_access_key_id: ${ECR_AWS_ACCESS_KEY}
99-
aws_secret_access_key: ${ECR_AWS_SECRET_ACCESS_KEY}
96+
- image: pytorch/torchaudio_unittest_base:smoke_test-20211019
97+
resource_class: large
10098

10199
jobs:
102100
circleci_consistency:
@@ -336,6 +334,26 @@ jobs:
336334
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
337335
python -c "import torchaudio"
338336

337+
smoke_test_linux_conda_gpu:
338+
<<: *smoke_test_common
339+
steps:
340+
- attach_workspace:
341+
at: ~/workspace
342+
- designate_upload_channel
343+
- load_conda_channel_flags
344+
- run:
345+
name: install binaries
346+
command: |
347+
set -x
348+
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
349+
conda install -v -y -c pytorch-${UPLOAD_CHANNEL} pytorch cudatoolkit=${CU_VERSION:2:2}.${CU_VERSION:4} -c conda-forge
350+
conda install -v -y -c file://$HOME/workspace/conda-bld torchaudio
351+
- run:
352+
name: smoke test
353+
command: |
354+
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
355+
python -c "import torchaudio"
356+
339357
smoke_test_linux_pip:
340358
<<: *smoke_test_common
341359
steps:
@@ -348,7 +366,7 @@ jobs:
348366
command: |
349367
set -x
350368
source /usr/local/etc/profile.d/conda.sh && conda activate python${PYTHON_VERSION}
351-
pip install $(ls ~/workspace/torchaudio*.whl) -f "https://download.pytorch.org/whl/${UPLOAD_CHANNEL}/torch_${UPLOAD_CHANNEL}.html"
369+
pip install $(ls ~/workspace/torchaudio*.whl) -f "https://download.pytorch.org/whl/${UPLOAD_CHANNEL}/${CU_VERSION}/torch_${UPLOAD_CHANNEL}.html"
352370
- run:
353371
name: smoke test
354372
command: |

.circleci/regenerate.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,10 @@ def generate_smoketest_workflow(pydistro, base_workflow_name, filter_branch, pyt
190190
if filter_branch:
191191
d["filters"] = gen_filter_branch_tree(filter_branch)
192192

193-
return {f"smoke_test_{os_type}_{pydistro}": d}
193+
smoke_name = f"smoke_test_{os_type}_{pydistro}"
194+
if pydistro == "conda" and os_type == "linux" and cu_version != "cpu":
195+
smoke_name += "_gpu"
196+
return {smoke_name: d}
194197

195198

196199
def indent(indentation, data_list):

0 commit comments

Comments
 (0)