Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into feature/fix_ninja_build
yuyang18
7 years ago
commit
dfbe06ccab
@ -0,0 +1,101 @@
|
||||
// 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/data_type.h"
|
||||
#include <stdint.h>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
|
||||
struct DataTypeMap {
|
||||
std::unordered_map<std::type_index, proto::VarType::Type> cpp_to_proto_;
|
||||
std::unordered_map<int, std::type_index> proto_to_cpp_;
|
||||
std::unordered_map<int, std::string> proto_to_str_;
|
||||
std::unordered_map<std::type_index, size_t> cpp_to_size_;
|
||||
};
|
||||
|
||||
static DataTypeMap* InitDataTypeMap();
|
||||
static DataTypeMap& gDataTypeMap() {
|
||||
static DataTypeMap* g_data_type_map_ = InitDataTypeMap();
|
||||
return *g_data_type_map_;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static inline void RegisterType(DataTypeMap* map,
|
||||
proto::VarType::Type proto_type,
|
||||
const std::string& name) {
|
||||
map->proto_to_cpp_.emplace(static_cast<int>(proto_type), typeid(T));
|
||||
map->cpp_to_proto_.emplace(typeid(T), proto_type);
|
||||
map->proto_to_str_.emplace(static_cast<int>(proto_type), name);
|
||||
map->cpp_to_size_.emplace(typeid(T), sizeof(T));
|
||||
}
|
||||
|
||||
static DataTypeMap* InitDataTypeMap() {
|
||||
auto retv = new DataTypeMap();
|
||||
|
||||
#define RegType(cc_type, proto_type) \
|
||||
RegisterType<cc_type>(retv, proto_type, #cc_type)
|
||||
|
||||
// NOTE: Add your customize type here.
|
||||
RegType(platform::float16, proto::VarType::FP16);
|
||||
RegType(float, proto::VarType::FP32);
|
||||
RegType(double, proto::VarType::FP64);
|
||||
RegType(int, proto::VarType::INT32);
|
||||
RegType(int64_t, proto::VarType::INT64);
|
||||
RegType(bool, proto::VarType::BOOL);
|
||||
RegType(size_t, proto::VarType::SIZE_T);
|
||||
RegType(int16_t, proto::VarType::INT16);
|
||||
|
||||
#undef RegType
|
||||
return retv;
|
||||
}
|
||||
|
||||
proto::VarType::Type ToDataType(std::type_index type) {
|
||||
auto it = gDataTypeMap().cpp_to_proto_.find(type);
|
||||
if (it != gDataTypeMap().cpp_to_proto_.end()) {
|
||||
return it->second;
|
||||
}
|
||||
PADDLE_THROW("Not support %s as tensor type", type.name());
|
||||
}
|
||||
|
||||
std::type_index ToTypeIndex(proto::VarType::Type type) {
|
||||
auto it = gDataTypeMap().proto_to_cpp_.find(static_cast<int>(type));
|
||||
if (it != gDataTypeMap().proto_to_cpp_.end()) {
|
||||
return it->second;
|
||||
}
|
||||
PADDLE_THROW("Not support proto::VarType::Type(%d) as tensor type",
|
||||
static_cast<int>(type));
|
||||
}
|
||||
|
||||
std::string DataTypeToString(const proto::VarType::Type type) {
|
||||
auto it = gDataTypeMap().proto_to_str_.find(static_cast<int>(type));
|
||||
if (it != gDataTypeMap().proto_to_str_.end()) {
|
||||
return it->second;
|
||||
}
|
||||
PADDLE_THROW("Not support proto::VarType::Type(%d) as tensor type",
|
||||
static_cast<int>(type));
|
||||
}
|
||||
|
||||
size_t SizeOfType(std::type_index type) {
|
||||
auto it = gDataTypeMap().cpp_to_size_.find(type);
|
||||
if (it != gDataTypeMap().cpp_to_size_.end()) {
|
||||
return it->second;
|
||||
}
|
||||
PADDLE_THROW("Not support %s as tensor type", type.name());
|
||||
}
|
||||
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,36 @@
|
||||
// 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
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace details {
|
||||
|
||||
struct BuildStrategy {
|
||||
enum class ReduceStrategy { kAllReduce = 0, kReduce = 1 };
|
||||
|
||||
enum class GradientScaleStrategy {
|
||||
kCoeffNumDevice = 0,
|
||||
kOne = 1,
|
||||
kCustomized = 2,
|
||||
};
|
||||
|
||||
ReduceStrategy reduce_{ReduceStrategy::kAllReduce};
|
||||
GradientScaleStrategy gradient_scale_{GradientScaleStrategy::kCoeffNumDevice};
|
||||
};
|
||||
|
||||
} // namespace details
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,29 @@
|
||||
// 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
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace details {
|
||||
|
||||
struct ExecutionStrategy {
|
||||
size_t num_threads_{0};
|
||||
bool use_event_{true};
|
||||
bool allow_op_delay_{false};
|
||||
};
|
||||
|
||||
} // namespace details
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -1,5 +1,4 @@
|
||||
nv_library(tensorrt_engine SRCS engine.cc DEPS framework_proto)
|
||||
nv_test(test_tensorrt SRCS test_tensorrt.cc DEPS dynload_cuda device_context dynamic_loader)
|
||||
nv_test(test_tensorrt_engine SRCS test_engine.cc DEPS dynload_cuda tensorrt_engine)
|
||||
|
||||
add_subdirectory(convert)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
nv_test(test_op_converter SRCS test_op_converter.cc mul_op.cc conv2d_op.cc op_converter.h DEPS ${FLUID_CORE_MODULES})
|
||||
nv_test(test_trt_activation_op SRCS test_activation_op.cc activation_op.cc
|
||||
nv_test(test_op_converter SRCS test_op_converter.cc mul_op.cc conv2d_op.cc DEPS ${FLUID_CORE_MODULES})
|
||||
nv_test(test_trt_activation_op SRCS test_activation_op.cc activation_op.cc io_converter.cc
|
||||
DEPS ${FLUID_CORE_MODULES} activation_op tensorrt_engine)
|
||||
nv_test(test_io_converter SRCS test_io_converter.cc io_converter.cc DEPS dynload_cuda dynamic_loader lod_tensor)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue