Skip to content
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

Jump to bottom

Shyrma split space #6318

Merged
merged 2 commits into from
Aug 31, 2018
Merged

Shyrma split space #6318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4be258
fixing and testing split op
Aug 30, 2018
33112b8
add to space_to_batch op possiblity to work with blocks of length=1
Aug 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion libnd4j/include/ops/declarable/generic/parity_ops/space_to_batch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace ops {

block_dims = (int) blocks->lengthOf();

REQUIRE_TRUE(blocks->isVector(), 0, "SpaceToBatch: blocks supposed to be vector, but got %iD instead", blocks->rankOf());
REQUIRE_TRUE(blocks->isVector() || blocks->lengthOf() == 1, 0, "SpaceToBatch: blocks supposed to be vector or scalar, but got %iD instead", blocks->rankOf());
REQUIRE_TRUE(input->rankOf() >= 1 + blocks->lengthOf() + 1, 0, "SpaceToBatch: blocks length + 2 should match input rank at least");
REQUIRE_TRUE(padding->rankOf() == 2, 0, "SpaceToBatch: padding should have rank of 2, but got %i instead", padding->rankOf());
REQUIRE_TRUE(padding->columns() == 2 && blocks->lengthOf() == padding->rows(), 0, "SpaceToBatch: padding should have M rows and 2 columns");
Expand Down
2 changes: 2 additions & 0 deletions libnd4j/include/ops/declarable/generic/parity_ops/split.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ namespace ops {
if (block.numI() == 2)
axis = INT_ARG(1);

if(axis < 0) axis += input->rankOf();

REQUIRE_TRUE(input->sizeAt(axis) % num_splits == 0, 0, "Split: num_splits has wrong value, remainder of division should be 0, but it's %i", input->sizeAt(axis) % num_splits);

int pos = 0;
Expand Down
48 changes: 48 additions & 0 deletions libnd4j/tests_cpu/layers_tests/DeclarableOpsTests10.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,3 +511,51 @@ TEST_F(DeclarableOpsTests10, sparse_softmax_cross_entropy_loss_with_logits_test4
delete results;
}

///////////////////////////////////////////////////////////////////
TEST_F(DeclarableOpsTests10, split_test4) {

NDArray<float> input('c', {10},{1.f,2.f,3.f,4.f,5.f,6.f,7.f,8.f,9.f,10.f});
NDArray<float> axis(-1);
NDArray<float> exp1('c', {5}, {1.f,2.f,3.f,4.f,5.f});
NDArray<float> exp2('c', {5}, {6.f,7.f,8.f,9.f,10.f});

nd4j::ops::split<float> op;
auto results = op.execute({&input, &axis}, {}, {2});

ASSERT_EQ(ND4J_STATUS_OK, results->status());

NDArray<float> *out1 = results->at(0);
NDArray<float> *out2 = results->at(1);

ASSERT_TRUE(exp1.isSameShape(out1));
ASSERT_TRUE(exp2.isSameShape(out2));
ASSERT_TRUE(exp1.equalsTo(out1));
ASSERT_TRUE(exp2.equalsTo(out2));

delete results;
}


///////////////////////////////////////////////////////////////////
TEST_F(DeclarableOpsTests10, split_test5) {

NDArray<float> input('c', {3,8},{1.f,2.f,3.f,4.f,5.f,6.f,7.f,8.f,9.f,10.f,11.f,12.f,13.f,14.f,15.f,16.f,17.f,18.f,19.f,20.f,21.f,22.f,23.f,24.f});
NDArray<float> exp1('c', {3,4}, {1.f,2.f,3.f,4.f, 9.f,10.f,11.f,12.f, 17.f,18.f,19.f,20.f});
NDArray<float> exp2('c', {3,4}, {5.f,6.f,7.f,8.f, 13.f,14.f,15.f,16.f, 21.f,22.f,23.f,24.f});

nd4j::ops::split<float> op;
auto results = op.execute({&input}, {}, {2,-1});

ASSERT_EQ(ND4J_STATUS_OK, results->status());

NDArray<float> *out1 = results->at(0);
NDArray<float> *out2 = results->at(1);

ASSERT_TRUE(exp1.isSameShape(out1));
ASSERT_TRUE(exp2.isSameShape(out2));
ASSERT_TRUE(exp1.equalsTo(out1));
ASSERT_TRUE(exp2.equalsTo(out2));

delete results;
}