-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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.
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
gather function only #3191
Merged
Merged
gather function only #3191
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
0802197
gather and scatter-update added
zchen0211 2b35fca
gather modify
zchen0211 eef55ca
remodify
zchen0211 6b3e0b7
gather function with test passed
zchen0211 7e37471
modify
zchen0211 689d5ee
solve conficts
zchen0211 6159f5d
code style fix
zchen0211 d4e4ceb
fix all coding-style problems
zchen0211 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
---|---|---|
@@ -0,0 +1,117 @@ | ||
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. | ||
|
||
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 <cstring> | ||
#include "paddle/framework/ddim.h" | ||
#include "paddle/framework/tensor.h" | ||
#include "paddle/platform/place.h" | ||
|
||
/** | ||
* Return a new tensor from source tensor, gathered according to index | ||
* input[src]: type-T source Tensor | ||
* input[index]: type-int index Tensor (1-D) | ||
* return: output tensor | ||
*/ | ||
template <typename Place, typename T> | ||
Tensor* Gather(Tensor* src, Tensor* index) { | ||
// check index of shape 1-D | ||
PADDLE_ENFORCE(index->dims().size() == 1); | ||
int index_size = index->dims()[0]; | ||
|
||
// Source shape | ||
auto src_dims = src->dims(); | ||
DDim output_dims(dims_src); | ||
// Create a tensor of shape [index_size, dim_src[1:]] | ||
output_dims[0] = index_size; | ||
|
||
Tensor* New_tensor; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Tensor* New_tensor = new Tensor(); use shared_ptr maybe better |
||
float* output = nullptr; | ||
|
||
/* slice size */ | ||
int slice_size = 1; | ||
for (size_t i = 0; i < src_dims.size(); ++i) slice_size *= src_dims[i]; | ||
|
||
/* Gathering */ | ||
if (place == CPUPlace()) { | ||
// init for CPU | ||
output = New_tensor.mutable_data<T>(output_dims, CPUPlace()); | ||
CPUGather( | ||
src->data(), index->data(), slice_size, new_tensor->mutable_data()); | ||
} else { // GPU | ||
// init for GPU | ||
output = New_tensor.mutable_data<T>(output_dims, GPUPlace()); | ||
/* how to specialize device??*/ | ||
GPUGather( | ||
d, src->data(), index->data(), slice_size, new_tensor->mutable_data()); | ||
} | ||
return New_tensor; | ||
} | ||
|
||
/* Implementation of CPU copy */ | ||
template <typename T> | ||
void CPUGather(const T* params, | ||
const int* indices, | ||
const int slice_size, | ||
const int index_size, | ||
T* output) { | ||
const size_t slice_bytes = slice_size * sizeof(T); | ||
|
||
for (size_t i = 0; i < index_size; ++i) { | ||
int index_ = indices[i]; | ||
/* copy src[index_] to output[i] */ | ||
memcpy( | ||
output + i * slice_bytes, params + index_ * slice_bytes, slice_bytes); | ||
} | ||
} | ||
|
||
/* Implementation of GPU copy: | ||
I suppose the GPUDevice& d, contains gpu_id and thread_id | ||
d = cuda_stream(gpu_id_, stream_id_); | ||
*/ | ||
template <typename T> | ||
void GPUGather(const GPUDevice& d, | ||
const T* src, | ||
const int* index, | ||
const int slice_size, | ||
const int index_size, | ||
T* output) { | ||
int block_count = slice_size * index_size; | ||
int thread_per_block = 1024; | ||
|
||
GatherOpKernel<T><<<block_count, thread_per_block, 0, d.stream()>>>( | ||
src, index, output, slice_size, indices_size, slice_size, out_size); | ||
} | ||
|
||
template <typename T> | ||
__global__ void GatherOpKernel(const T* params, | ||
const int* indices, | ||
T* out, | ||
int64 indices_size, | ||
int64 slice_size, | ||
int64 out_size) { | ||
/* I suppose we have the following macro, | ||
which I strongly suggest that we should put in cuda: | ||
#define CUDA_1D_KERNEL_LOOP(i, n) \ | ||
for (int i = blockIdx.x * blockDim.x + threadIdx.x; i < n; \ | ||
i += blockDim.x * gridDim.x) | ||
*/ | ||
CUDA_1D_KERNEL_LOOP(i, out_size) { | ||
int indices_i = i / slice_size; | ||
int slice_i = i - indices_i * slice_size; // offset inside the slice | ||
int gather_i = indices[indices_i]; | ||
int params_i = gather_i * slice_size + slice_i; | ||
out[i] = *(params + params_i); | ||
} | ||
} |
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,116 @@ | ||
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. | ||
|
||
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 <cstring> | ||
#include "paddle/framework/ddim.h" | ||
#include "paddle/framework/tensor.h" | ||
#include "paddle/platform/place.h" | ||
|
||
/** | ||
* Return a updated tensor from source tensor, scattered according to index: | ||
* dst[i] += src[index[i]] | ||
* input[src]: type-T source Tensor | ||
* input[index]: type-int index Tensor (1-D) | ||
* return: output tensor | ||
*/ | ||
template <typename Place, typename T> | ||
void ScatterUpdate(Tensor* src, Tensor* dst, Tensor* index) { | ||
// Source shape | ||
auto src_dims = src->dims(); | ||
auto dst_dims = dst->dims(); | ||
DDim output_dims(dims_src); | ||
|
||
// check src shape and dst shape should match | ||
for (size_t i = 1; i < src_dims.size(); i++) | ||
PADDLE_ENFORCE(src_dims[i] == dst_dims[i]); | ||
|
||
int index_size = index->dims()[0]; | ||
|
||
/* slice size */ | ||
int slice_size = 1; | ||
for (size_t i = 0; i < src_dims.size(); ++i) slice_size *= src_dims[i]; | ||
|
||
if (place == CPUPlace()) { | ||
// init | ||
output = new_tensor.mutable_data<T>(output_dims, CPUPlace()); | ||
CPUScatterUpdate( | ||
src->data(), index->data(), slice_size, new_tensor->mutable_data()); | ||
|
||
} else { // GPU | ||
// init | ||
output = new_tensor.mutable_data<T>(output_dims, GPUPlace()); | ||
/* how to specialize device??*/ | ||
GPUScatterUpdate( | ||
d, src->data(), index->data(), slice_size, new_tensor->mutable_data()); | ||
} | ||
} | ||
|
||
/* Implementation of CPU copy */ | ||
template <typename T> | ||
void CPUScatterUpdate(const T* src, | ||
const int* index, | ||
const int slice_size, | ||
const int index_size, | ||
T* output) { | ||
// const size_t slice_bytes = slice_size * sizeof(T); | ||
|
||
for (size_t i = 0; i < index_size; ++i) { | ||
int index_ = index[i]; | ||
math::vAdd<T>(slice_size, | ||
src + index_ * slice_bytes, | ||
output + i * slice_bytes, | ||
output + i * slice_bytes); | ||
} | ||
} | ||
|
||
/* Implementation of GPU scatter: | ||
I suppose the GPUDevice& d, contains gpu_id and thread_id | ||
d = cuda_stream(gpu_id_, stream_id_); | ||
*/ | ||
template <typename T> | ||
void GPUScatterUpdate(const GPUDevice& d, | ||
const T* src, | ||
const int* index, | ||
const int slice_size, | ||
const int index_size, | ||
T* output) { | ||
int block_count = slice_size * index_size; | ||
int thread_per_block = 1024; | ||
|
||
ScatterOpKernel<T><<<block_count, thread_per_block, 0, d.stream()>>>( | ||
src, index, output, slice_size, indices_size, slice_size, out_size); | ||
} | ||
|
||
template <typename T> | ||
__global__ void ScatterOpKernel(const T* params, | ||
const int* indices, | ||
T* out, | ||
int64 indices_size, | ||
int64 slice_size, | ||
int64 out_size) { | ||
/* I suppose we have the following macro, | ||
which I strongly suggest that we should put in cuda: | ||
#define CUDA_1D_KERNEL_LOOP(i, n) \ | ||
for (int i = blockIdx.x * blockDim.x + threadIdx.x; i < n; \ | ||
i += blockDim.x * gridDim.x) | ||
*/ | ||
CUDA_1D_KERNEL_LOOP(i, out_size) { | ||
int indices_i = i / slice_size; | ||
int slice_i = i - indices_i * slice_size; // offset inside the slice | ||
int scatter_i = indices[indices_i]; | ||
int params_i = scatter_i * slice_size + slice_i; | ||
out[i] += *(params + params_i); | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dims_src ==> src_dims ?