【NPU】Merge ascend GE&distributed code by 0208 from ascendrc#31957
Merged
frankwhzhang merged 54 commits intoPaddlePaddle:developfrom Apr 7, 2021
Merged
【NPU】Merge ascend GE&distributed code by 0208 from ascendrc#31957frankwhzhang merged 54 commits intoPaddlePaddle:developfrom
frankwhzhang merged 54 commits intoPaddlePaddle:developfrom
Conversation
Fix compilcation on CANN20.1 and older
Add distribution supported
Build praser for Hcom* operators
Pass device_ids info from launch to trainer
Add Hccl program group
Add startup bash files of test_ascend_group
cleanup test_ascend_group.py
…30658) [Feature] Build parser to support distributed training
fix compilation on ascend-20.1
Dev/fix ascend string
code style
Merge ascend_optimizer and ascend_parser.
…squeeze], fix cast op bug (PaddlePaddle#30797) Ascendrc add converted op : [range/equal/range/uniform_random/expand/squeeze], fix cast op bug
Add paddle ascend distribution training supported
Destroy session first.
|
Thanks for your contribution! |
zhiqiu
reviewed
Apr 7, 2021
cmake/external/threadpool.cmake
Outdated
| SET(THREADPOOL_PREFIX_DIR ${THIRD_PARTY_PATH}/threadpool) | ||
| SET(THREADPOOL_SOURCE_DIR ${THIRD_PARTY_PATH}/threadpool/src/extern_threadpool) | ||
| SET(THREADPOOL_REPOSITORY ${GIT_URL}/progschj/ThreadPool.git) | ||
| SET(THREADPOOL_REPOSITORY https://gitee.com/tianjianhe/ThreadPool.git) |
cmake/external/protobuf.cmake
Outdated
| ENDFUNCTION() | ||
|
|
||
| SET(PROTOBUF_VERSION 3.1.0) | ||
| SET(PROTOBUF_VERSION 3.8.0) |
cmake/external/gloo.cmake
Outdated
| CONFIGURE_COMMAND "" | ||
| BUILD_COMMAND mkdir -p ${GLOO_SOURCE_DIR}/build | ||
| && cd ${GLOO_SOURCE_DIR}/build && cmake .. && make | ||
| && cd ${GLOO_SOURCE_DIR}/build && cmake .. -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} && make |
Contributor
There was a problem hiding this comment.
Better use if(WITH_ASCEND) macro to guard the changes. Do not affect the original logic.
Comment on lines
+24
to
+25
| # in case of low internet speed | ||
| #set(WARPCTC_REPOSITORY https://gitee.com/tianjianhe/warp-ctc.git) |
Contributor
Author
There was a problem hiding this comment.
for ascend in low speed
cmake/external/warpctc.cmake
Outdated
Comment on lines
+58
to
+63
| -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} | ||
| -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} | ||
| -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} | ||
| "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}" | ||
| -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} | ||
| -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} |
Comment on lines
+1
to
+10
| /* Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| 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 | ||
| limitations under the License. */ |
Comment on lines
+570
to
+573
| #ifdef PADDLE_WITH_ASCEND | ||
| auto ascend_ptr = paddle::framework::AscendInstance::GetInstance(); | ||
| ascend_ptr->InitGEForUT(); | ||
| #endif |
Contributor
There was a problem hiding this comment.
Not important to this PR, but I wonder why need this?
| @@ -105,16 +171,16 @@ def update_output(self, geop_list, index_list): | |||
| self.parser_name, len(index_list), output_num) | |||
| for output_id in range(output_num): | |||
| arguments = self.op.output(self.op.output_names[output_id]) | |||
| print("%d argument: %s" % (output_id, str(arguments))) | |||
| #print("%d argument: %s" % (output_id, str(arguments))) | |||
Comment on lines
+182
to
+183
| #print("assgin index_list[%d][%d] to %s" % | ||
| # (output_id, i, arguments[i])) |
Comment on lines
+808
to
+811
| #else: | ||
| # print( | ||
| # "self.op.output('Out')[0]: %s is not persistable in fill_constant" | ||
| # % (self.op.output('Out')[0])) |
XieYunshen
approved these changes
Apr 7, 2021
fuyinno4
approved these changes
Apr 7, 2021
raindrops2sea
approved these changes
Apr 7, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR types
New features
PR changes
Others
Describe