Improve run-prereq.sh and BUILD file, fixing a runtime issue.

PiperOrigin-RevId: 448756982
oeh77 · May 15, 2022 · 684d4d3 · 684d4d3
1 parent 60b4b63
commit 684d4d3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/deeptrio/protos/BUILD b/deeptrio/protos/BUILD
@@ -1,5 +1,5 @@
 load("//third_party:clif.bzl", "pyclif_proto_library")
-load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
+load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library", "py_proto_library")
 
 package(
     default_visibility = [
@@ -22,6 +22,20 @@ proto_library(
     ],
 )
 
+cc_proto_library(
+    name = "deeptrio_cc_pb2",
+    srcs = ["deeptrio.proto"],
+    default_runtime = "@com_google_protobuf//:protobuf",
+    protoc = "@com_google_protobuf//:protoc",
+    deps = [
+        "//deepvariant/protos:realigner_cc_pb2",
+        "//deepvariant/protos:resources_cc_pb2",
+        "//third_party/nucleus/protos:position_cc_pb2",
+        "//third_party/nucleus/protos:reads_cc_pb2",
+        "//third_party/nucleus/protos:variants_cc_pb2",
+    ],
+)
+
 # buildozer: disable=LANG_proto_library-colocation
 # buildozer: disable=LANG_proto_library-single-deps
 py_proto_library(

diff --git a/run-prereq.sh b/run-prereq.sh
@@ -260,4 +260,7 @@ sudo -H apt-get install "${APT_ARGS[@]}" libssl-dev libcurl4-openssl-dev liblz-d
 # for the debruijn graph
 sudo -H apt-get install "${APT_ARGS[@]}" libboost-graph-dev > /dev/null
 
+# Just being safe, pin protobuf's version one more time.
+pip3 install "${PIP_ARGS[@]}" 'protobuf==3.13.0'
+
 note_build_stage "run-prereq.sh complete"