Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@haohongxiang
haohongxiang committed Oct 5, 2021
1 parent 3865e93 commit edc1988
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ...n/paddle/distributed/fleet/meta_optimizers/dygraph_optimizer/hybrid_parallel_optimizer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ def _dygraph_clip(self, params_grads):
return params_grads

global_norm_var_dist = layers.concat(sum_square_list_dist) if len(
sum_square_list_dist) == 0 else layers.concat(
sum_square_list_dist) != 0 else layers.concat(
[paddle.to_tensor([0.])])
global_norm_var_dist = layers.reduce_sum(global_norm_var_dist)
global_norm_var_not_dist = layers.concat(
sum_square_list_not_dist) if len(
sum_square_list_not_dist) == 0 else layers.concat(
sum_square_list_not_dist) != 0 else layers.concat(
[paddle.to_tensor([0.])])
global_norm_var_not_dist = layers.reduce_sum(global_norm_var_not_dist)

Expand Down

1 comment on commit edc1988

@paddle-bot-old
Copy link

@paddle-bot-old paddle-bot-old bot commented on edc1988 Oct 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🕵️ CI failures summary

🔍 PR: #36703 Commit ID: edc1988 contains failed CI.

🔹 Failed: PR-CI-Static-Check-22

failed in Git-clone job
failed in Git-clone job

🔹 Failed: PR-CI-musl-22

Unknown Failed
2021-10-25 19:54:03 Auto-merging paddle/fluid/inference/lite/engine.h

2021-10-25 19:54:03 Auto-merging paddle/fluid/inference/lite/engine.cc

2021-10-25 19:54:03 Auto-merging paddle/fluid/inference/api/analysis_predictor_tester.cc

2021-10-25 19:54:03 Auto-merging paddle/fluid/inference/api/analysis_predictor.cc

2021-10-25 19:54:03 CONFLICT (content): Merge conflict in paddle/fluid/inference/api/analysis_predictor.cc

2021-10-25 19:54:03 Auto-merging paddle/fluid/inference/analysis/ir_passes/lite_subgraph_pass.cc

2021-10-25 19:54:03 Auto-merging paddle/fluid/inference/analysis/ir_pass_manager.cc

2021-10-25 19:54:03 CONFLICT (content): Merge conflict in paddle/fluid/inference/analysis/ir_pass_manager.cc

2021-10-25 19:54:03 Auto-merging paddle/fluid/inference/analysis/argument.h

2021-10-25 19:54:03 Auto-merging paddle/fluid/framework/ir/multihead_matmul_fuse_pass.cc

2021-10-25 19:54:03 Auto-merging paddle/fluid/framework/ir/map_matmul_to_mul_pass.cc

2021-10-25 19:54:03 Auto-merging paddle/fluid/framework/ir/graph_pattern_detector.h

2021-10-25 19:54:03 Auto-merging paddle/fluid/framework/ir/graph_pattern_detector.cc

2021-10-25 19:54:03 Auto-merging paddle/fluid/framework/ir/fc_fuse_pass.cc

2021-10-25 19:54:03 Auto-merging cmake/external/lite.cmake

2021-10-25 19:54:03 CONFLICT (content): Merge conflict in cmake/external/lite.cmake

2021-10-25 19:54:03 Auto-merging cmake/external/lapack.cmake

2021-10-25 19:54:03 CONFLICT (add/add): Merge conflict in cmake/external/lapack.cmake

2021-10-25 19:54:03 Automatic merge failed; fix conflicts and then commit the result.

🔹 Failed: PR-CI-Windows-22

Unknown Failed
2021-10-25 19:54:11 Auto-merging paddle/fluid/inference/lite/engine.cc

2021-10-25 19:54:11 Auto-merging paddle/fluid/inference/api/analysis_predictor_tester.cc

2021-10-25 19:54:11 Auto-merging paddle/fluid/inference/api/analysis_predictor.cc

2021-10-25 19:54:11 CONFLICT (content): Merge conflict in paddle/fluid/inference/api/analysis_predictor.cc

2021-10-25 19:54:11 Auto-merging paddle/fluid/inference/analysis/ir_passes/lite_subgraph_pass.cc

2021-10-25 19:54:11 Auto-merging paddle/fluid/inference/analysis/ir_pass_manager.cc

2021-10-25 19:54:11 CONFLICT (content): Merge conflict in paddle/fluid/inference/analysis/ir_pass_manager.cc

2021-10-25 19:54:11 Auto-merging paddle/fluid/inference/analysis/argument.h

2021-10-25 19:54:11 Auto-merging paddle/fluid/framework/ir/multihead_matmul_fuse_pass.cc

2021-10-25 19:54:11 Auto-merging paddle/fluid/framework/ir/map_matmul_to_mul_pass.cc

2021-10-25 19:54:11 Auto-merging paddle/fluid/framework/ir/graph_pattern_detector.h

2021-10-25 19:54:11 Auto-merging paddle/fluid/framework/ir/graph_pattern_detector.cc

2021-10-25 19:54:11 Auto-merging paddle/fluid/framework/ir/fc_fuse_pass.cc

2021-10-25 19:54:11 Auto-merging cmake/external/lite.cmake

2021-10-25 19:54:11 CONFLICT (content): Merge conflict in cmake/external/lite.cmake

2021-10-25 19:54:11 CONFLICT (add/add): Merge conflict in cmake/external/lapack.cmake

2021-10-25 19:54:11 Auto-merging cmake/external/lapack.cmake

2021-10-25 19:54:11 Automatic merge failed; fix conflicts and then commit the result.

2021-10-25 19:54:11 C:\Users\Administrator\Downloads\workspace\c4c05149-aefe-4bd5-b8a7-1fee691c75b1\Paddle>if 1 NEQ 0 exit /b 1

🔹 Failed: PR-CI-APPROVAL-22

Unknown Failed
2021-10-25 19:54:14 自动合并 paddle/fluid/inference/lite/engine.h

2021-10-25 19:54:14 自动合并 paddle/fluid/inference/lite/engine.cc

2021-10-25 19:54:14 自动合并 paddle/fluid/inference/api/analysis_predictor_tester.cc

2021-10-25 19:54:14 自动合并 paddle/fluid/inference/api/analysis_predictor.cc

2021-10-25 19:54:14 冲突（内容）：合并冲突于 paddle/fluid/inference/api/analysis_predictor.cc

2021-10-25 19:54:14 自动合并 paddle/fluid/inference/analysis/ir_passes/lite_subgraph_pass.cc

2021-10-25 19:54:14 自动合并 paddle/fluid/inference/analysis/ir_pass_manager.cc

2021-10-25 19:54:14 冲突（内容）：合并冲突于 paddle/fluid/inference/analysis/ir_pass_manager.cc

2021-10-25 19:54:14 自动合并 paddle/fluid/inference/analysis/argument.h

2021-10-25 19:54:14 自动合并 paddle/fluid/framework/ir/multihead_matmul_fuse_pass.cc

2021-10-25 19:54:14 自动合并 paddle/fluid/framework/ir/map_matmul_to_mul_pass.cc

2021-10-25 19:54:14 自动合并 paddle/fluid/framework/ir/graph_pattern_detector.h

2021-10-25 19:54:14 自动合并 paddle/fluid/framework/ir/graph_pattern_detector.cc

2021-10-25 19:54:14 自动合并 paddle/fluid/framework/ir/fc_fuse_pass.cc

2021-10-25 19:54:14 自动合并 cmake/external/lite.cmake

2021-10-25 19:54:14 冲突（内容）：合并冲突于 cmake/external/lite.cmake

2021-10-25 19:54:14 冲突（add/add）：合并冲突于 cmake/external/lapack.cmake

2021-10-25 19:54:14 自动合并 cmake/external/lapack.cmake

2021-10-25 19:54:14 自动合并失败，修正冲突然后提交修正的结果。

🔹 Failed: PR-CI-Windows-OPENBLAS-22

Unknown Failed
2021-10-25 19:54:24 Auto-merging paddle/fluid/inference/api/analysis_predictor.cc

2021-10-25 19:54:24 CONFLICT (content): Merge conflict in paddle/fluid/inference/api/analysis_predictor.cc

2021-10-25 19:54:24 Auto-merging paddle/fluid/inference/analysis/ir_passes/lite_subgraph_pass.cc

2021-10-25 19:54:24 Auto-merging paddle/fluid/inference/analysis/ir_pass_manager.cc

2021-10-25 19:54:24 CONFLICT (content): Merge conflict in paddle/fluid/inference/analysis/ir_pass_manager.cc

2021-10-25 19:54:24 Auto-merging paddle/fluid/inference/analysis/argument.h

2021-10-25 19:54:24 Auto-merging paddle/fluid/framework/ir/multihead_matmul_fuse_pass.cc

2021-10-25 19:54:24 Auto-merging paddle/fluid/framework/ir/map_matmul_to_mul_pass.cc

2021-10-25 19:54:24 Auto-merging paddle/fluid/framework/ir/graph_pattern_detector.h

2021-10-25 19:54:24 Auto-merging paddle/fluid/framework/ir/graph_pattern_detector.cc

2021-10-25 19:54:24 Auto-merging paddle/fluid/framework/ir/fc_fuse_pass.cc

2021-10-25 19:54:24 Auto-merging cmake/external/lite.cmake

2021-10-25 19:54:24 CONFLICT (content): Merge conflict in cmake/external/lite.cmake

2021-10-25 19:54:24 CONFLICT (add/add): Merge conflict in cmake/external/lapack.cmake

2021-10-25 19:54:24 Auto-merging cmake/external/lapack.cmake

2021-10-25 19:54:24 Automatic merge failed; fix conflicts and then commit the result.

2021-10-25 19:54:24 C:\home\workspace\Paddle>if 1 NEQ 0 exit /b 1

2021-10-25 19:54:24 [INFO] start upload artifact: C:\home\workspace\Paddle\build\python\dist\.*

2021-10-25 19:54:24 [WARN] No matching file!

🔹 Failed: PR-CI-Inference-22

failed in build-docker-image job
failed in build-docker-image job

Please sign in to comment.