Docker: introduce @six to sync with upstream protobuf 3.11.2 updates

WORKSPACE.in

@@ -25,6 +25,21 @@ http_archive(
     url = "https://github.com/google/googletest/archive/release-1.10.0.tar.gz",
 )
 
+http_archive(
+    name = "six",
+    build_file = "six.BUILD",
+    sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73",
+    strip_prefix = "six-1.12.0",
+    urls = ["https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz"],
+)
+
+http_archive(
+    name = "com_google_protobuf",
+    sha256 = "e8c7601439dbd4489fe5069c33d374804990a56c2f710e00227ee5d8fd650e67",
+    strip_prefix = "protobuf-3.11.2",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.11.2.tar.gz"],
+)
+
 http_archive(
     name = "rules_proto",
     sha256 = "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
@@ -116,13 +131,6 @@ http_archive(
     urls = ["https://github.com/cpplint/cpplint/archive/1.4.5.tar.gz"],
 )
 
-http_archive(
-    name = "com_google_protobuf",
-    sha256 = "b967f5b667c7041415283705c0ab07f0bcc1ff077854cd29a7e148458a910053",
-    strip_prefix = "protobuf-3.11.2",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.11.2.tar.gz"],
-)
-
 # ad-rss-lib
 http_archive(
     name = "ad_rss_lib",

docker/build/installers/install_protobuf.sh

@@ -25,7 +25,8 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 
 VERSION="3.11.2"
 PKG_NAME="protobuf-cpp-${VERSION}.tar.gz"
-CHECKSUM="b967f5b667c7041415283705c0ab07f0bcc1ff077854cd29a7e148458a910053"
+CHECKSUM="f2f180e9343cbb2b9a8482255bfec2176a2cc7fa22de496535a0a0cf38797495"
+https://github.com/protocolbuffers/protobuf/releases/download/v3.12.2/protobuf-cpp-3.12.2.tar.gz
 DOWNLOAD_LINK="https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protobuf-cpp-${VERSION}.tar.gz"
 
 #https://github.com/protocolbuffers/protobuf/releases/download/v3.11.2/protobuf-cpp-3.11.2.tar.gz

external/libtorch_cpu.BUILD

@@ -5,7 +5,8 @@ licenses(["notice"])
 cc_library(
     name = "libtorch_cpu",
     includes = [
-        "."
+        ".",
+        "torch/csrc/api/include",
     ],
     linkstatic = False,
     linkopts = [

external/libtorch_gpu.BUILD

@@ -5,11 +5,13 @@ licenses(["notice"])
 cc_library(
     name = "libtorch_gpu",
     includes = [
-        "."
+        ".",
+        "torch/csrc/api/include",
     ],
     linkstatic = False,
     linkopts = [
         "-L/usr/local/libtorch_gpu/lib",
-        "-ltorch",
+	"-ltorch",
+        "-ltorch_cuda",
     ],
 )

external/six.BUILD

+# Description:
+#   Six provides simple utilities for wrapping over differences between Python 2
+#   and Python 3.
+
+load("@rules_python//python:defs.bzl", "py_library")
+
+licenses(["notice"])  # MIT
+
+exports_files(["LICENSE"])
+
+py_library(
+    name = "six",
+    srcs = ["six.py"],
+    srcs_version = "PY2AND3",
+    visibility = ["//visibility:public"],
+)