Commit 202dbf47 authored by Shucai Xiao's avatar Shucai Xiao
Browse files

clang format

parent 0dac827c
...@@ -34,7 +34,8 @@ argument logsoftmax(hipStream_t stream, ...@@ -34,7 +34,8 @@ argument logsoftmax(hipStream_t stream,
// opt 1, load all data to lds then use the same approach as // opt 1, load all data to lds then use the same approach as
// the current optimization // the current optimization
const size_t block_size = 1024; const size_t block_size = 1024;
launch(stream, batch_shape.elements() * block_size, block_size) ([=] (auto idx) __device__ { launch(
stream, batch_shape.elements() * block_size, block_size)([=](auto idx) __device__ {
size_t thr_idx = idx.local; size_t thr_idx = idx.local;
size_t blk_idx = idx.group; size_t blk_idx = idx.group;
// using type = typename decltype(input)::value_type; // using type = typename decltype(input)::value_type;
...@@ -48,7 +49,7 @@ argument logsoftmax(hipStream_t stream, ...@@ -48,7 +49,7 @@ argument logsoftmax(hipStream_t stream,
// load data to lds and compute the batch max // load data to lds and compute the batch max
size_t item_num = num_in_batch; size_t item_num = num_in_batch;
lds_data[block_size] = input_ptr[0]; lds_data[block_size] = input_ptr[0];
for (size_t i = thr_idx; i < num_in_batch; i += block_size) for(size_t i = thr_idx; i < num_in_batch; i += block_size)
{ {
data_idx[axis] = i; data_idx[axis] = i;
lds_data[i] = input_ptr[desc_data.linear(data_idx)]; lds_data[i] = input_ptr[desc_data.linear(data_idx)];
...@@ -56,12 +57,13 @@ argument logsoftmax(hipStream_t stream, ...@@ -56,12 +57,13 @@ argument logsoftmax(hipStream_t stream,
__syncthreads(); __syncthreads();
// use thread 0 for batch_max // use thread 0 for batch_max
if (thr_idx == 0) if(thr_idx == 0)
{ {
auto size = (item_num > block_size) ? block_size : item_num; auto size = (item_num > block_size) ? block_size : item_num;
for (size_t j = 0; j < size; j++) for(size_t j = 0; j < size; j++)
{ {
lds_data[block_size] = ::max(to_hip_type(lds_data[block_size]), to_hip_type(lds_data[j])); lds_data[block_size] =
::max(to_hip_type(lds_data[block_size]), to_hip_type(lds_data[j]));
} }
item_num -= block_size; item_num -= block_size;
} }
...@@ -71,7 +73,7 @@ argument logsoftmax(hipStream_t stream, ...@@ -71,7 +73,7 @@ argument logsoftmax(hipStream_t stream,
const size_t block_size1 = block_size + 1; const size_t block_size1 = block_size + 1;
lds_data[block_size1] = 0; lds_data[block_size1] = 0;
item_num = num_in_batch; item_num = num_in_batch;
for (size_t i = thr_idx; i < num_in_batch; i += block_size) for(size_t i = thr_idx; i < num_in_batch; i += block_size)
{ {
data_idx[axis] = i; data_idx[axis] = i;
lds_data[i] = input_ptr[desc_data.linear(data_idx)]; lds_data[i] = input_ptr[desc_data.linear(data_idx)];
...@@ -79,21 +81,23 @@ argument logsoftmax(hipStream_t stream, ...@@ -79,21 +81,23 @@ argument logsoftmax(hipStream_t stream,
__syncthreads(); __syncthreads();
// use thread 0 for batch_max // use thread 0 for batch_max
if (thr_idx == 0) if(thr_idx == 0)
{ {
auto size = (item_num > block_size) ? block_size : item_num; auto size = (item_num > block_size) ? block_size : item_num;
for (size_t j = 0; j < size; j++) for(size_t j = 0; j < size; j++)
{ {
lds_data[block_size1] += ::exp(to_hip_type(lds_data[j] - lds_data[block_size])); lds_data[block_size1] +=
::exp(to_hip_type(lds_data[j] - lds_data[block_size]));
} }
item_num -= block_size; item_num -= block_size;
} }
__syncthreads(); __syncthreads();
} }
auto log_batch_sum = ::log(to_hip_type(lds_data[block_size1])) + lds_data[block_size]; auto log_batch_sum =
::log(to_hip_type(lds_data[block_size1])) + lds_data[block_size];
item_num = num_in_batch; item_num = num_in_batch;
for (size_t i = thr_idx; i < num_in_batch; i += block_size) for(size_t i = thr_idx; i < num_in_batch; i += block_size)
{ {
data_idx[axis] = i; data_idx[axis] = i;
size_t index = desc_data.linear(data_idx); size_t index = desc_data.linear(data_idx);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment