forked from PaddlePaddle/Paddle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
… rewrite_allocation test=develop
- Loading branch information
Showing
160 changed files
with
3,887 additions
and
1,294 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,3 +30,4 @@ build_* | |
| # clion workspace. | ||
| cmake-build-* | ||
| paddle/fluid/operators/distributed/send_recv.proto | ||
| model_test | ||
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| INCLUDE(ExternalProject) | ||
|
|
||
| set(XXHASH_SOURCE_DIR ${THIRD_PARTY_PATH}/xxhash) | ||
| set(XXHASH_INSTALL_DIR ${THIRD_PARTY_PATH}/install/xxhash) | ||
| set(XXHASH_INCLUDE_DIR "${XXHASH_INSTALL_DIR}/include") | ||
|
|
||
| IF(WITH_STATIC_LIB) | ||
| SET(BUILD_CMD make lib) | ||
| ELSE() | ||
| SET(BUILD_CMD sed -i "s/-Wstrict-prototypes -Wundef/-Wstrict-prototypes -Wundef -fPIC/g" ${XXHASH_SOURCE_DIR}/src/extern_xxhash/Makefile && make lib) | ||
| ENDIF() | ||
|
|
||
| ExternalProject_Add( | ||
| extern_xxhash | ||
| ${EXTERNAL_PROJECT_LOG_ARGS} | ||
| GIT_REPOSITORY "https://github.com/Cyan4973/xxHash" | ||
| GIT_TAG "v0.6.5" | ||
| PREFIX ${XXHASH_SOURCE_DIR} | ||
| DOWNLOAD_NAME "xxhash" | ||
| UPDATE_COMMAND "" | ||
| CONFIGURE_COMMAND "" | ||
| BUILD_IN_SOURCE 1 | ||
| PATCH_COMMAND | ||
| BUILD_COMMAND ${BUILD_CMD} | ||
| INSTALL_COMMAND export PREFIX=${XXHASH_INSTALL_DIR}/ && make install | ||
| TEST_COMMAND "" | ||
| ) | ||
|
|
||
| set(XXHASH_LIBRARIES "${XXHASH_INSTALL_DIR}/lib/libxxhash.a") | ||
| INCLUDE_DIRECTORIES(${XXHASH_INCLUDE_DIR}) | ||
|
|
||
| add_library(xxhash STATIC IMPORTED GLOBAL) | ||
| set_property(TARGET xxhash PROPERTY IMPORTED_LOCATION ${XXHASH_LIBRARIES}) | ||
| include_directories(${XXHASH_INCLUDE_DIR}) | ||
| add_dependencies(xxhash extern_xxhash) | ||
|
|
||
| LIST(APPEND external_project_dependencies xxhash) | ||
|
|
||
| IF(WITH_C_API) | ||
| INSTALL(DIRECTORY ${XXHASH_INCLUDE_DIR} DESTINATION third_party/xxhash) | ||
| IF(ANDROID) | ||
| INSTALL(FILES ${XXHASH_LIBRARIES} DESTINATION third_party/xxhash/lib/${ANDROID_ABI}) | ||
| ELSE() | ||
| INSTALL(FILES ${XXHASH_LIBRARIES} DESTINATION third_party/xxhash/lib) | ||
| ENDIF() | ||
| ENDIF() |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
55 changes: 55 additions & 0 deletions
55
paddle/fluid/framework/details/fused_broadcast_op_handle.cc
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // Copyright (c) 2018 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. | ||
|
|
||
| #include "paddle/fluid/framework/details/fused_broadcast_op_handle.h" | ||
| #include "paddle/fluid/framework/details/container_cast.h" | ||
| #include "paddle/fluid/framework/details/variable_visitor.h" | ||
| #include "paddle/fluid/platform/profiler.h" | ||
|
|
||
| namespace paddle { | ||
| namespace framework { | ||
| namespace details { | ||
|
|
||
| void FusedBroadcastOpHandle::RunImpl() { | ||
| platform::RecordEvent record_event(Name(), dev_ctxes_.begin()->second); | ||
|
|
||
| if (places_.size() == 1UL) return; | ||
|
|
||
| auto in_var_handles = DynamicCast<VarHandle>(inputs_); | ||
| auto out_var_handles = DynamicCast<VarHandle>(outputs_); | ||
|
|
||
| WaitInputVarGenerated(); | ||
|
|
||
| std::vector<const Scope *> var_scopes; | ||
| for (auto *s : local_scopes_) { | ||
| var_scopes.emplace_back(s->FindVar(kLocalExecScopeName)->Get<Scope *>()); | ||
| } | ||
|
|
||
| size_t place_num = places_.size(); | ||
| PADDLE_ENFORCE_EQ(in_var_handles.size() * place_num, out_var_handles.size()); | ||
|
|
||
| for (size_t i = 0; i < in_var_handles.size(); ++i) { | ||
| BroadcastOneVar( | ||
| *in_var_handles[i], | ||
| std::vector<VarHandle *>(out_var_handles.begin() + i * place_num, | ||
| out_var_handles.begin() + (i + 1) * place_num), | ||
| var_scopes); | ||
| } | ||
| } | ||
|
|
||
| std::string FusedBroadcastOpHandle::Name() const { return "fused_broadcast"; } | ||
|
|
||
| } // namespace details | ||
| } // namespace framework | ||
| } // namespace paddle |
Oops, something went wrong.