Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 5 additions & 27 deletions tools/auto_parallel/ci_auto_parallel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ for file_name in `git diff --numstat upstream/${AGILE_COMPILE_BRANCH} |awk '{pri
# while the other tests of llama model will be executed in PR-CI-Auto-Parallel.
for ((i=0; i<${#target_lists_for_semi_auto_ci[@]}; i++)); do
if [[ $i != ${test_auto_num} ]] && [[ ${file_item} == *${target_lists_for_semi_auto_ci[i]}* ]];then
case_list[${#case_list[*]}]=gpt-3_auto
case_list[${#case_list[*]}]=llama_auto
case_list[${#case_list[*]}]="llama_auto_unit_test"
break
elif [[ $i == ${test_auto_num} ]] && [[ ${file_item} == *${target_lists_for_semi_auto_ci[i]}* ]];then
Expand All @@ -78,14 +78,6 @@ for file_name in `git diff --numstat upstream/${AGILE_COMPILE_BRANCH} |awk '{pri
continue
fi
done
for ((i=0; i<${#target_lists_for_pir_ci[@]}; i++)); do
if [[ ${file_item} == *${target_lists_for_pir_ci[i]}* ]];then
case_list[${#case_list[*]}]=gpt-3_auto_pir
break
else
continue
fi
done
# The dynamic unittests have been monitored in PR-CI-Distribute-stable
# and will be no longer redundantly executed in PR-CI-Auto-Parallel.
for ((i=0; i<${#target_lists_for_dygraph_ci[@]}; i++)); do
Expand Down Expand Up @@ -120,14 +112,6 @@ fi
get_diff_TO_case
# Remove duplicates and store the results back to the original list

####################
if [[ "${case_list[*]}" == *"gpt-3_auto"* ]] && [[ "${case_list[*]}" == *"gpt-3_auto_pir"* ]]; then
echo "同时命中gpt-3_auto 和 gpt-3_auto_pir, 只执行新ir, 不执行旧ir"
case_list=("${case_list[@]/*gpt-3_auto_pir*/}")
case_list=("${case_list[@]/*gpt-3_auto*/}")
case_list[${#case_list[*]}]=gpt-3_auto_pir
echo ${case_list[*]}
fi
####################
case_list=($(awk -v RS=' ' '!a[$1]++' <<< ${case_list[*]}))
if [[ ${#case_list[*]} -ne 0 ]];then
Expand All @@ -142,17 +126,11 @@ if [[ ${#case_list[*]} -ne 0 ]];then
export FLAGS_install_deps=0
for case in ${case_list[*]};do
echo -e "\033[31m ---- running case $case_num/${#case_list[*]}: ${case} \033"
if [[ ${case} == "gpt-3_auto" ]];then
bash /workspace/PaddleNLP/scripts/distribute/ci_case_auto.sh gpt_case_list_auto $FLAGS_install_deps $FLAGS_download_data
print_info $? `ls -lt ${log_path} | grep "gpt" | grep -v "pir" | head -n 1 | awk '{print $9}'` ${case}
export FLAGS_install_deps=1
export FLAGS_download_data="gpt ""$FLAGS_download_data"
let case_num++
elif [[ ${case} == "gpt-3_auto_pir" ]];then
bash /workspace/PaddleNLP/scripts/distribute/ci_case_auto.sh gpt_case_list_auto_pir $FLAGS_install_deps $FLAGS_download_data
print_info $? `ls -lt ${log_path} | grep "pir" | head -n 1 | awk '{print $9}'` ${case}
if [[ ${case} == "llama_auto" ]];then
bash /workspace/PaddleNLP/scripts/distribute/ci_case_auto.sh llama_case_list_auto $FLAGS_install_deps $FLAGS_download_data
print_info $? `ls -lt ${log_path} | grep "llama" | head -n 1 | awk '{print $9}'` ${case}
export FLAGS_install_deps=1
export FLAGS_download_data="gpt ""$FLAGS_download_data"
export FLAGS_download_data="llama ""$FLAGS_download_data"
let case_num++
elif [[ ${case} == "auto_unit_test" ]];then
bash /workspace/Paddle/tools/auto_parallel/ci_case_unit.sh auto_unit_test
Expand Down
7 changes: 1 addition & 6 deletions tools/auto_parallel/target_path_lists.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# See the License for the specific language governing permissions and
# limitations under the License.

target_lists_for_semi_auto_ci=(
Expand All @@ -25,15 +25,10 @@ target_lists_for_semi_auto_ci=(
"paddle/phi/api/generator/dist_bw_api_gen.py"
"tools/auto_parallel/target_path_lists.sh"
"test/auto_parallel"
)

target_lists_for_pir_ci=(
"paddle/fluid/framework/new_executor"
"paddle/fluid/ir_adaptor/"
"paddle/fluid/pir/dialect"
"paddle/fluid/pir/transforms"
"paddle/pir"
"tools/auto_parallel/target_path_lists.sh"
)

target_lists_for_dygraph_ci=(
Expand Down