From a990f1868973c3d51bd3891fba852b71b4098469 Mon Sep 17 00:00:00 2001 From: ver217 Date: Wed, 26 Jul 2023 15:41:30 +0800 Subject: [PATCH 1/3] [release] update version --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 0d91a54c7d43..9e11b32fcaa9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.3.0 +0.3.1 From a745343a6bcb3eda45598157bb4c215c8aa4f17f Mon Sep 17 00:00:00 2001 From: ver217 Date: Mon, 31 Jul 2023 14:40:16 +0800 Subject: [PATCH 2/3] [devops] hotfix cuda extension building --- .github/workflows/compatiblity_test_on_dispatch.yml | 2 +- .github/workflows/compatiblity_test_on_pr.yml | 2 +- .github/workflows/compatiblity_test_on_schedule.yml | 12 ++++++++++++ .github/workflows/cuda_ext_check_before_merge.yml | 12 ++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compatiblity_test_on_dispatch.yml b/.github/workflows/compatiblity_test_on_dispatch.yml index 3dcc4dfd182a..1778d64ee287 100644 --- a/.github/workflows/compatiblity_test_on_dispatch.yml +++ b/.github/workflows/compatiblity_test_on_dispatch.yml @@ -72,7 +72,7 @@ jobs: ssh-key: ${{ secrets.SSH_KEY_FOR_CI }} - name: Download cub for CUDA 10.2 run: | - CUDA_VERSION=$(cat $CUDA_HOME/version.txt | grep "CUDA Version" | awk '{print $NF}' | cut -d. -f1,2) + CUDA_VERSION=$(nvcc -V | awk -F ',| ' '/release/{print $6}') # check if it is CUDA 10.2 # download cub diff --git a/.github/workflows/compatiblity_test_on_pr.yml b/.github/workflows/compatiblity_test_on_pr.yml index 5098b8e364d0..c0f45c65a7fc 100644 --- a/.github/workflows/compatiblity_test_on_pr.yml +++ b/.github/workflows/compatiblity_test_on_pr.yml @@ -66,7 +66,7 @@ jobs: ssh-key: ${{ secrets.SSH_KEY_FOR_CI }} - name: Download cub for CUDA 10.2 run: | - CUDA_VERSION=$(cat $CUDA_HOME/version.txt | grep "CUDA Version" | awk '{print $NF}' | cut -d. -f1,2) + CUDA_VERSION=$(nvcc -V | awk -F ',| ' '/release/{print $6}') # check if it is CUDA 10.2 # download cub diff --git a/.github/workflows/compatiblity_test_on_schedule.yml b/.github/workflows/compatiblity_test_on_schedule.yml index 9802795fad24..15ac4f1a92bb 100644 --- a/.github/workflows/compatiblity_test_on_schedule.yml +++ b/.github/workflows/compatiblity_test_on_schedule.yml @@ -61,6 +61,18 @@ jobs: with: ssh-key: ${{ secrets.SSH_KEY_FOR_CI }} + - name: Download cub for CUDA 10.2 + run: | + CUDA_VERSION=$(nvcc -V | awk -F ',| ' '/release/{print $6}') + + # check if it is CUDA 10.2 + # download cub + if [ "$CUDA_VERSION" = "10.2" ]; then + wget https://github.com/NVIDIA/cub/archive/refs/tags/1.8.0.zip + unzip 1.8.0.zip + cp -r cub-1.8.0/cub/ colossalai/kernel/cuda_native/csrc/kernels/include/ + fi + - name: Install Colossal-AI run: | pip install -v --no-cache-dir . diff --git a/.github/workflows/cuda_ext_check_before_merge.yml b/.github/workflows/cuda_ext_check_before_merge.yml index eba5bb98ec07..686f0f395c73 100644 --- a/.github/workflows/cuda_ext_check_before_merge.yml +++ b/.github/workflows/cuda_ext_check_before_merge.yml @@ -37,6 +37,18 @@ jobs: - name: Install PyTorch run: eval ${{ matrix.build.torch_command }} + - name: Download cub for CUDA 10.2 + run: | + CUDA_VERSION=$(nvcc -V | awk -F ',| ' '/release/{print $6}') + + # check if it is CUDA 10.2 + # download cub + if [ "$CUDA_VERSION" = "10.2" ]; then + wget https://github.com/NVIDIA/cub/archive/refs/tags/1.8.0.zip + unzip 1.8.0.zip + cp -r cub-1.8.0/cub/ colossalai/kernel/cuda_native/csrc/kernels/include/ + fi + - name: Build run: | CUDA_EXT=1 pip install -v . From 161f0bd436eb92a0299ac0f74bc47da94e4a78cc Mon Sep 17 00:00:00 2001 From: ver217 Date: Mon, 31 Jul 2023 17:55:41 +0800 Subject: [PATCH 3/3] [devops] pytest ignore useless folders --- pytest.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/pytest.ini b/pytest.ini index 01e5cd217c5d..e99fe3f086c6 100644 --- a/pytest.ini +++ b/pytest.ini @@ -4,3 +4,4 @@ markers = gpu: tests which requires a single GPU dist: tests which are run in a multi-GPU or multi-machine environment experiment: tests for experimental features +addopts = --ignore=tests/test_analyzer --ignore=tests/test_auto_parallel --ignore=tests/test_autochunk