Skip to content

Commit 5ec6675

Browse files
CraigacpCraigacp
authored
Merge pull request #636 from tensorflow/migrate-ndarray
Migrate ndarray
2 parents 75402be + 7e424e4 commit 5ec6675

209 files changed

Lines changed: 31168 additions & 3 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
</scm>
3232

3333
<modules>
34+
<module>tensorflow-ndarray</module>
3435
<module>tensorflow-core</module>
3536
<module>tensorflow-framework</module>
3637
</modules>

‎tensorflow-core/tensorflow-core-api/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<description>Platform-dependent native code and pure-Java code for the TensorFlow machine intelligence library.</description>
1616

1717
<properties>
18-
<ndarray.version>1.0.0</ndarray.version>
1918
<truth.version>1.1.5</truth.version>
2019
<test.download.skip>false</test.download.skip>
2120
<test.download.folder>${project.build.directory}/tf-text-download/</test.download.folder>
@@ -24,8 +23,8 @@
2423
<dependencies>
2524
<dependency>
2625
<groupId>org.tensorflow</groupId>
27-
<artifactId>ndarray</artifactId>
28-
<version>${ndarray.version}</version>
26+
<artifactId>tensorflow-ndarray</artifactId>
27+
<version>${project.version}</version>
2928
</dependency>
3029
<dependency>
3130
<groupId>org.tensorflow</groupId>

‎tensorflow-ndarray/pom.xml‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<!--
2+
Copyright 2019 The TensorFlow Authors. All Rights Reserved.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
=======================================================================
16+
-->
17+
<project xmlns="http://maven.apache.org/POM/4.0.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
21+
22+
<parent>
23+
<groupId>org.tensorflow</groupId>
24+
<artifactId>tensorflow-java</artifactId>
25+
<version>1.2.0-SNAPSHOT</version>
26+
</parent>
27+
<artifactId>tensorflow-ndarray</artifactId>
28+
<packaging>jar</packaging>
29+
30+
<name>TensorFlow NdArray Library</name>
31+
<description>
32+
Utility library for N-dimensional data I/O operations in Java.
33+
</description>
34+
35+
<properties>
36+
<java.module.name>org.tensorflow.ndarray</java.module.name>
37+
</properties>
38+
39+
<dependencies>
40+
<dependency>
41+
<groupId>org.junit.jupiter</groupId>
42+
<artifactId>junit-jupiter-api</artifactId>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.junit.jupiter</groupId>
47+
<artifactId>junit-jupiter-engine</artifactId>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.openjdk.jmh</groupId>
52+
<artifactId>jmh-core</artifactId>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.openjdk.jmh</groupId>
57+
<artifactId>jmh-generator-annprocess</artifactId>
58+
<scope>test</scope>
59+
</dependency>
60+
</dependencies>
61+
62+
<build>
63+
<plugins>
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-jar-plugin</artifactId>
67+
<configuration>
68+
<archive>
69+
<manifestEntries>
70+
<Automatic-Module-Name>${java.module.name}</Automatic-Module-Name>
71+
</manifestEntries>
72+
</archive>
73+
</configuration>
74+
</plugin>
75+
<plugin>
76+
<groupId>org.apache.maven.plugins</groupId>
77+
<artifactId>maven-surefire-plugin</artifactId>
78+
<configuration>
79+
<forkCount>1</forkCount>
80+
<reuseForks>false</reuseForks>
81+
<argLine>-Xmx2G</argLine>
82+
</configuration>
83+
</plugin>
84+
<plugin>
85+
<groupId>org.apache.maven.plugins</groupId>
86+
<artifactId>maven-compiler-plugin</artifactId>
87+
<executions>
88+
<execution>
89+
<id>default-testCompile</id>
90+
<configuration>
91+
<compilerArgs>
92+
<arg>--add-modules=java.desktop</arg> <!-- For AWT usage in benchmarks -->
93+
</compilerArgs>
94+
</configuration>
95+
</execution>
96+
</executions>
97+
</plugin>
98+
</plugins>
99+
</build>
100+
101+
</project>

‎tensorflow-ndarray/src/main/java/module-info.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
Copyright 2022 The TensorFlow Authors. All Rights Reserved.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
=======================================================================
16+
*/
17+
module org.tensorflow.ndarray {
18+
requires jdk.unsupported; // required by raw buffer implementations using Unsafe
19+
20+
exports org.tensorflow.ndarray;
21+
exports org.tensorflow.ndarray.buffer;
22+
exports org.tensorflow.ndarray.buffer.layout;
23+
exports org.tensorflow.ndarray.index;
24+
25+
// Expose all implementations of our interfaces, so consumers can write custom
26+
// implementations easily by extending from them
27+
exports org.tensorflow.ndarray.impl.buffer;
28+
exports org.tensorflow.ndarray.impl.buffer.adapter;
29+
exports org.tensorflow.ndarray.impl.buffer.layout;
30+
exports org.tensorflow.ndarray.impl.buffer.misc;
31+
exports org.tensorflow.ndarray.impl.buffer.nio;
32+
exports org.tensorflow.ndarray.impl.buffer.raw;
33+
exports org.tensorflow.ndarray.impl.dense;
34+
exports org.tensorflow.ndarray.impl.dimension;
35+
exports org.tensorflow.ndarray.impl.sequence;
36+
exports org.tensorflow.ndarray.impl.sparse;
37+
exports org.tensorflow.ndarray.impl.sparse.slice;
38+
}

‎tensorflow-ndarray/src/main/java/org/tensorflow/ndarray/BooleanNdArray.java‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
/*
2+
Copyright 2019 The TensorFlow Authors. All Rights Reserved.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
=======================================================================
16+
*/
17+
package org.tensorflow.ndarray;
18+
19+
import org.tensorflow.ndarray.buffer.BooleanDataBuffer;
20+
import org.tensorflow.ndarray.buffer.DataBuffer;
21+
import org.tensorflow.ndarray.index.Index;
22+
23+
/** An {@link NdArray} of booleans. */
24+
public interface BooleanNdArray extends NdArray<Boolean> {
25+
26+
/**
27+
* Returns the boolean value of the scalar found at the given coordinates.
28+
*
29+
* <p>To access the scalar element, the number of coordinates provided must be equal to the number
30+
* of dimensions of this array (i.e. its rank). For example:
31+
*
32+
* <pre>{@code
33+
* BooleanNdArray matrix = NdArrays.ofBooleans(shape(2, 2)); // matrix rank = 2
34+
* matrix.getBoolean(0, 1); // succeeds, returns false
35+
* matrix.getBoolean(0); // throws IllegalRankException
36+
*
37+
* BooleanNdArray scalar = matrix.get(0, 1); // scalar rank = 0
38+
* scalar.getBoolean(); // succeeds, returns false
39+
* }</pre>
40+
*
41+
* @param coordinates coordinates of the scalar to resolve
42+
* @return value of that scalar
43+
* @throws IndexOutOfBoundsException if some coordinates are outside the limits of their
44+
* respective dimension
45+
* @throws IllegalRankException if number of coordinates is not sufficient to access a scalar
46+
* element
47+
*/
48+
boolean getBoolean(long... coordinates);
49+
50+
/**
51+
* Assigns the boolean value of the scalar found at the given coordinates.
52+
*
53+
* <p>To access the scalar element, the number of coordinates provided must be equal to the number
54+
* of dimensions of this array (i.e. its rank). For example:
55+
*
56+
* <pre>{@code
57+
* BooleanNdArray matrix = NdArrays.ofBooleans(shape(2, 2)); // matrix rank = 2
58+
* matrix.setBoolean(true, 0, 1); // succeeds
59+
* matrix.setBoolean(true, 0); // throws IllegalRankException
60+
*
61+
* BooleanNdArray scalar = matrix.get(0, 1); // scalar rank = 0
62+
* scalar.setBoolean(true); // succeeds
63+
* }</pre>
64+
*
65+
* @param value the value to assign
66+
* @param coordinates coordinates of the scalar to assign
67+
* @return this array
68+
* @throws IndexOutOfBoundsException if some coordinates are outside the limits of their
69+
* respective dimension
70+
* @throws IllegalRankException if number of coordinates is not sufficient to access a scalar
71+
* element
72+
*/
73+
BooleanNdArray setBoolean(boolean value, long... coordinates);
74+
75+
@Override
76+
BooleanNdArray withShape(Shape shape);
77+
78+
@Override
79+
BooleanNdArray slice(Index... indices);
80+
81+
@Override
82+
BooleanNdArray get(long... coordinates);
83+
84+
@Override
85+
BooleanNdArray set(NdArray<Boolean> src, long... coordinates);
86+
87+
@Override
88+
default Boolean getObject(long... coordinates) {
89+
return getBoolean(coordinates);
90+
}
91+
92+
@Override
93+
default BooleanNdArray setObject(Boolean value, long... coordinates) {
94+
return setBoolean(value, coordinates);
95+
}
96+
97+
@Override
98+
NdArraySequence<BooleanNdArray> elements(int dimensionIdx);
99+
100+
@Override
101+
NdArraySequence<BooleanNdArray> scalars();
102+
103+
@Override
104+
BooleanNdArray copyTo(NdArray<Boolean> dst);
105+
106+
@Override
107+
BooleanNdArray copyTo(DataBuffer<Boolean> dst);
108+
109+
BooleanNdArray copyTo(BooleanDataBuffer dst);
110+
111+
@Override
112+
BooleanNdArray copyFrom(DataBuffer<Boolean> src);
113+
114+
BooleanNdArray copyFrom(BooleanDataBuffer src);
115+
}

‎tensorflow-ndarray/src/main/java/org/tensorflow/ndarray/ByteNdArray.java‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
/*
2+
Copyright 2019 The TensorFlow Authors. All Rights Reserved.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
=======================================================================
16+
*/
17+
package org.tensorflow.ndarray;
18+
19+
import org.tensorflow.ndarray.buffer.ByteDataBuffer;
20+
import org.tensorflow.ndarray.buffer.DataBuffer;
21+
import org.tensorflow.ndarray.index.Index;
22+
23+
/** An {@link NdArray} of bytes. */
24+
public interface ByteNdArray extends NdArray<Byte> {
25+
26+
/**
27+
* Returns the byte value of the scalar found at the given coordinates.
28+
*
29+
* <p>To access the scalar element, the number of coordinates provided must be equal to the number
30+
* of dimensions of this array (i.e. its rank). For example:
31+
*
32+
* <pre>{@code
33+
* ByteNdArray matrix = NdArrays.ofBytes(shape(2, 2)); // matrix rank = 2
34+
* matrix.getByte(0, 1); // succeeds, returns 0
35+
* matrix.getByte(0); // throws IllegalRankException
36+
*
37+
* ByteNdArray scalar = matrix.get(0, 1); // scalar rank = 0
38+
* scalar.getByte(); // succeeds, returns 0
39+
* }</pre>
40+
*
41+
* @param coordinates coordinates of the scalar to resolve
42+
* @return value of that scalar
43+
* @throws IndexOutOfBoundsException if some coordinates are outside the limits of their
44+
* respective dimension
45+
* @throws IllegalRankException if number of coordinates is not sufficient to access a scalar
46+
* element
47+
*/
48+
byte getByte(long... coordinates);
49+
50+
/**
51+
* Assigns the byte value of the scalar found at the given coordinates.
52+
*
53+
* <p>To access the scalar element, the number of coordinates provided must be equal to the number
54+
* of dimensions of this array (i.e. its rank). For example:
55+
*
56+
* <pre>{@code
57+
* ByteNdArray matrix = NdArrays.ofBytes(shape(2, 2)); // matrix rank = 2
58+
* matrix.setByte(10, 0, 1); // succeeds
59+
* matrix.setByte(10, 0); // throws IllegalRankException
60+
*
61+
* ByteNdArray scalar = matrix.get(0, 1); // scalar rank = 0
62+
* scalar.setByte(10); // succeeds
63+
* }</pre>
64+
*
65+
* @param value the value to assign
66+
* @param coordinates coordinates of the scalar to assign
67+
* @return this array
68+
* @throws IndexOutOfBoundsException if some coordinates are outside the limits of their
69+
* respective dimension
70+
* @throws IllegalRankException if number of coordinates is not sufficient to access a scalar
71+
* element
72+
*/
73+
ByteNdArray setByte(byte value, long... coordinates);
74+
75+
@Override
76+
ByteNdArray withShape(Shape shape);
77+
78+
@Override
79+
ByteNdArray slice(Index... indices);
80+
81+
@Override
82+
ByteNdArray get(long... coordinates);
83+
84+
@Override
85+
ByteNdArray set(NdArray<Byte> src, long... coordinates);
86+
87+
@Override
88+
default Byte getObject(long... coordinates) {
89+
return getByte(coordinates);
90+
}
91+
92+
@Override
93+
default ByteNdArray setObject(Byte value, long... coordinates) {
94+
return setByte(value, coordinates);
95+
}
96+
97+
@Override
98+
NdArraySequence<ByteNdArray> elements(int dimensionIdx);
99+
100+
@Override
101+
NdArraySequence<ByteNdArray> scalars();
102+
103+
@Override
104+
ByteNdArray copyTo(NdArray<Byte> dst);
105+
106+
@Override
107+
ByteNdArray copyTo(DataBuffer<Byte> dst);
108+
109+
ByteNdArray copyTo(ByteDataBuffer dst);
110+
111+
@Override
112+
ByteNdArray copyFrom(DataBuffer<Byte> src);
113+
114+
ByteNdArray copyFrom(ByteDataBuffer src);
115+
}

0 commit comments

Comments
 (0)