From 462dc1deab73817f36f3e91a102a3afe318157cd Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Tue, 15 Mar 2022 11:04:53 +0000 Subject: [PATCH 1/4] fixes #3934 Signed-off-by: Wenqi Li --- tests/min_tests.py | 1 - ...e_run.py => test_integration_bundle_run.py} | 0 tests/testing_data/inference.json | 18 +++++++++--------- tests/testing_data/inference.yaml | 18 +++++++++--------- 4 files changed, 18 insertions(+), 19 deletions(-) rename tests/{test_bundle_run.py => test_integration_bundle_run.py} (100%) diff --git a/tests/min_tests.py b/tests/min_tests.py index bb47403090..de0f445b01 100644 --- a/tests/min_tests.py +++ b/tests/min_tests.py @@ -159,7 +159,6 @@ def run_testsuit(): "test_zoomd", "test_prepare_batch_default_dist", "test_parallel_execution_dist", - "test_bundle_run", "test_bundle_verify_metadata", ] assert sorted(exclude_cases) == sorted(set(exclude_cases)), f"Duplicated items in {exclude_cases}" diff --git a/tests/test_bundle_run.py b/tests/test_integration_bundle_run.py similarity index 100% rename from tests/test_bundle_run.py rename to tests/test_integration_bundle_run.py diff --git a/tests/testing_data/inference.json b/tests/testing_data/inference.json index 6cc6de88ef..ce229023fb 100644 --- a/tests/testing_data/inference.json +++ b/tests/testing_data/inference.json @@ -6,11 +6,11 @@ "in_channels": 1, "out_channels": 2, "channels": [ - 16, - 32, - 64, - 128, - 256 + 2, + 2, + 4, + 8, + 4 ], "strides": [ 2, @@ -63,12 +63,12 @@ "inferer": { "_target_": "SlidingWindowInferer", "roi_size": [ - 96, - 96, - 96 + 64, + 64, + 32 ], "sw_batch_size": 4, - "overlap": 0.5 + "overlap": 0.25 }, "postprocessing": { "_target_": "Compose", diff --git a/tests/testing_data/inference.yaml b/tests/testing_data/inference.yaml index eb2870ee03..0a3383adbb 100644 --- a/tests/testing_data/inference.yaml +++ b/tests/testing_data/inference.yaml @@ -6,11 +6,11 @@ network_def: in_channels: 1 out_channels: 2 channels: - - 16 - - 32 - - 64 - - 128 - - 256 + - 2 + - 2 + - 4 + - 8 + - 4 strides: - 2 - 2 @@ -46,11 +46,11 @@ dataloader: inferer: _target_: SlidingWindowInferer roi_size: - - 96 - - 96 - - 96 + - 64 + - 64 + - 32 sw_batch_size: 4 - overlap: 0.5 + overlap: 0.25 postprocessing: _target_: Compose transforms: From 8cd6cec2fd0f8655b85fdb4f3bbbb648ad28de7c Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Tue, 15 Mar 2022 11:19:04 +0000 Subject: [PATCH 2/4] min_test update Signed-off-by: Wenqi Li --- tests/min_tests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/min_tests.py b/tests/min_tests.py index de0f445b01..7d3b35be47 100644 --- a/tests/min_tests.py +++ b/tests/min_tests.py @@ -95,6 +95,7 @@ def run_testsuit(): "test_integration_unet_2d", "test_integration_workflows", "test_integration_workflows_gan", + "test_integration_bundle_run", "test_invertd", "test_iterable_dataset", "test_keep_largest_connected_component", From ddf121e2064cce16899d5888f11241da5570328f Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Tue, 15 Mar 2022 19:23:15 +0000 Subject: [PATCH 3/4] cu115 tests Signed-off-by: Wenqi Li --- .github/workflows/integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 402415c02a..224b68d623 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -10,7 +10,7 @@ on: jobs: integration-py3: container: - image: nvcr.io/nvidia/pytorch:20.12-py3 # CUDA 11.1 + image: nvcr.io/nvidia/pytorch:21.12-py3 # CUDA 11.5 options: --gpus all runs-on: [self-hosted, linux, x64, common] steps: @@ -37,7 +37,7 @@ jobs: which python python -m pip install --upgrade pip wheel python -m pip uninstall -y torch torchvision - python -m pip install torch==1.11+cu111 torchvision==0.12+cu111 -f https://download.pytorch.org/whl/torch_stable.html + python -m pip install torch==1.11.0+cu115 torchvision==0.12.0+cu115 -f https://download.pytorch.org/whl/torch_stable.html python -m pip install -r requirements-dev.txt - name: Run integration tests run: | From 3296501a5a1bb7793cb5b7ec0e7817deb23e9bcf Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Tue, 15 Mar 2022 19:23:46 +0000 Subject: [PATCH 4/4] update tests Signed-off-by: Wenqi Li --- .github/workflows/integration.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 224b68d623..8ed9790dca 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -3,9 +3,6 @@ name: integration on: repository_dispatch: type: [integration-test-command] - push: - branches: - - add-spatial-resample jobs: integration-py3: