From 68214bb0be53df5907e60b110ab39dfb72cebe15 Mon Sep 17 00:00:00 2001 From: ver217 Date: Thu, 7 Sep 2023 20:33:58 +0800 Subject: [PATCH 1/5] [devops] fix concurrency group --- .github/workflows/build_on_pr.yml | 6 +++--- .github/workflows/compatiblity_test_on_pr.yml | 4 ++-- .github/workflows/doc_check_on_pr.yml | 4 ++-- .github/workflows/doc_test_on_pr.yml | 4 ++-- .github/workflows/example_check_on_pr.yml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_on_pr.yml b/.github/workflows/build_on_pr.yml index 8d98130f8a32..291d6adac2b2 100644 --- a/.github/workflows/build_on_pr.yml +++ b/.github/workflows/build_on_pr.yml @@ -61,7 +61,7 @@ jobs: run: shell: bash concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-repare-cache cancel-in-progress: true steps: - name: Copy testmon cache @@ -87,7 +87,7 @@ jobs: anyLibraryFileChanged: ${{ steps.find-lib-change.outputs.any_changed }} runs-on: ubuntu-latest concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-detect-change cancel-in-progress: true steps: - uses: actions/checkout@v2 @@ -147,7 +147,7 @@ jobs: run: shell: bash concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-run-test cancel-in-progress: true steps: - name: Checkout TensorNVMe diff --git a/.github/workflows/compatiblity_test_on_pr.yml b/.github/workflows/compatiblity_test_on_pr.yml index 87dd9ef500fe..28f1e9f61457 100644 --- a/.github/workflows/compatiblity_test_on_pr.yml +++ b/.github/workflows/compatiblity_test_on_pr.yml @@ -13,7 +13,7 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-prepare-matrix cancel-in-progress: true steps: - uses: actions/checkout@v3 @@ -44,7 +44,7 @@ jobs: options: --gpus all --rm -v /data/scratch/cifar-10:/data/scratch/cifar-10 timeout-minutes: 120 concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-run-test cancel-in-progress: true steps: - name: Install dependencies diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index ae9e311649f7..ee8a82128dd7 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -17,7 +17,7 @@ jobs: github.event.pull_request.base.repo.full_name == 'hpcaitech/ColossalAI' runs-on: ubuntu-latest concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-check-i18n cancel-in-progress: true steps: - uses: actions/checkout@v2 @@ -35,7 +35,7 @@ jobs: github.event.pull_request.base.repo.full_name == 'hpcaitech/ColossalAI' runs-on: ubuntu-latest concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-check-doc cancel-in-progress: true steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/doc_test_on_pr.yml b/.github/workflows/doc_test_on_pr.yml index bf9ed64c8a7e..a3df2c50e6d3 100644 --- a/.github/workflows/doc_test_on_pr.yml +++ b/.github/workflows/doc_test_on_pr.yml @@ -20,7 +20,7 @@ jobs: any_changed: ${{ steps.changed-files.outputs.any_changed }} changed_files: ${{ steps.changed-files.outputs.all_changed_files }} concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-detect-change cancel-in-progress: true name: Detect changed example files steps: @@ -63,7 +63,7 @@ jobs: run: shell: bash concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-run-doctest cancel-in-progress: true steps: - name: Checkout ColossalAI-Documentation diff --git a/.github/workflows/example_check_on_pr.yml b/.github/workflows/example_check_on_pr.yml index d990a76ca6db..34ebba83c407 100644 --- a/.github/workflows/example_check_on_pr.yml +++ b/.github/workflows/example_check_on_pr.yml @@ -21,7 +21,7 @@ jobs: anyChanged: ${{ steps.setup-matrix.outputs.anyChanged }} name: Detect changed example files concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-detect-change cancel-in-progress: true steps: - uses: actions/checkout@v3 @@ -81,7 +81,7 @@ jobs: options: --gpus all --rm -v /data/scratch/examples-data:/data/ timeout-minutes: 10 concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-run-example cancel-in-progress: true steps: - uses: actions/checkout@v3 From d4d4d60872ac86a5010deaee46c6c26a7616fb6c Mon Sep 17 00:00:00 2001 From: ver217 Date: Thu, 7 Sep 2023 20:35:33 +0800 Subject: [PATCH 2/5] [devops] fix compatibility test --- .github/workflows/compatiblity_test_on_dispatch.yml | 1 - .github/workflows/compatiblity_test_on_pr.yml | 1 - .github/workflows/compatiblity_test_on_schedule.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/compatiblity_test_on_dispatch.yml b/.github/workflows/compatiblity_test_on_dispatch.yml index 63c0fbbb975d..e8efb42d316d 100644 --- a/.github/workflows/compatiblity_test_on_dispatch.yml +++ b/.github/workflows/compatiblity_test_on_dispatch.yml @@ -64,7 +64,6 @@ jobs: - name: Install tensornvme run: | cd TensorNVMe - conda install cmake pip install -r requirements.txt pip install -v . - uses: actions/checkout@v2 diff --git a/.github/workflows/compatiblity_test_on_pr.yml b/.github/workflows/compatiblity_test_on_pr.yml index 28f1e9f61457..2b6eda36103b 100644 --- a/.github/workflows/compatiblity_test_on_pr.yml +++ b/.github/workflows/compatiblity_test_on_pr.yml @@ -58,7 +58,6 @@ jobs: - name: Install tensornvme run: | cd TensorNVMe - conda install cmake pip install -r requirements.txt pip install -v . - uses: actions/checkout@v2 diff --git a/.github/workflows/compatiblity_test_on_schedule.yml b/.github/workflows/compatiblity_test_on_schedule.yml index 3f8fc96395c9..4af8e4626813 100644 --- a/.github/workflows/compatiblity_test_on_schedule.yml +++ b/.github/workflows/compatiblity_test_on_schedule.yml @@ -54,7 +54,6 @@ jobs: - name: Install tensornvme run: | cd TensorNVMe - conda install cmake pip install -r requirements.txt pip install -v . - uses: actions/checkout@v2 From cbf965b95da1ed8fa37de6d16250dc8630112cca Mon Sep 17 00:00:00 2001 From: ver217 Date: Thu, 7 Sep 2023 22:45:37 +0800 Subject: [PATCH 3/5] [devops] fix tensornvme install --- .github/workflows/compatiblity_test_on_dispatch.yml | 1 + .github/workflows/compatiblity_test_on_pr.yml | 1 + .github/workflows/compatiblity_test_on_schedule.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/compatiblity_test_on_dispatch.yml b/.github/workflows/compatiblity_test_on_dispatch.yml index e8efb42d316d..858e2e3c8b17 100644 --- a/.github/workflows/compatiblity_test_on_dispatch.yml +++ b/.github/workflows/compatiblity_test_on_dispatch.yml @@ -64,6 +64,7 @@ jobs: - name: Install tensornvme run: | cd TensorNVMe + apt install -y cmake pip install -r requirements.txt pip install -v . - uses: actions/checkout@v2 diff --git a/.github/workflows/compatiblity_test_on_pr.yml b/.github/workflows/compatiblity_test_on_pr.yml index 2b6eda36103b..fb27e4105d8a 100644 --- a/.github/workflows/compatiblity_test_on_pr.yml +++ b/.github/workflows/compatiblity_test_on_pr.yml @@ -58,6 +58,7 @@ jobs: - name: Install tensornvme run: | cd TensorNVMe + apt install -y cmake pip install -r requirements.txt pip install -v . - uses: actions/checkout@v2 diff --git a/.github/workflows/compatiblity_test_on_schedule.yml b/.github/workflows/compatiblity_test_on_schedule.yml index 4af8e4626813..c0fc8af9d160 100644 --- a/.github/workflows/compatiblity_test_on_schedule.yml +++ b/.github/workflows/compatiblity_test_on_schedule.yml @@ -54,6 +54,7 @@ jobs: - name: Install tensornvme run: | cd TensorNVMe + apt install -y cmake pip install -r requirements.txt pip install -v . - uses: actions/checkout@v2 From 59c0940c9789164acb249aac8981c30a951de810 Mon Sep 17 00:00:00 2001 From: ver217 Date: Thu, 7 Sep 2023 22:48:06 +0800 Subject: [PATCH 4/5] [devops] fix tensornvme install --- .github/workflows/compatiblity_test_on_dispatch.yml | 2 +- .github/workflows/compatiblity_test_on_pr.yml | 2 +- .github/workflows/compatiblity_test_on_schedule.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/compatiblity_test_on_dispatch.yml b/.github/workflows/compatiblity_test_on_dispatch.yml index 858e2e3c8b17..d4c8be5107c5 100644 --- a/.github/workflows/compatiblity_test_on_dispatch.yml +++ b/.github/workflows/compatiblity_test_on_dispatch.yml @@ -64,7 +64,7 @@ jobs: - name: Install tensornvme run: | cd TensorNVMe - apt install -y cmake + apt update && apt install -y cmake pip install -r requirements.txt pip install -v . - uses: actions/checkout@v2 diff --git a/.github/workflows/compatiblity_test_on_pr.yml b/.github/workflows/compatiblity_test_on_pr.yml index fb27e4105d8a..2b522eaf62a4 100644 --- a/.github/workflows/compatiblity_test_on_pr.yml +++ b/.github/workflows/compatiblity_test_on_pr.yml @@ -58,7 +58,7 @@ jobs: - name: Install tensornvme run: | cd TensorNVMe - apt install -y cmake + apt update && apt install -y cmake pip install -r requirements.txt pip install -v . - uses: actions/checkout@v2 diff --git a/.github/workflows/compatiblity_test_on_schedule.yml b/.github/workflows/compatiblity_test_on_schedule.yml index c0fc8af9d160..74eea462ff72 100644 --- a/.github/workflows/compatiblity_test_on_schedule.yml +++ b/.github/workflows/compatiblity_test_on_schedule.yml @@ -54,7 +54,7 @@ jobs: - name: Install tensornvme run: | cd TensorNVMe - apt install -y cmake + apt update && apt install -y cmake pip install -r requirements.txt pip install -v . - uses: actions/checkout@v2 From f371a7a5fc14cfd315a3bd00151d76f5374621ab Mon Sep 17 00:00:00 2001 From: ver217 Date: Thu, 7 Sep 2023 22:56:51 +0800 Subject: [PATCH 5/5] [devops] fix colossalai install --- .github/workflows/compatiblity_test_on_dispatch.yml | 3 +-- .github/workflows/compatiblity_test_on_pr.yml | 2 +- .github/workflows/compatiblity_test_on_schedule.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/compatiblity_test_on_dispatch.yml b/.github/workflows/compatiblity_test_on_dispatch.yml index d4c8be5107c5..2f03c8ced98d 100644 --- a/.github/workflows/compatiblity_test_on_dispatch.yml +++ b/.github/workflows/compatiblity_test_on_dispatch.yml @@ -83,8 +83,7 @@ jobs: fi - name: Install Colossal-AI run: | - pip install -r requirements/requirements.txt - pip install -v --no-cache-dir . + CUDA_EXT=1 pip install -v . pip install -r requirements/requirements-test.txt - name: Unit Testing run: | diff --git a/.github/workflows/compatiblity_test_on_pr.yml b/.github/workflows/compatiblity_test_on_pr.yml index 2b522eaf62a4..9c0a8f3cc8a6 100644 --- a/.github/workflows/compatiblity_test_on_pr.yml +++ b/.github/workflows/compatiblity_test_on_pr.yml @@ -78,7 +78,7 @@ jobs: - name: Install Colossal-AI run: | - pip install -v --no-cache-dir . + CUDA_EXT=1 pip install -v . pip install -r requirements/requirements-test.txt - name: Unit Testing run: | diff --git a/.github/workflows/compatiblity_test_on_schedule.yml b/.github/workflows/compatiblity_test_on_schedule.yml index 74eea462ff72..9933224f5675 100644 --- a/.github/workflows/compatiblity_test_on_schedule.yml +++ b/.github/workflows/compatiblity_test_on_schedule.yml @@ -75,7 +75,7 @@ jobs: - name: Install Colossal-AI run: | - pip install -v --no-cache-dir . + CUDA_EXT=1 pip install -v . pip install -r requirements/requirements-test.txt - name: Unit Testing