Skip to content
This repository was archived by the owner on Jul 15, 2025. It is now read-only.

Viewing arrays with different shapes #18

Merged
merged 3 commits into from
Feb 18, 2024
Merged

Viewing arrays with different shapes #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dac3139
Viewing arrays with different shapes
karllessard Feb 17, 2024
b8ee473
Fix equality check and star import
karllessard Feb 18, 2024
b650c37
Check null before equality
karllessard Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix equality check and star import
  • Loading branch information
@karllessard
karllessard committed Feb 18, 2024
commit b8ee47356f95a0c942dac3dedcc6c917dc857448
2 changes: 1 addition & 1 deletion ndarray/src/main/java/org/tensorflow/ndarray/impl/dense/AbstractDenseNdArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public NdArraySequence<U> elements(int dimensionIdx) {

@Override
public U withShape(Shape shape) {
if (shape == this.shape()) {
if (shape.equals(this.shape())) {
return (U)this;
}
if (shape == null || shape.isUnknown() || shape.size() != this.shape().size()) {
Expand Down
2 changes: 1 addition & 1 deletion ndarray/src/test/java/org/tensorflow/ndarray/NdArrayTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ public void withShape() {
assertEquals(originalShape, originalArray.shape());
assertEquals(valueOf(10L), newArray.getObject(0, 0));

NdArray<T> sameArray = originalArray.withShape(originalShape);
NdArray<T> sameArray = originalArray.withShape(Shape.scalar());
assertSame(originalArray, sameArray);

assertThrows(IllegalArgumentException.class, () -> originalArray.withShape(Shape.of(2)));
Expand Down
5 changes: 4 additions & 1 deletion ndarray/src/test/java/org/tensorflow/ndarray/SparseNdArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
import org.tensorflow.ndarray.impl.sparse.LongSparseNdArray;
import org.tensorflow.ndarray.impl.sparse.ShortSparseNdArray;

import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class SparseNdArrayTest {
long[][] indicesArray = {{0, 0}, {1, 2}, {2, 3}};
Expand Down