Skip to content

Upgrade for JavaCPP 1.5.7 and TensorFlow 2.8.0 #415

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

Merged
karllessard merged 10 commits into from
Mar 9, 2022
Merged

Upgrade for JavaCPP 1.5.7 and TensorFlow 2.8.0 #415

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a46b5e9
Upgrade for JavaCPP 1.5.7 and TensorFlow 2.8.0
saudet Feb 12, 2022
f111ba3
Readd missing annotations
saudet Feb 12, 2022
77ab6e6
Attempt to classify new ops
saudet Feb 16, 2022
62b3af1
Upgrade Bazel version and its config
karllessard Feb 23, 2022
a9f1492
Reclassify 2.8.0 new ops
karllessard Feb 23, 2022
77528fb
Update CI build to use Bazel 4.2.1
karllessard Feb 23, 2022
7d4596e
Fix spotless issues
karllessard Feb 23, 2022
77bb74e
Pin Linux, Mac, and Windows to known working versions on GitHub Action
saudet Feb 24, 2022
ddc2a5e
Try to fix builds on Windows by setting Bazel output to TMP directory
saudet Feb 26, 2022
6001ab8
Reformatting
karllessard Mar 9, 2022
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
Attempt to classify new ops
  • Loading branch information
@saudet @karllessard
saudet authored and karllessard committed Mar 8, 2022
commit 77ab6e64b1eef4d621c56f16bc84ebf7a3402615
22 changes: 22 additions & 0 deletions tensorflow-core/tensorflow-core-api/external/tensorflow-proto.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,3 +461,25 @@ diff -ruN tensorflow-2.7.0/tensorflow/core/util/memmapped_file_system.proto tens

// A message that describes one region of memmapped file.
message MemmappedFileSystemDirectoryElement {
diff -ruN tensorflow-2.8.0/tensorflow/core/protobuf/coordination_config.proto tensorflow-2.8.0-proto/tensorflow/core/protobuf/coordination_config.proto
--- tensorflow-2.8.0/tensorflow/core/protobuf/coordination_config.proto 2022-02-01 04:17:33.000000000 +0900
+++ tensorflow-2.8.0-proto/tensorflow/core/protobuf/coordination_config.proto 2022-02-16 11:02:10.162709816 +0900
@@ -3,6 +3,7 @@
package tensorflow;

option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto";
+option java_package = "org.tensorflow.distruntime";

// Coordination service configuration parameters.
// The system picks appropriate values for fields that are not set.
diff -ruN tensorflow-2.8.0/tensorflow/core/protobuf/distributed_runtime_payloads.proto tensorflow-2.8.0-proto/tensorflow/core/protobuf/distributed_runtime_payloads.proto
--- tensorflow-2.8.0/tensorflow/core/protobuf/distributed_runtime_payloads.proto 2022-02-01 04:17:33.000000000 +0900
+++ tensorflow-2.8.0-proto/tensorflow/core/protobuf/distributed_runtime_payloads.proto 2022-02-16 11:00:03.739373379 +0900
@@ -4,6 +4,7 @@

option cc_enable_arenas = true;
option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto";
+option java_package = "org.tensorflow.distruntime";

// Used to serialize and transmit tensorflow::Status payloads through
// grpc::Status `error_details` since grpc::Status lacks payload API.
6 changes: 6 additions & 0 deletions tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AnonymousIteratorV3.pbtxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
op {
graph_op_name: "AnonymousIteratorV3"
endpoint {
name: "rawops.AnonymousIteratorV3"
}
}
6 changes: 6 additions & 0 deletions ...w-core/tensorflow-core-api/src/bazel/api_def/api_def_AnonymousMutableDenseHashTable.pbtxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
op {
graph_op_name: "AnonymousMutableDenseHashTable"
endpoint {
name: "rawops.AnonymousMutableDenseHashTable"
}
}
6 changes: 6 additions & 0 deletions ...orflow-core/tensorflow-core-api/src/bazel/api_def/api_def_AnonymousMutableHashTable.pbtxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
op {
graph_op_name: "AnonymousMutableHashTable"
endpoint {
name: "rawops.AnonymousMutableHashTable"
}
}
6 changes: 6 additions & 0 deletions ...re/tensorflow-core-api/src/bazel/api_def/api_def_AnonymousMutableHashTableOfTensors.pbtxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
op {
graph_op_name: "AnonymousMutableHashTableOfTensors"
endpoint {
name: "rawops.AnonymousMutableHashTableOfTensors"
}
}
6 changes: 6 additions & 0 deletions tensorflow-core/tensorflow-core-api/src/bazel/api_def/api_def_DataServiceDatasetV3.pbtxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
op {
graph_op_name: "DataServiceDatasetV3"
endpoint {
name: "rawops.DataServiceDatasetV3"
}
}
6 changes: 6 additions & 0 deletions ...w-core-api/src/bazel/api_def/api_def_DynamicEnqueueTPUEmbeddingArbitraryTensorBatch.pbtxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
op {
graph_op_name: "DynamicEnqueueTPUEmbeddingArbitraryTensorBatch"
endpoint {
name: "rawops.DynamicEnqueueTPUEmbeddingArbitraryTensorBatch"
}
}
6 changes: 6 additions & 0 deletions ...nsorflow-core-api/src/bazel/api_def/api_def_EnqueueTPUEmbeddingArbitraryTensorBatch.pbtxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
op {
graph_op_name: "EnqueueTPUEmbeddingArbitraryTensorBatch"
endpoint {
name: "rawops.EnqueueTPUEmbeddingArbitraryTensorBatch"
}
}
3 changes: 3 additions & 0 deletions ...rflow-core/tensorflow-core-api/src/bazel/api_def/api_def_FileSystemSetConfiguration.pbtxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
op {
graph_op_name: "FileSystemSetConfiguration"
}
2 changes: 1 addition & 1 deletion ...nsorflow/op/core/AnonymousIteratorV3.java → ...orflow/op/rawops/AnonymousIteratorV3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// This class has been generated, DO NOT EDIT!

package org.tensorflow.op.core;
package org.tensorflow.op.rawops;

import java.util.Arrays;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions .../core/AnonymousMutableDenseHashTable.java → ...awops/AnonymousMutableDenseHashTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// This class has been generated, DO NOT EDIT!

package org.tensorflow.op.core;
package org.tensorflow.op.rawops;

import java.util.Arrays;
import org.tensorflow.GraphOperation;
Expand Down Expand Up @@ -154,7 +154,7 @@ public Output<TType> asOutput() {
}

/**
* Optional attributes for {@link org.tensorflow.op.core.AnonymousMutableDenseHashTable}
* Optional attributes for {@link org.tensorflow.op.rawops.AnonymousMutableDenseHashTable}
*/
public static class Options {
private Shape valueShape;
Expand Down
2 changes: 1 addition & 1 deletion ...ow/op/core/AnonymousMutableHashTable.java → .../op/rawops/AnonymousMutableHashTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// This class has been generated, DO NOT EDIT!

package org.tensorflow.op.core;
package org.tensorflow.op.rawops;

import java.util.Arrays;
import org.tensorflow.GraphOperation;
Expand Down
4 changes: 2 additions & 2 deletions ...e/AnonymousMutableHashTableOfTensors.java → ...s/AnonymousMutableHashTableOfTensors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// This class has been generated, DO NOT EDIT!

package org.tensorflow.op.core;
package org.tensorflow.op.rawops;

import java.util.Arrays;
import org.tensorflow.GraphOperation;
Expand Down Expand Up @@ -120,7 +120,7 @@ public Output<TType> asOutput() {
}

/**
* Optional attributes for {@link org.tensorflow.op.core.AnonymousMutableHashTableOfTensors}
* Optional attributes for {@link org.tensorflow.op.rawops.AnonymousMutableHashTableOfTensors}
*/
public static class Options {
private Shape valueShape;
Expand Down
4 changes: 2 additions & 2 deletions ...sorflow/op/core/DataServiceDatasetV3.java → ...rflow/op/rawops/DataServiceDatasetV3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// This class has been generated, DO NOT EDIT!

package org.tensorflow.op.core;
package org.tensorflow.op.rawops;

import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -180,7 +180,7 @@ public Output<TType> asOutput() {
}

/**
* Optional attributes for {@link org.tensorflow.op.core.DataServiceDatasetV3}
* Optional attributes for {@link org.tensorflow.op.rawops.DataServiceDatasetV3}
*/
public static class Options {
private Long taskRefreshIntervalHintMs;
Expand Down
4 changes: 2 additions & 2 deletions ...ueueTPUEmbeddingArbitraryTensorBatch.java → ...ueueTPUEmbeddingArbitraryTensorBatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// This class has been generated, DO NOT EDIT!

package org.tensorflow.op.core;
package org.tensorflow.op.rawops;

import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -148,7 +148,7 @@ public static Options combiners(String... combiners) {
}

/**
* Optional attributes for {@link org.tensorflow.op.core.DynamicEnqueueTPUEmbeddingArbitraryTensorBatch}
* Optional attributes for {@link org.tensorflow.op.rawops.DynamicEnqueueTPUEmbeddingArbitraryTensorBatch}
*/
public static class Options {
private List<String> combiners;
Expand Down
4 changes: 2 additions & 2 deletions ...ueueTPUEmbeddingArbitraryTensorBatch.java → ...ueueTPUEmbeddingArbitraryTensorBatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

// This class has been generated, DO NOT EDIT!

package org.tensorflow.op.core;
package org.tensorflow.op.rawops;

import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -158,7 +158,7 @@ public static Options combiners(String... combiners) {
}

/**
* Optional attributes for {@link org.tensorflow.op.core.EnqueueTPUEmbeddingArbitraryTensorBatch}
* Optional attributes for {@link org.tensorflow.op.rawops.EnqueueTPUEmbeddingArbitraryTensorBatch}
*/
public static class Options {
private Long deviceOrdinal;
Expand Down
Loading