Brutex
/
cavis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shugeo strided slice bp fix2 (#33) 

* Fixed crash and restored brocken functionality for strided slice.

* Added comments for strided_slice_bp main step.
master
shugeo 2019-11-07 12:44:02 +02:00 committed by raver119
parent 73b5a508fc
commit 679e42199a
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libnd4j/include/ops/declarable/generic/parity_ops/strided_slice.cpp
View File

@ -620,14 +620,15 @@ namespace nd4j {
// FIXME: remove this method once we get 1D vectors supported // FIXME: remove this method once we get 1D vectors supported
vectorize(input_shape); vectorize(input_shape);
REQUIRE_TRUE(_preprocess_strided_slice(&indices, &final_shape, input_shape, begin, end, strides, begin_mask, ellipsis_mask, end_mask, new_axis_mask, shrink_axis_mask, &is_identity, &is_simple_slice, &is_dim0), 0, "StridedSliceBP: shape calculation failed"); REQUIRE_TRUE(_preprocess_strided_slice(&indices, &final_shape, input_shape, begin, end, strides, begin_mask, ellipsis_mask, end_mask, new_axis_mask, shrink_axis_mask, &is_identity, &is_simple_slice, &is_dim0), 0, "StridedSliceBP: shape calculation failed");
//REQUIRE_TRUE(epsNext->isSameShape(final_shape), 0, "StridedSlice_bp: gradOut shape should be equals to output from strided_slice op.");
//Zero output array, so unused elements have 0 gradient //Zero output array, so unused elements have 0 gradient
output->nullify(); output->nullify();
std::sort(indices.begin(), indices.end()); //
if(indices.size() == 3 && (indices[1] - indices[0]) == 1) { // the first case: only for scalar gradient step
if(epsNext->lengthOf() == 1 && (indices.size() == 3 && (indices[1] - indices[0]) == 1 || (indices[2] - indices[0] == 1))) {
output->p(indices[0], *epsNext); output->p(indices[0], *epsNext);
} }
else { else { // else for other cases
auto sub = (*output)(indices, true, true); auto sub = (*output)(indices, true, true);
sub.assign(epsNext); sub.assign(epsNext);
} }

28
libnd4j/tests_cpu/layers_tests/DeclarableOpsTests6.cpp
View File

@ -248,7 +248,7 @@ TEST_F(DeclarableOpsTests6, Test_StridedSlice_BP_1) {
// auto e = NDArrayFactory::create<int>('c', {1}, {zero}); // auto e = NDArrayFactory::create<int>('c', {1}, {zero});
// auto s = NDArrayFactory::create<int>('c', {1}, {1}); // auto s = NDArrayFactory::create<int>('c', {1}, {1});
auto grad = NDArrayFactory::create<double>('c', {5,4}); auto grad = NDArrayFactory::create<double>('c', {5});
matrix.linspace(1); matrix.linspace(1);
grad.linspace(1); grad.linspace(1);
@ -264,6 +264,7 @@ TEST_F(DeclarableOpsTests6, Test_StridedSlice_BP_1) {
delete result; delete result;
} }
TEST_F(DeclarableOpsTests6, Test_StridedSlice_BP_2) { TEST_F(DeclarableOpsTests6, Test_StridedSlice_BP_2) {
int zero = 0; int zero = 0;
auto matrix = NDArrayFactory::create<double>('c', {1, 2}); auto matrix = NDArrayFactory::create<double>('c', {1, 2});
@ -287,6 +288,31 @@ TEST_F(DeclarableOpsTests6, Test_StridedSlice_BP_2) {
delete result; delete result;
} }
TEST_F(DeclarableOpsTests6, Test_StridedSlice_BP_3) {
int zero = 0;
auto matrix = NDArrayFactory::create<float>('c', {4, 8192});
// auto b = NDArrayFactory::create<int>('c', {1}, {zero});
// auto e = NDArrayFactory::create<int>('c', {1}, {zero});
// auto s = NDArrayFactory::create<int>('c', {1}, {1});
auto grad = NDArrayFactory::create<double>('c', {4, 256});
matrix.linspace(1);
grad.linspace(1);
nd4j::ops::strided_slice_bp op;
auto result = op.execute({&matrix, &grad}, {}, {1, 0, 1, 0, 0, 0, 0, 0, 256, 1, 1});
ASSERT_EQ(Status::OK(), result->status());
auto z = result->at(0);
z->printShapeInfo("Output shape");
z->printIndexedBuffer("Output");
//ASSERT_TRUE(exp.equalsTo(z));
delete result;
}
TEST_F(DeclarableOpsTests6, Test_Simple_Scalar_1) { TEST_F(DeclarableOpsTests6, Test_Simple_Scalar_1) {
auto x = NDArrayFactory::create<double>('c', {1, 1}, {2.0f}); auto x = NDArrayFactory::create<double>('c', {1, 1}, {2.0f});
auto exp = NDArrayFactory::create<double>('c', {1, 1}, {4.0f}); auto exp = NDArrayFactory::create<double>('c', {1, 1}, {4.0f});