Add classifier to bring in correct shaded jar and class (#16)

tapanalyticstoolkit · Feb 15, 2017 · efaf1ed · efaf1ed
1 parent 9bf2e70
commit efaf1ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -19,7 +19,7 @@ val `org.apache.spark_spark-mllib_2.11` = "org.apache.spark" % "spark-mllib_2.11
 
 val `org.scalatest_scalatest_2.11` = "org.scalatest" % "scalatest_2.11" % "2.2.6"
 
-val `org.tensorflow_tensorflow-hadoop` = "org.tensorflow" % "tensorflow-hadoop" % "1.0-01232017-SNAPSHOT"
+val `org.tensorflow_tensorflow-hadoop` = "org.tensorflow" % "tensorflow-hadoop" % "1.0-01232017-SNAPSHOT" classifier "shaded-protobuf"
 
 
 version := "1.0-SNAPSHOT"

diff --git a/src/main/scala/org/trustedanalytics/spark/datasources/tensorflow/serde/FeatureEncoder.scala b/src/main/scala/org/trustedanalytics/spark/datasources/tensorflow/serde/FeatureEncoder.scala
@@ -15,9 +15,8 @@
  */
 package org.trustedanalytics.spark.datasources.tensorflow.serde
 
-import com.google.protobuf.ByteString
 import org.tensorflow.example.{BytesList, Feature, FloatList, Int64List}
-//import org.tensorflow.hadoop.shaded.protobuf.ByteString
+import org.tensorflow.hadoop.shaded.protobuf.ByteString
 import org.trustedanalytics.spark.datasources.tensorflow.DataTypesConvertor
 
 trait FeatureEncoder {