From 16aed973f60416ea190e84b760c55694f9b52664 Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Mon, 25 Sep 2023 11:46:28 +0100 Subject: [PATCH 1/5] remove self-hosted duplicated Signed-off-by: Wenqi Li --- .github/workflows/docker.yml | 5 +++-- .github/workflows/pythonapp-gpu.yml | 3 ++- .github/workflows/setupapp.yml | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1702a1211c..9a8df0fd16 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -84,11 +84,12 @@ jobs: needs: docker_build_dev container: image: docker://projectmonai/monai:latest - options: "--shm-size=4g --ipc=host" - runs-on: [self-hosted, linux, X64, docker] + options: "--ipc=host" + runs-on: ubuntu-latest steps: - name: Import run: | + rm -rf /opt/hostedtoolcache export OMP_NUM_THREADS=4 MKL_NUM_THREADS=4 CUDA_VISIBLE_DEVICES= # cpu-only python -c 'import monai; monai.config.print_debug_info()' cd /opt/monai diff --git a/.github/workflows/pythonapp-gpu.yml b/.github/workflows/pythonapp-gpu.yml index 50fbab2a98..eff9098aa1 100644 --- a/.github/workflows/pythonapp-gpu.yml +++ b/.github/workflows/pythonapp-gpu.yml @@ -17,7 +17,8 @@ concurrency: jobs: GPU-quick-py3: # GPU with full dependencies - if: ${{ github.repository == 'Project-MONAI/MONAI' && github.event.pull_request.merged != true }} + # if: ${{ github.repository == 'Project-MONAI/MONAI' && github.event.pull_request.merged != true }} + if: ${{ false }} # disable self-hosted job strategy: matrix: environment: diff --git a/.github/workflows/setupapp.yml b/.github/workflows/setupapp.yml index 05e2f64a74..9c38dacd47 100644 --- a/.github/workflows/setupapp.yml +++ b/.github/workflows/setupapp.yml @@ -21,7 +21,8 @@ jobs: # - ubuntu 37 38 39 310-pip- # - os-latest-pip (shared) coverage-py3: - if: github.repository == 'Project-MONAI/MONAI' + # if: github.repository == 'Project-MONAI/MONAI' + if: ${{ false }} # disable self-hosted job container: image: nvcr.io/nvidia/pytorch:22.04-py3 options: --gpus all From 98adea5cc17b652f38cd43e328cb6236411cc376 Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Mon, 25 Sep 2023 11:48:29 +0100 Subject: [PATCH 2/5] temp test Signed-off-by: Wenqi Li --- .github/workflows/docker.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9a8df0fd16..1e0be0872b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,6 +9,7 @@ on: push: branches: - dev + - temp-test # Allows you to run this workflow manually from the Actions tab # This is to trigger building/testing docker image from dev only. workflow_dispatch: @@ -17,7 +18,8 @@ jobs: versioning_dev: # compute versioning file from python setup.py # upload as artifact - if: github.repository == 'Project-MONAI/MONAI' + # if: github.repository == 'Project-MONAI/MONAI' + if: ${{ false }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -48,8 +50,9 @@ jobs: docker_build_dev: # builds projectmonai/monai:latest - if: github.repository == 'Project-MONAI/MONAI' - needs: versioning_dev + # if: github.repository == 'Project-MONAI/MONAI' + if: ${{ false }} + # needs: versioning_dev runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -80,8 +83,9 @@ jobs: docker image prune -f docker_test_dockerhub: - if: github.repository == 'Project-MONAI/MONAI' - needs: docker_build_dev + # if: github.repository == 'Project-MONAI/MONAI' + if: ${{ true }} + # needs: docker_build_dev container: image: docker://projectmonai/monai:latest options: "--ipc=host" From b671f0b7f6acadb852b2b7064a55c49ee8ae4650 Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Mon, 25 Sep 2023 12:19:20 +0100 Subject: [PATCH 3/5] Revert "temp test" This reverts commit 98adea5cc17b652f38cd43e328cb6236411cc376. Signed-off-by: Wenqi Li --- .github/workflows/docker.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1e0be0872b..9a8df0fd16 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,7 +9,6 @@ on: push: branches: - dev - - temp-test # Allows you to run this workflow manually from the Actions tab # This is to trigger building/testing docker image from dev only. workflow_dispatch: @@ -18,8 +17,7 @@ jobs: versioning_dev: # compute versioning file from python setup.py # upload as artifact - # if: github.repository == 'Project-MONAI/MONAI' - if: ${{ false }} + if: github.repository == 'Project-MONAI/MONAI' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -50,9 +48,8 @@ jobs: docker_build_dev: # builds projectmonai/monai:latest - # if: github.repository == 'Project-MONAI/MONAI' - if: ${{ false }} - # needs: versioning_dev + if: github.repository == 'Project-MONAI/MONAI' + needs: versioning_dev runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -83,9 +80,8 @@ jobs: docker image prune -f docker_test_dockerhub: - # if: github.repository == 'Project-MONAI/MONAI' - if: ${{ true }} - # needs: docker_build_dev + if: github.repository == 'Project-MONAI/MONAI' + needs: docker_build_dev container: image: docker://projectmonai/monai:latest options: "--ipc=host" From f2760aa85eaf234815487e8ff4094194a40e2fca Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Mon, 25 Sep 2023 12:21:10 +0100 Subject: [PATCH 4/5] update docker test Signed-off-by: Wenqi Li --- .github/workflows/docker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9a8df0fd16..16a696fdd7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -80,16 +80,16 @@ jobs: docker image prune -f docker_test_dockerhub: - if: github.repository == 'Project-MONAI/MONAI' + # if: github.repository == 'Project-MONAI/MONAI' + if: ${{ false }} # disable self-hosted job needs: docker_build_dev container: image: docker://projectmonai/monai:latest - options: "--ipc=host" - runs-on: ubuntu-latest + options: "--shm-size=4g --ipc=host" + runs-on: [self-hosted, linux, X64, docker] steps: - name: Import run: | - rm -rf /opt/hostedtoolcache export OMP_NUM_THREADS=4 MKL_NUM_THREADS=4 CUDA_VISIBLE_DEVICES= # cpu-only python -c 'import monai; monai.config.print_debug_info()' cd /opt/monai From 26c871c528515b341b769f8b6e3b5d9a574d8c86 Mon Sep 17 00:00:00 2001 From: Wenqi Li Date: Mon, 25 Sep 2023 12:22:55 +0100 Subject: [PATCH 5/5] update Signed-off-by: Wenqi Li --- .github/workflows/docker.yml | 2 +- .github/workflows/pythonapp-gpu.yml | 2 +- .github/workflows/setupapp.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 16a696fdd7..66d9f5070b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -81,7 +81,7 @@ jobs: docker_test_dockerhub: # if: github.repository == 'Project-MONAI/MONAI' - if: ${{ false }} # disable self-hosted job + if: ${{ false }} # disable self-hosted job project-monai/monai#7039 needs: docker_build_dev container: image: docker://projectmonai/monai:latest diff --git a/.github/workflows/pythonapp-gpu.yml b/.github/workflows/pythonapp-gpu.yml index eff9098aa1..4e3620cf27 100644 --- a/.github/workflows/pythonapp-gpu.yml +++ b/.github/workflows/pythonapp-gpu.yml @@ -18,7 +18,7 @@ concurrency: jobs: GPU-quick-py3: # GPU with full dependencies # if: ${{ github.repository == 'Project-MONAI/MONAI' && github.event.pull_request.merged != true }} - if: ${{ false }} # disable self-hosted job + if: ${{ false }} # disable self-hosted job project-monai/monai#7039 strategy: matrix: environment: diff --git a/.github/workflows/setupapp.yml b/.github/workflows/setupapp.yml index 9c38dacd47..c221b3348e 100644 --- a/.github/workflows/setupapp.yml +++ b/.github/workflows/setupapp.yml @@ -22,7 +22,7 @@ jobs: # - os-latest-pip (shared) coverage-py3: # if: github.repository == 'Project-MONAI/MONAI' - if: ${{ false }} # disable self-hosted job + if: ${{ false }} # disable self-hosted job project-monai/monai#7039 container: image: nvcr.io/nvidia/pytorch:22.04-py3 options: --gpus all