From fc45987ffc1bc7f8e9a17e219a8a4cb20bbfda5e Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 17:30:32 +0800 Subject: [PATCH 01/14] [doc] add test info --- docs/source/zh-Hans/features/1D_tensor_parallel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/zh-Hans/features/1D_tensor_parallel.md b/docs/source/zh-Hans/features/1D_tensor_parallel.md index 2ddc27c7b50f..401bb60be4d7 100644 --- a/docs/source/zh-Hans/features/1D_tensor_parallel.md +++ b/docs/source/zh-Hans/features/1D_tensor_parallel.md @@ -23,7 +23,7 @@ ```math \left[\begin{matrix} B_1 \\ B_2 \end{matrix} \right] ``` -这就是所谓的行并行方式.
+这就是所谓的行并行方式.
# test 为了计算 ```math From bb814179c5bbb4b0e98c7440e96ecca263a82bd7 Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 17:38:28 +0800 Subject: [PATCH 02/14] [devops] update doc check ci --- .github/workflows/doc_check_on_pr.yml | 12 ++++++------ docs/source/zh-Hans/features/1D_tensor_parallel.md | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index 2022c957fba8..cb625d6d1219 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -47,12 +47,12 @@ jobs: # we use the versions in the main branch as the guide for versions to display # checkout will give your merged branch # therefore, we need to make the merged branch as the main branch - - name: Make the merged branch main - run: | - cd ColossalAI - curBranch=$(git rev-parse --abbrev-ref HEAD) - git checkout main - git merge $curBranch # fast-forward master up to the merge + # - name: Make the merged branch main + # run: | + # cd ColossalAI + # curBranch=$(git rev-parse --abbrev-ref HEAD) + # git checkout main + # git merge $curBranch # fast-forward master up to the merge - name: Build docs run: | diff --git a/docs/source/zh-Hans/features/1D_tensor_parallel.md b/docs/source/zh-Hans/features/1D_tensor_parallel.md index 401bb60be4d7..74954dac8f48 100644 --- a/docs/source/zh-Hans/features/1D_tensor_parallel.md +++ b/docs/source/zh-Hans/features/1D_tensor_parallel.md @@ -23,7 +23,7 @@ ```math \left[\begin{matrix} B_1 \\ B_2 \end{matrix} \right] ``` -这就是所谓的行并行方式.
# test +这就是所谓的行并行方式. 为了计算 ```math From 5bb9e012f3c81c51a974b926c196f322654779ea Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 19:57:34 +0800 Subject: [PATCH 03/14] [devops] add debug info --- .github/workflows/doc_check_on_pr.yml | 14 ++++++++------ docs/source/zh-Hans/features/1D_tensor_parallel.md | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index cb625d6d1219..6f6210d7dee9 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -47,12 +47,14 @@ jobs: # we use the versions in the main branch as the guide for versions to display # checkout will give your merged branch # therefore, we need to make the merged branch as the main branch - # - name: Make the merged branch main - # run: | - # cd ColossalAI - # curBranch=$(git rev-parse --abbrev-ref HEAD) - # git checkout main - # git merge $curBranch # fast-forward master up to the merge + - name: Make the merged branch main + run: | + cd ColossalAI + cat docs/source/zh-Hans/features/1D_tensor_parallel.md + curBranch=$(git rev-parse --abbrev-ref HEAD) + git checkout main + git merge $curBranch # fast-forward master up to the merge + cat docs/source/zh-Hans/features/1D_tensor_parallel.md - name: Build docs run: | diff --git a/docs/source/zh-Hans/features/1D_tensor_parallel.md b/docs/source/zh-Hans/features/1D_tensor_parallel.md index 74954dac8f48..2ddc27c7b50f 100644 --- a/docs/source/zh-Hans/features/1D_tensor_parallel.md +++ b/docs/source/zh-Hans/features/1D_tensor_parallel.md @@ -23,7 +23,7 @@ ```math \left[\begin{matrix} B_1 \\ B_2 \end{matrix} \right] ``` -这就是所谓的行并行方式. +这就是所谓的行并行方式.
为了计算 ```math From d0d3a7e917f56359a93be236469ed8f71b4f31f4 Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 19:58:38 +0800 Subject: [PATCH 04/14] [devops] add debug info --- docs/source/zh-Hans/features/1D_tensor_parallel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/zh-Hans/features/1D_tensor_parallel.md b/docs/source/zh-Hans/features/1D_tensor_parallel.md index 2ddc27c7b50f..09c3496d8ee2 100644 --- a/docs/source/zh-Hans/features/1D_tensor_parallel.md +++ b/docs/source/zh-Hans/features/1D_tensor_parallel.md @@ -23,7 +23,7 @@ ```math \left[\begin{matrix} B_1 \\ B_2 \end{matrix} \right] ``` -这就是所谓的行并行方式.
+这就是所谓的行并行方式.test
为了计算 ```math From 2ab6d720b7f1e76e726efc1b2082621bd0188e8e Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 20:05:43 +0800 Subject: [PATCH 05/14] [devops] add debug info --- .github/workflows/doc_check_on_pr.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index 6f6210d7dee9..5b388b995052 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -50,10 +50,11 @@ jobs: - name: Make the merged branch main run: | cd ColossalAI + git branch -avv cat docs/source/zh-Hans/features/1D_tensor_parallel.md - curBranch=$(git rev-parse --abbrev-ref HEAD) - git checkout main - git merge $curBranch # fast-forward master up to the merge + # curBranch=$(git rev-parse --abbrev-ref HEAD) + git branch main + # git merge $curBranch # fast-forward master up to the merge cat docs/source/zh-Hans/features/1D_tensor_parallel.md - name: Build docs From 47b1c74c9344cfe5f2445ed0e2eb15bf52e6dc55 Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 20:09:47 +0800 Subject: [PATCH 06/14] [devops] add debug info --- .github/workflows/doc_check_on_pr.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index 5b388b995052..72f328c5f781 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -50,11 +50,12 @@ jobs: - name: Make the merged branch main run: | cd ColossalAI + echo $GITHUB_REF git branch -avv cat docs/source/zh-Hans/features/1D_tensor_parallel.md # curBranch=$(git rev-parse --abbrev-ref HEAD) - git branch main - # git merge $curBranch # fast-forward master up to the merge + git checkout main + git merge $GITHUB_REF # fast-forward master up to the merge cat docs/source/zh-Hans/features/1D_tensor_parallel.md - name: Build docs From b480c3a13e2574fe113ad716bc1885bb2c56380d Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 20:14:11 +0800 Subject: [PATCH 07/14] [devops] add debug info --- .github/workflows/doc_check_on_pr.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index 72f328c5f781..9911fae62fd2 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -53,9 +53,10 @@ jobs: echo $GITHUB_REF git branch -avv cat docs/source/zh-Hans/features/1D_tensor_parallel.md - # curBranch=$(git rev-parse --abbrev-ref HEAD) + curBranch=$(git rev-parse --abbrev-ref HEAD) + echo $curBranch git checkout main - git merge $GITHUB_REF # fast-forward master up to the merge + git merge $curBranch # fast-forward master up to the merge cat docs/source/zh-Hans/features/1D_tensor_parallel.md - name: Build docs From 1b2c6adcf20450dd2c5637b3ce2ed8216f3a62de Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 20:20:14 +0800 Subject: [PATCH 08/14] [devops] add debug info --- .github/workflows/doc_check_on_pr.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index 9911fae62fd2..9e441b43252e 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -50,14 +50,13 @@ jobs: - name: Make the merged branch main run: | cd ColossalAI - echo $GITHUB_REF git branch -avv - cat docs/source/zh-Hans/features/1D_tensor_parallel.md curBranch=$(git rev-parse --abbrev-ref HEAD) echo $curBranch git checkout main + git diff git merge $curBranch # fast-forward master up to the merge - cat docs/source/zh-Hans/features/1D_tensor_parallel.md + git diff - name: Build docs run: | From 69251c1e7b6bc22017bbe919f127b5c951cec390 Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 20:21:50 +0800 Subject: [PATCH 09/14] [devops] add debug info --- .github/workflows/doc_check_on_pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index 9e441b43252e..b9ba1c5ebdf1 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -54,6 +54,7 @@ jobs: curBranch=$(git rev-parse --abbrev-ref HEAD) echo $curBranch git checkout main + git pull git diff git merge $curBranch # fast-forward master up to the merge git diff From 9c2d7e4d9d2fd7010be9a7d7a0c70d1d6b3c845c Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 20:26:47 +0800 Subject: [PATCH 10/14] [devops] add debug info --- .github/workflows/doc_check_on_pr.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index b9ba1c5ebdf1..7d1393581c34 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -51,13 +51,10 @@ jobs: run: | cd ColossalAI git branch -avv - curBranch=$(git rev-parse --abbrev-ref HEAD) - echo $curBranch - git checkout main - git pull - git diff - git merge $curBranch # fast-forward master up to the merge - git diff + git checkout -b main + git branch -u origin/main + git branch -avv + - name: Build docs run: | From 6b7fbda15a1cae54ce519ceebdfe4b26cd59fb03 Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 20:30:53 +0800 Subject: [PATCH 11/14] [devops] add debug info --- .github/workflows/doc_check_on_pr.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index 7d1393581c34..b67902a12e6c 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -51,9 +51,14 @@ jobs: run: | cd ColossalAI git branch -avv + git config --list git checkout -b main + git config --list git branch -u origin/main + git config --list git branch -avv + git checkout dev/chat-lazyinit + git config --list - name: Build docs From 0011966b478f5c1ab02f8788f0f56585d67216fa Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 20:35:40 +0800 Subject: [PATCH 12/14] [devops] add debug info --- .github/workflows/doc_check_on_pr.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index b67902a12e6c..005bf5cf4ae3 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -53,12 +53,10 @@ jobs: git branch -avv git config --list git checkout -b main - git config --list git branch -u origin/main - git config --list git branch -avv - git checkout dev/chat-lazyinit - git config --list + git config user.name 'github-actions' + git config user.email 'github-actions@github.com' - name: Build docs From e81b7c6df018c228bc27ce6b39f6e894e086993a Mon Sep 17 00:00:00 2001 From: ver217 Date: Tue, 16 May 2023 20:41:56 +0800 Subject: [PATCH 13/14] [devops] remove debug info and update invalid doc --- .github/workflows/doc_check_on_pr.yml | 3 --- docs/source/zh-Hans/features/1D_tensor_parallel.md | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index 005bf5cf4ae3..da3dbceb1fb3 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -50,11 +50,8 @@ jobs: - name: Make the merged branch main run: | cd ColossalAI - git branch -avv - git config --list git checkout -b main git branch -u origin/main - git branch -avv git config user.name 'github-actions' git config user.email 'github-actions@github.com' diff --git a/docs/source/zh-Hans/features/1D_tensor_parallel.md b/docs/source/zh-Hans/features/1D_tensor_parallel.md index 09c3496d8ee2..74954dac8f48 100644 --- a/docs/source/zh-Hans/features/1D_tensor_parallel.md +++ b/docs/source/zh-Hans/features/1D_tensor_parallel.md @@ -23,7 +23,7 @@ ```math \left[\begin{matrix} B_1 \\ B_2 \end{matrix} \right] ``` -这就是所谓的行并行方式.test
+这就是所谓的行并行方式. 为了计算 ```math From 7c296236b66308839cdac874be0323e6ae508e92 Mon Sep 17 00:00:00 2001 From: ver217 Date: Wed, 17 May 2023 11:01:16 +0800 Subject: [PATCH 14/14] [devops] add essential comments --- .github/workflows/doc_check_on_pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/doc_check_on_pr.yml b/.github/workflows/doc_check_on_pr.yml index da3dbceb1fb3..a863fcd70b44 100644 --- a/.github/workflows/doc_check_on_pr.yml +++ b/.github/workflows/doc_check_on_pr.yml @@ -47,6 +47,8 @@ jobs: # we use the versions in the main branch as the guide for versions to display # checkout will give your merged branch # therefore, we need to make the merged branch as the main branch + # there is no main branch, so it's safe to checkout the main branch from the merged branch + # docer will rebase the remote main branch to the merged branch, so we have to config user - name: Make the merged branch main run: | cd ColossalAI