Patch Github sh256 checksum changes

jetsonhacks · Sep 14, 2017 · 660ecb5 · 660ecb5
1 parent 8f2357f
commit 660ecb5
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # installTensorFlowTX2
-September 11, 2017
+September 13, 2017
 JetsonHacks
 
 Install TensorFlow v1.3 on NVIDIA Jetson TX2 Development Kit
@@ -74,6 +74,11 @@ This TensorFlow installation procedure was derived from these discussion threads
 </ul>
 
 ### Release Notes
+September 13, 2017
+* L4T 28.1 (JetPack 3.1)
+* TensorFlow 1.3
+* Github changed some sha256 checksums, patches added to workspace.bzl as workaround
+
 September 2017
 * L4T 28.1 (JetPack 3.1)
 * TensorFlow 1.3

diff --git a/patches/tensorflow.patch b/patches/tensorflow.patch
@@ -36,22 +36,4 @@ index b2da109..8ee1f3a 100644
    LOG(INFO) << "OS X does not support NUMA - returning NUMA node zero";
    return 0;N
  #elif defined(PLATFORM_WINDOWS)
-diff --git aa/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
-index 2a206b0..d785473 100644
---- a/tensorflow/workspace.bzl
-+++ b/tensorflow/workspace.bzl
-@@ -150,11 +150,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
-   native.new_http_archive(
-       name = "eigen_archive",
-       urls = [
--          "http://mirror.bazel.build/bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz",
--          "https://bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz",
-+          "http://mirror.bazel.build/bitbucket.org/eigen/eigen/get/d781c1de9834.tar.gz",
-+          "https://bitbucket.org/eigen/eigen/get/d781c1de9834.tar.gz",
-       ],
--      sha256 = "ca7beac153d4059c02c8fc59816c82d54ea47fe58365e8aded4082ded0b820c4",
--      strip_prefix = "eigen-eigen-f3a22f35b044",
-+      sha256 = "a34b208da6ec18fa8da963369e166e4a368612c14d956dd2f9d7072904675d9b",
-+      strip_prefix = "eigen-eigen-d781c1de9834",
-       build_file = str(Label("//third_party:eigen.BUILD")),
-   )
+
diff --git a/patches/workspacebzl.patch b/patches/workspacebzl.patch
@@ -0,0 +1,47 @@
+diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
+index 42840a2..d6c8086 100644
+--- a/tensorflow/workspace.bzl
++++ b/tensorflow/workspace.bzl
+@@ -147,11 +147,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
+   native.new_http_archive(
+       name = "eigen_archive",
+       urls = [
+-          "http://mirror.bazel.build/bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz",
+-          "https://bitbucket.org/eigen/eigen/get/f3a22f35b044.tar.gz",
++          "http://mirror.bazel.build/bitbucket.org/eigen/eigen/get/d781c1de9834.tar.gz",
++          "https://bitbucket.org/eigen/eigen/get/d781c1de9834.tar.gz",
+       ],
+-      sha256 = "ca7beac153d4059c02c8fc59816c82d54ea47fe58365e8aded4082ded0b820c4",
+-      strip_prefix = "eigen-eigen-f3a22f35b044",
++      sha256 = "a34b208da6ec18fa8da963369e166e4a368612c14d956dd2f9d7072904675d9b",
++      strip_prefix = "eigen-eigen-d781c1de9834",
+       build_file = str(Label("//third_party:eigen.BUILD")),
+   )
+
+@@ -330,7 +330,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
+           "https://github.com/google/protobuf/archive/0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66.tar.gz",
+           "http://mirror.bazel.build/github.com/google/protobuf/archive/0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66.tar.gz",
+       ],
+-      sha256 = "6d43b9d223ce09e5d4ce8b0060cb8a7513577a35a64c7e3dad10f0703bf3ad93",
++      # sha256 = "6d43b9d223ce09e5d4ce8b0060cb8a7513577a35a64c7e3dad10f0703bf3ad93",
+       strip_prefix = "protobuf-0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66",
+       # TODO: remove patching when tensorflow stops linking same protos into
+       #       multiple shared libraries loaded in runtime by python.
+@@ -348,7 +348,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
+           "https://github.com/google/protobuf/archive/0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66.tar.gz",
+           "http://mirror.bazel.build/github.com/google/protobuf/archive/0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66.tar.gz",
+       ],
+-      sha256 = "6d43b9d223ce09e5d4ce8b0060cb8a7513577a35a64c7e3dad10f0703bf3ad93",
++      # sha256 = "6d43b9d223ce09e5d4ce8b0060cb8a7513577a35a64c7e3dad10f0703bf3ad93",
+       strip_prefix = "protobuf-0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66",
+   )
+
+@@ -358,7 +358,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
+           "https://github.com/google/protobuf/archive/0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66.tar.gz",
+           "http://mirror.bazel.build/github.com/google/protobuf/archive/0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66.tar.gz",
+       ],
+-      sha256 = "6d43b9d223ce09e5d4ce8b0060cb8a7513577a35a64c7e3dad10f0703bf3ad93",
++      # sha256 = "6d43b9d223ce09e5d4ce8b0060cb8a7513577a35a64c7e3dad10f0703bf3ad93",
+       strip_prefix = "protobuf-0b059a3d8a8f8aa40dde7bea55edca4ec5dfea66",
+   )
+