Skip to content

Commit b597a2c

Browse files
authored
[ML-5666] Update to tensorflow 1.12, tensorframes 0.6.0 (#168)
* Upgrade TF to 1.12. * TensorFrames 0.6.0 release is compiled with TensorFlow 1.12. * get_signature_def_by_key is removed in TF 1.12. See https://github.com/tensorflow/tensorflow/releases/tag/v1.12.0. Replaced it with meta_graph_def.signature_def[signature_def_key]
1 parent aa51ebd commit b597a2c

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ sparkComponents ++= Seq("mllib-local", "mllib", "sql")
4040

4141
// add any Spark Package dependencies using spDependencies.
4242
// e.g. spDependencies += "databricks/spark-avro:0.1"
43-
spDependencies += s"databricks/tensorframes:0.5.0-s_$scalaMajorVersion"
43+
spDependencies += s"databricks/tensorframes:0.6.0-s_$scalaMajorVersion"
4444

4545

4646
libraryDependencies ++= Seq(

docs/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ include:
1414

1515
# These allow the documentation to be updated with newer releases
1616
# of Spark and Scala.
17-
SPARKDL_VERSION: 1.3.0
17+
SPARKDL_VERSION: 1.4.0
1818
#SCALA_BINARY_VERSION: "2.11"
1919
#SCALA_VERSION: "2.11.8"
2020
#SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies:
1313
- h5py=2.8.0
1414
- pillow=4.1.1
1515
- cloudpickle=0.5.2
16-
- tensorflow=1.10.0
16+
- tensorflow=1.12.0
1717
- keras=2.2.4
1818
- paramiko=2.4.1
1919
- wrapt=1.10.11

python/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ nose>=1.3.7 # for testing
66
parameterized>=0.6.1 # for testing
77
pillow>=4.1.1,<4.2
88
pygments>=2.2.0
9-
tensorflow==1.10.0 # NOTE: this package has only been tested with tensorflow 1.10.0
9+
tensorflow==1.12.0 # NOTE: This package has only been tested with this TensorFlow version.
1010
pandas>=0.19.1
1111
six>=1.10.0
1212
paramiko>=2.4.0

python/sparkdl/graph/input.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,7 @@ def _from_saved_model_impl(saved_model_dir, tag_set, signature_def_key, feed_nam
304304
meta_graph_def = tf.saved_model.loader.load(sess, tag_sets, saved_model_dir)
305305

306306
if signature_def_key is not None:
307-
sig_def = tf.contrib.saved_model.get_signature_def_by_key(meta_graph_def,
308-
signature_def_key)
307+
sig_def = meta_graph_def.signature_def[signature_def_key]
309308
return _build_with_sig_def(sess=sess, graph=graph, sig_def=sig_def)
310309
else:
311310
return _build_with_feeds_fetches(sess=sess, graph=graph, feed_names=feed_names,

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "1.3.1-SNAPSHOT"
1+
version in ThisBuild := "1.4.0-SNAPSHOT"

0 commit comments

Comments
 (0)