diff options
| author |  Mingxing Tan <tanmingxing@google.com> | 2018-06-20 12:41:19 -0700 |
|---|---|---|
| committer | Mingxing Tan <tanmingxing@google.com> | 2018-06-20 12:41:19 -0700 |
| commit | 8f1f0a8e4eaa5ae7593dc596b9b69a6cd88fa16a (patch) | |
| tree | 7a341bfcec45046067e1753b2fe11e3f543ccfbe /tensorflow/java | |
| parent | 39ea5a7044a16b868e38717b358c46d6e3191373 (diff) | |
| parent | 4fdb7cc4f92e76a168810e9b420bf1b90eb544e9 (diff) | |
Merge commit for internal changes
Diffstat (limited to 'tensorflow/java')
| -rw-r--r-- | tensorflow/java/maven/libtensorflow/pom.xml | 2 | ||||
| -rw-r--r-- | tensorflow/java/maven/libtensorflow_jni/pom.xml | 2 | ||||
| -rw-r--r-- | tensorflow/java/maven/libtensorflow_jni_gpu/pom.xml | 2 | ||||
| -rw-r--r-- | tensorflow/java/maven/pom.xml | 2 | ||||
| -rw-r--r-- | tensorflow/java/maven/proto/pom.xml | 2 | ||||
| -rw-r--r-- | tensorflow/java/maven/tensorflow/pom.xml | 2 | ||||
| -rw-r--r-- | tensorflow/java/src/gen/cc/op_specs.cc | 1 |
7 files changed, 7 insertions, 6 deletions
diff --git a/tensorflow/java/maven/libtensorflow/pom.xml b/tensorflow/java/maven/libtensorflow/pom.xml index 38e87b1639..a7fa9ea5cc 100644 --- a/tensorflow/java/maven/libtensorflow/pom.xml +++ b/tensorflow/java/maven/libtensorflow/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.tensorflow</groupId> <artifactId>parentpom</artifactId> - <version>1.9.0-rc0</version> + <version>1.9.0-rc1</version> <relativePath>../</relativePath> </parent> <artifactId>libtensorflow</artifactId> diff --git a/tensorflow/java/maven/libtensorflow_jni/pom.xml b/tensorflow/java/maven/libtensorflow_jni/pom.xml index 36c984e280..83aae29f1e 100644 --- a/tensorflow/java/maven/libtensorflow_jni/pom.xml +++ b/tensorflow/java/maven/libtensorflow_jni/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.tensorflow</groupId> <artifactId>parentpom</artifactId> - <version>1.9.0-rc0</version> + <version>1.9.0-rc1</version> <relativePath>../</relativePath> </parent> <artifactId>libtensorflow_jni</artifactId> diff --git a/tensorflow/java/maven/libtensorflow_jni_gpu/pom.xml b/tensorflow/java/maven/libtensorflow_jni_gpu/pom.xml index 4c846de05a..50bd8ee5f9 100644 --- a/tensorflow/java/maven/libtensorflow_jni_gpu/pom.xml +++ b/tensorflow/java/maven/libtensorflow_jni_gpu/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.tensorflow</groupId> <artifactId>parentpom</artifactId> - <version>1.9.0-rc0</version> + <version>1.9.0-rc1</version> <relativePath>../</relativePath> </parent> <artifactId>libtensorflow_jni_gpu</artifactId> diff --git a/tensorflow/java/maven/pom.xml b/tensorflow/java/maven/pom.xml index acab08f58c..b4746794ea 100644 --- a/tensorflow/java/maven/pom.xml +++ b/tensorflow/java/maven/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.tensorflow</groupId> <artifactId>parentpom</artifactId> - <version>1.9.0-rc0</version> + <version>1.9.0-rc1</version> <packaging>pom</packaging> <url>https://www.tensorflow.org</url> diff --git a/tensorflow/java/maven/proto/pom.xml b/tensorflow/java/maven/proto/pom.xml index eb0a952c7d..618a2a124c 100644 --- a/tensorflow/java/maven/proto/pom.xml +++ b/tensorflow/java/maven/proto/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.tensorflow</groupId> <artifactId>parentpom</artifactId> - <version>1.9.0-rc0</version> + <version>1.9.0-rc1</version> <relativePath>../</relativePath> </parent> <artifactId>proto</artifactId> diff --git a/tensorflow/java/maven/tensorflow/pom.xml b/tensorflow/java/maven/tensorflow/pom.xml index 48668a47f2..157c4b8e82 100644 --- a/tensorflow/java/maven/tensorflow/pom.xml +++ b/tensorflow/java/maven/tensorflow/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.tensorflow</groupId> <artifactId>parentpom</artifactId> - <version>1.9.0-rc0</version> + <version>1.9.0-rc1</version> <relativePath>../</relativePath> </parent> <artifactId>tensorflow</artifactId> diff --git a/tensorflow/java/src/gen/cc/op_specs.cc b/tensorflow/java/src/gen/cc/op_specs.cc index f0e4bcca82..63e99fbb04 100644 --- a/tensorflow/java/src/gen/cc/op_specs.cc +++ b/tensorflow/java/src/gen/cc/op_specs.cc @@ -97,6 +97,7 @@ Type TypeResolver::TypeOf(const OpDef_ArgDef& arg_def, *iterable_out = true; visited_attrs_.insert(std::make_pair(arg_def.number_attr(), Type::Int())); } + Type type = Type::Wildcard(); if (arg_def.type() != DataType::DT_INVALID) { // resolve type from DataType |