Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into feature/polish_reshape_op
Yu Yang
7 years ago
commit
daa5011722
@ -1,67 +0,0 @@
|
|||||||
# Copyright (c) 2016 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.
|
|
||||||
|
|
||||||
if(NOT WITH_GPU)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include(ExternalProject)
|
|
||||||
|
|
||||||
set(NCCL_SOURCE_DIR ${THIRD_PARTY_PATH}/nccl)
|
|
||||||
|
|
||||||
include_directories(${NCCL_SOURCE_DIR}/src/extern_nccl/src)
|
|
||||||
|
|
||||||
if(WITH_DSO)
|
|
||||||
# If we use DSO, we do not build nccl, just download the dependencies
|
|
||||||
set(NCCL_BUILD_COMMAND "")
|
|
||||||
set(NCCL_INSTALL_COMMAND "")
|
|
||||||
set(NCCL_INSTALL_DIR "")
|
|
||||||
else()
|
|
||||||
# otherwise, we build nccl and link it.
|
|
||||||
set(NCCL_INSTALL_DIR ${THIRD_PARTY_PATH}/install/nccl)
|
|
||||||
# Note: cuda 8.0 is needed to make nccl
|
|
||||||
# When cuda is not installed on the system directory, need to set CUDA_HOME to your cuda root
|
|
||||||
set(NCCL_BUILD_COMMAND "make -j 8")
|
|
||||||
set(NCCL_INSTALL_COMMAND "make install PREFIX=${NCCL_INSTALL_DIR}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
ExternalProject_Add(
|
|
||||||
extern_nccl
|
|
||||||
${EXTERNAL_PROJECT_LOG_ARGS}
|
|
||||||
GIT_REPOSITORY "https://github.com/NVIDIA/nccl.git"
|
|
||||||
GIT_TAG "v1.3.4-1"
|
|
||||||
PREFIX "${NCCL_SOURCE_DIR}"
|
|
||||||
UPDATE_COMMAND ""
|
|
||||||
CONFIGURE_COMMAND ""
|
|
||||||
BUILD_COMMAND "${NCCL_BUILD_COMMAND}"
|
|
||||||
INSTALL_COMMAND "${NCCL_INSTALL_COMMAND}"
|
|
||||||
INSTALL_DIR "${NCCL_INSTALL_DIR}"
|
|
||||||
TEST_COMMAND ""
|
|
||||||
)
|
|
||||||
|
|
||||||
if(WITH_DSO)
|
|
||||||
if(${CMAKE_VERSION} VERSION_LESS "3.3.0")
|
|
||||||
set(dummyfile ${CMAKE_CURRENT_BINARY_DIR}/lib_nccl_dummy.c)
|
|
||||||
file(WRITE ${dummyfile} "const char * dummy_nccl = \"${dummyfile}\";")
|
|
||||||
add_library(nccl STATIC ${dummyfile})
|
|
||||||
else()
|
|
||||||
add_library(nccl INTERFACE)
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
add_library(nccl STATIC IMPORTED GLOBAL)
|
|
||||||
set_property(TARGET nccl PROPERTY IMPORTED_LOCATION
|
|
||||||
${NCCL_INSTALL_DIR}/lib/libnccl_static.a)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_dependencies(nccl extern_nccl)
|
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
// 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/send_op_handle.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
namespace details {
|
||||||
|
|
||||||
|
SendOpHandle::SendOpHandle(const framework::OpDesc &op_desc,
|
||||||
|
const Scope *local_scope,
|
||||||
|
const platform::Place &place)
|
||||||
|
: op_(framework::OpRegistry::CreateOp(op_desc)),
|
||||||
|
local_scope_(local_scope),
|
||||||
|
place_(place) {}
|
||||||
|
|
||||||
|
void SendOpHandle::RunImpl() {
|
||||||
|
// Wait input done
|
||||||
|
for (auto *in : inputs_) {
|
||||||
|
auto &p = static_cast<VarHandle *>(in)->place_;
|
||||||
|
if (in->DebugString() == "dummy") { // HACK
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
in->generated_op_->Wait(dev_ctxes_[p]);
|
||||||
|
}
|
||||||
|
op_->Run(*local_scope_, place_);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string SendOpHandle::Name() const { return "send"; }
|
||||||
|
} // namespace details
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include "paddle/fluid/framework/details/op_handle_base.h"
|
||||||
|
#include "paddle/fluid/framework/lod_tensor.h"
|
||||||
|
#include "paddle/fluid/framework/op_registry.h"
|
||||||
|
#include "paddle/fluid/framework/operator.h"
|
||||||
|
#include "paddle/fluid/framework/scope.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
namespace details {
|
||||||
|
|
||||||
|
struct SendOpHandle : public OpHandleBase {
|
||||||
|
std::unique_ptr<OperatorBase> op_;
|
||||||
|
const Scope* local_scope_;
|
||||||
|
const platform::Place& place_;
|
||||||
|
|
||||||
|
SendOpHandle(const framework::OpDesc& op_desc, const Scope* local_scope,
|
||||||
|
const platform::Place& place);
|
||||||
|
|
||||||
|
std::string Name() const override;
|
||||||
|
|
||||||
|
// Delay and buffer nccl_all_reduce together can significantly increase
|
||||||
|
// performance. Disable this feature by returning false.
|
||||||
|
bool IsMultiDeviceTransfer() override { return false; };
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void RunImpl() override;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace details
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue