From 011edea3f1f8c54c88a3fc75b594a28dc4315204 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Tue, 30 Jan 2024 15:04:22 +0800 Subject: [PATCH 1/5] fix #7416 Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- .github/workflows/docker.yml | 2 +- .github/workflows/release.yml | 6 +++--- .github/workflows/setupapp.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 229ae675f5..065125cc33 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -62,7 +62,7 @@ jobs: - name: docker_build shell: bash run: | - rm -rf /opt/hostedtoolcache + find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \; docker --version # get tag info for versioning cat _version.py diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a03d2cea6c..c134724665 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: python -m pip install --user --upgrade setuptools wheel - name: Build and test source archive and wheel file run: | - rm -rf /opt/hostedtoolcache + find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \; git fetch --depth=1 origin +refs/tags/*:refs/tags/* root_dir=$PWD echo "$root_dir" @@ -102,7 +102,7 @@ jobs: python-version: '3.9' - shell: bash run: | - rm -rf /opt/hostedtoolcache + find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \; git describe python -m pip install --user --upgrade setuptools wheel python setup.py build @@ -143,7 +143,7 @@ jobs: RELEASE_VERSION: ${{ steps.versioning.outputs.tag }} shell: bash run: | - rm -rf /opt/hostedtoolcache + find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \; # get tag info for versioning mv _version.py monai/ # version checks diff --git a/.github/workflows/setupapp.yml b/.github/workflows/setupapp.yml index 82394a86dd..a6407deb33 100644 --- a/.github/workflows/setupapp.yml +++ b/.github/workflows/setupapp.yml @@ -100,7 +100,7 @@ jobs: key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ steps.pip-cache.outputs.datew }} - name: Install the dependencies run: | - rm -rf /opt/hostedtoolcache + find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \; python -m pip install --upgrade pip wheel python -m pip install -r requirements-dev.txt - name: Run quick tests CPU ubuntu @@ -146,7 +146,7 @@ jobs: - name: Install the default branch with build (dev branch only) if: github.ref == 'refs/heads/dev' run: | - rm -rf /opt/hostedtoolcache + find /opt/hostedtoolcache/* -maxdepth 0 ! -name 'Python' -exec rm -rf {} \; BUILD_MONAI=1 pip install git+https://github.com/Project-MONAI/MONAI#egg=MONAI python -c 'import monai; monai.config.print_config()' - name: Get the test cases (dev branch only) From 0ed653e1dbcd945597e6b44890572a820232b6b1 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Tue, 30 Jan 2024 17:47:18 +0800 Subject: [PATCH 2/5] temporarily trigger tests Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- .github/workflows/docker.yml | 3 +++ .github/workflows/release.yml | 3 +++ .github/workflows/setupapp.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 065125cc33..2b292b89ab 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,6 +12,9 @@ on: # Allows you to run this workflow manually from the Actions tab # This is to trigger building/testing docker image from dev only. workflow_dispatch: + pull_request: + branches: + - dev jobs: versioning_dev: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c134724665..997f2f6292 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,9 @@ on: - main tags: - '*' + pull_request: + branches: + - dev jobs: packaging: diff --git a/.github/workflows/setupapp.yml b/.github/workflows/setupapp.yml index a6407deb33..46bb0836e0 100644 --- a/.github/workflows/setupapp.yml +++ b/.github/workflows/setupapp.yml @@ -9,6 +9,9 @@ on: - releasing/* - feature/* - dev + pull_request: + branches: + - dev concurrency: # automatically cancel the previously triggered workflows when there's a newer version From 5793a875c1678af70c50014db469ce758d15bbe0 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Wed, 31 Jan 2024 10:43:59 +0800 Subject: [PATCH 3/5] revert tests Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- .github/workflows/docker.yml | 3 --- .github/workflows/release.yml | 3 --- .github/workflows/setupapp.yml | 3 --- 3 files changed, 9 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2b292b89ab..065125cc33 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,9 +12,6 @@ on: # Allows you to run this workflow manually from the Actions tab # This is to trigger building/testing docker image from dev only. workflow_dispatch: - pull_request: - branches: - - dev jobs: versioning_dev: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 997f2f6292..c134724665 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,9 +7,6 @@ on: - main tags: - '*' - pull_request: - branches: - - dev jobs: packaging: diff --git a/.github/workflows/setupapp.yml b/.github/workflows/setupapp.yml index 46bb0836e0..a6407deb33 100644 --- a/.github/workflows/setupapp.yml +++ b/.github/workflows/setupapp.yml @@ -9,9 +9,6 @@ on: - releasing/* - feature/* - dev - pull_request: - branches: - - dev concurrency: # automatically cancel the previously triggered workflows when there's a newer version From 35e4194625bddf3962ad3cdfc113bd041733f557 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:23:48 +0800 Subject: [PATCH 4/5] fix mypy Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- monai/transforms/smooth_field/array.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monai/transforms/smooth_field/array.py b/monai/transforms/smooth_field/array.py index c9df5f1dbb..feead75a63 100644 --- a/monai/transforms/smooth_field/array.py +++ b/monai/transforms/smooth_field/array.py @@ -91,7 +91,7 @@ def __init__( self.crand_size = (self.channels,) + self.rand_size pad_slice = slice(None) if self.pad == 0 else slice(self.pad, -self.pad) - self.rand_slices = (0, slice(None)) + (pad_slice,) * len(self.rand_size) + self.rand_slices = (0, slice(None)) + (pad_slice,) * len(self.rand_size) # type: ignore[index] self.set_spatial_size(spatial_size) From c3280eba64781a2f558b7d6342aaa2c678ac7d4b Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:31:59 +0800 Subject: [PATCH 5/5] fix mypy Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- monai/transforms/smooth_field/array.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monai/transforms/smooth_field/array.py b/monai/transforms/smooth_field/array.py index feead75a63..9d19263f8b 100644 --- a/monai/transforms/smooth_field/array.py +++ b/monai/transforms/smooth_field/array.py @@ -91,12 +91,12 @@ def __init__( self.crand_size = (self.channels,) + self.rand_size pad_slice = slice(None) if self.pad == 0 else slice(self.pad, -self.pad) - self.rand_slices = (0, slice(None)) + (pad_slice,) * len(self.rand_size) # type: ignore[index] + self.rand_slices = (0, slice(None)) + (pad_slice,) * len(self.rand_size) self.set_spatial_size(spatial_size) def randomize(self, data: Any | None = None) -> None: - self.field[self.rand_slices] = torch.from_numpy(self.R.uniform(self.low, self.high, self.crand_size)) + self.field[self.rand_slices] = torch.from_numpy(self.R.uniform(self.low, self.high, self.crand_size)) # type: ignore[index] def set_spatial_size(self, spatial_size: Sequence[int] | None) -> None: """