Commit c42aded1 authored by turneram's avatar turneram
Browse files

Formatting

parent 961cf059
...@@ -85,8 +85,8 @@ struct ck_elementwise_compiler : compiler<ck_elementwise_compiler> ...@@ -85,8 +85,8 @@ struct ck_elementwise_compiler : compiler<ck_elementwise_compiler>
hip_compile_options options; hip_compile_options options;
options.inputs = inputs; options.inputs = inputs;
options.output = inputs.back(); options.output = inputs.back();
//options.virtual_inputs = reduce_dims(inputs); // options.virtual_inputs = reduce_dims(inputs);
//std::cout << options.virtual_inputs << std::endl; // std::cout << options.virtual_inputs << std::endl;
options.params = "-Wno-float-equal"; options.params = "-Wno-float-equal";
// auto axis = find_fast_axis(options.virtual_inputs); // auto axis = find_fast_axis(options.virtual_inputs);
// auto vec = vectorize::elements(axis, options.virtual_inputs); // auto vec = vectorize::elements(axis, options.virtual_inputs);
......
...@@ -95,7 +95,7 @@ template <ck::index_t ndim> ...@@ -95,7 +95,7 @@ template <ck::index_t ndim>
struct CKBinaryElementwise2 struct CKBinaryElementwise2
{ {
template <class Desc_M> template <class Desc_M>
/* constexpr */__device__ auto PadDescriptor_M_1d(Desc_M desc_m) /* constexpr */ __device__ auto PadDescriptor_M_1d(Desc_M desc_m)
{ {
auto gridSize = 72; auto gridSize = 72;
auto blockSize = 1024; auto blockSize = 1024;
...@@ -112,12 +112,16 @@ struct CKBinaryElementwise2 ...@@ -112,12 +112,16 @@ struct CKBinaryElementwise2
} }
template <class L, class S> template <class L, class S>
/* constexpr */__device__ auto MakeDescriptor_M(const L& lengths, const S& strides) /* constexpr */ __device__ auto MakeDescriptor_M(const L& lengths, const S& strides)
{ {
auto tupleOfShape = generate_tuple( auto tupleOfShape = generate_tuple(
[&](auto I) { return static_cast<ck::index_t>(lengths[I]); }, ck::Number<ndim>{}); [&](auto I) { return static_cast<ck::index_t>(lengths[I]); }, ck::Number<ndim>{});
auto tupleOfStride = generate_tuple( auto tupleOfStride = generate_tuple(
[&](auto I) { printf ("Stride %i: %i\n", int(I), int(strides[I])); return static_cast<ck::index_t>(strides[I]); }, ck::Number<ndim>{}); [&](auto I) {
printf("Stride %i: %i\n", int(I), int(strides[I]));
return static_cast<ck::index_t>(strides[I]);
},
ck::Number<ndim>{});
const auto desc = make_naive_tensor_descriptor(tupleOfShape, tupleOfStride); const auto desc = make_naive_tensor_descriptor(tupleOfShape, tupleOfStride);
// merge nd to 1d desc - [s0 * s1 * ...] // merge nd to 1d desc - [s0 * s1 * ...]
if constexpr(ndim > 1) if constexpr(ndim > 1)
...@@ -166,10 +170,10 @@ struct Div ...@@ -166,10 +170,10 @@ struct Div
template <class T, class U, class V> template <class T, class U, class V>
__device__ void ck_elementwise(const T& a_t, const U& b_t, const V& c_t) __device__ void ck_elementwise(const T& a_t, const U& b_t, const V& c_t)
{ {
//auto idx = make_index(); // auto idx = make_index();
constexpr auto a_lens = get_shape_c<T>{}.lens; constexpr auto a_lens = get_shape_c<T>{}.lens;
constexpr auto a_strides = get_shape_c<T>{}.strides; constexpr auto a_strides = get_shape_c<T>{}.strides;
constexpr ck::index_t a_ndim = a_lens.size(); //decltype(a_lens.size()){}; constexpr ck::index_t a_ndim = a_lens.size(); // decltype(a_lens.size()){};
// if (idx.global == 0) // if (idx.global == 0)
// printf("a_ndim: %i\n", int(a_ndim)); // printf("a_ndim: %i\n", int(a_ndim));
auto a_bin_op = CKBinaryElementwise<a_ndim>{}; auto a_bin_op = CKBinaryElementwise<a_ndim>{};
...@@ -177,7 +181,7 @@ __device__ void ck_elementwise(const T& a_t, const U& b_t, const V& c_t) ...@@ -177,7 +181,7 @@ __device__ void ck_elementwise(const T& a_t, const U& b_t, const V& c_t)
constexpr auto b_lens = get_shape_c<U>{}.lens; constexpr auto b_lens = get_shape_c<U>{}.lens;
constexpr auto b_strides = get_shape_c<U>{}.strides; constexpr auto b_strides = get_shape_c<U>{}.strides;
constexpr ck::index_t b_ndim = b_lens.size(); //decltype(b_lens.size()){}; constexpr ck::index_t b_ndim = b_lens.size(); // decltype(b_lens.size()){};
// if (idx.global == 0) // if (idx.global == 0)
// printf("b_ndim: %i\n", int(b_ndim)); // printf("b_ndim: %i\n", int(b_ndim));
auto b_bin_op = CKBinaryElementwise<b_ndim>{}; auto b_bin_op = CKBinaryElementwise<b_ndim>{};
...@@ -185,7 +189,7 @@ __device__ void ck_elementwise(const T& a_t, const U& b_t, const V& c_t) ...@@ -185,7 +189,7 @@ __device__ void ck_elementwise(const T& a_t, const U& b_t, const V& c_t)
constexpr auto c_lens = get_shape_c<V>{}.lens; constexpr auto c_lens = get_shape_c<V>{}.lens;
constexpr auto c_strides = get_shape_c<V>{}.strides; constexpr auto c_strides = get_shape_c<V>{}.strides;
constexpr ck::index_t c_ndim = c_lens.size(); //decltype(c_lens.size()){}; constexpr ck::index_t c_ndim = c_lens.size(); // decltype(c_lens.size()){};
auto c_bin_op = CKBinaryElementwise<c_ndim>{}; auto c_bin_op = CKBinaryElementwise<c_ndim>{};
constexpr auto c_desc = c_bin_op.MakeDescriptor_M(c_lens, c_strides); constexpr auto c_desc = c_bin_op.MakeDescriptor_M(c_lens, c_strides);
......
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