Skip to content

Unify the data type of tensor shape #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiangjiajun merged 1 commit into from
Aug 8, 2022
Merged

Unify the data type of tensor shape #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions csrcs/fastdeploy/core/fd_tensor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ const void* FDTensor::Data() const {
return data.data();
}

void FDTensor::SetExternalData(const std::vector<int>& new_shape,
void FDTensor::SetExternalData(const std::vector<int64_t>& new_shape,
const FDDataType& data_type, void* data_buffer) {
dtype = data_type;
shape.assign(new_shape.begin(), new_shape.end());
external_data_ptr = data_buffer;
}

void FDTensor::Allocate(const std::vector<int>& new_shape,
void FDTensor::Allocate(const std::vector<int64_t>& new_shape,
const FDDataType& data_type,
const std::string& tensor_name) {
dtype = data_type;
Expand Down
5 changes: 3 additions & 2 deletions csrcs/fastdeploy/core/fd_tensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,14 @@ struct FASTDEPLOY_DECL FDTensor {
// Set user memory buffer for Tensor, the memory is managed by
// the user it self, but the Tensor will share the memory with user
// So take care with the user buffer
void SetExternalData(const std::vector<int>& new_shape,
void SetExternalData(const std::vector<int64_t>& new_shape,
const FDDataType& data_type, void* data_buffer);

// Initialize Tensor
// Include setting attribute for tensor
// and allocate cpu memory buffer
void Allocate(const std::vector<int>& new_shape, const FDDataType& data_type,
void Allocate(const std::vector<int64_t>& new_shape,
const FDDataType& data_type,
const std::string& tensor_name = "");

// Total size of tensor memory buffer in bytes
Expand Down
17 changes: 5 additions & 12 deletions examples/text/ernie_tokencls.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,8 @@ void Softmax(const fastdeploy::FDTensor& input, fastdeploy::FDTensor* output) {
}
};

std::vector<int32_t> output_shape;
for (int i = 0; i < input.shape.size(); ++i) {
output_shape.push_back(input.shape[i]);
}
output->Allocate(output_shape, input.dtype);
int label_num = output_shape.back();
output->Allocate(input.shape, input.dtype);
int label_num = output->shape.back();
int batch_size = input.Numel() / label_num;
int offset = 0;
const T* input_ptr = reinterpret_cast<const T*>(input.Data());
Expand All @@ -73,11 +69,8 @@ void Softmax(const fastdeploy::FDTensor& input, fastdeploy::FDTensor* output) {
// Only useful for axis = -1
template <typename T>
void Max(const fastdeploy::FDTensor& input, fastdeploy::FDTensor* output) {
std::vector<int32_t> output_shape;
for (int i = 0; i < input.shape.size() - 1; ++i) {
output_shape.push_back(input.shape[i]);
}
output_shape.push_back(1);
auto output_shape = input.shape;
output_shape.back() = 1;
output->Allocate(output_shape, input.dtype);
int batch_size = output->Numel();
int label_num = input.shape.back();
Expand Down Expand Up @@ -229,4 +222,4 @@ int main() {
}
best_path.PrintInfo();
return 0;
}
}