From 595dd948d7623ea947d7df16bc48c9652cccbf2c Mon Sep 17 00:00:00 2001 From: Yating Date: Thu, 3 Feb 2022 11:58:13 -0500 Subject: [PATCH] infra: remove dependency on `org_tensorflow` (#5528) * remove dependency on `org_tensorflow` and add necessary dependencies * update rules_rust dep to HEAD and upgrade to Rust 1.58.1 * set mininum bazel version to 4.0.0 --- .github/workflows/ci.yml | 10 +-- WORKSPACE | 70 +++++++++--------- tensorboard/data/server/BUILD | 6 +- tensorboard/data/server/descriptor.bin | Bin 58702 -> 56809 bytes .../data/server/tensorboard.data.pb.rs | 2 +- tensorboard/data/server/tensorboard.pb.rs | 2 +- tensorboard/data/server/update_protos.py | 4 +- third_party/rust.bzl | 2 +- third_party/tensorflow.patch | 12 --- third_party/workspace.bzl | 6 ++ 10 files changed, 53 insertions(+), 61 deletions(-) delete mode 100644 third_party/tensorflow.patch diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa6592b4602..81ed63731b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,8 +27,8 @@ on: env: # Keep this Bazel version in sync with the `versions.check` directive # in our WORKSPACE file. - BAZEL_VERSION: '3.7.0' - BAZEL_SHA256SUM: 'b7583eec83cc38302997098a40b8c870c37e0ab971a83cb3364c754a178b74ec' + BAZEL_VERSION: '4.0.0' + BAZEL_SHA256SUM: '7bee349a626281fc8b8d04a7a0b0358492712377400ab12533aeb39c2eb2b901' BUILDTOOLS_VERSION: '3.0.0' BUILDIFIER_SHA256SUM: 'e92a6793c7134c5431c58fbc34700664f101e5c9b1c1fcd93b97978e8b7f88db' BUILDOZER_SHA256SUM: '3d58a0b6972e4535718cdd6c12778170ea7382de7c75bc3728f5719437ffb84d' @@ -121,11 +121,11 @@ jobs: matrix: mode: ['native'] platform: ['ubuntu-18.04', 'macos-10.15'] - rust_version: ['1.52.0'] + rust_version: ['1.58.1'] include: - mode: 'universal' platform: 'ubuntu-18.04' - rust_version: '1.52.0' + rust_version: '1.58.1' steps: - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e - uses: actions/setup-python@152ba7c4dd6521b8e9c93f72d362ce03bf6c4f20 @@ -244,7 +244,7 @@ jobs: runs-on: ubuntu-18.04 strategy: matrix: - rust_version: ['1.52.0'] + rust_version: ['1.58.1'] cargo_raze_version: ['0.13.0'] steps: - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e diff --git a/WORKSPACE b/WORKSPACE index 72ac2d7f1d2..fc93603bf78 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2,6 +2,22 @@ workspace(name = "org_tensorflow_tensorboard") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +http_archive( + name = "bazel_skylib", + sha256 = "07b4117379dde7ab382345c3b0f5edfc6b7cff6c93756eac63da121e0bbcc5de", + strip_prefix = "bazel-skylib-1.1.1", + urls = [ + "http://mirror.tensorflow.org/github.com/bazelbuild/bazel-skylib/archive/1.1.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz", # 2021-09-27 + ], +) + +load("@bazel_skylib//lib:versions.bzl", "versions") + +# Keep this version in sync with the BAZEL environment variable defined +# in our .github/workflows/ci.yml config. +versions.check(minimum_bazel_version = "4.0.0") + http_archive( name = "io_bazel_rules_webtesting", sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3", @@ -73,35 +89,6 @@ http_archive( ], ) -http_archive( - name = "org_tensorflow", - patches = [ - # Patch TF's python_configure.bzl to ensure it reconfigures its python - # toolchain when environment variables like `PATH` and `PYTHONPATH` - # change, to avoid the stale genrule py_binary issue described in: - # https://github.com/tensorflow/tensorboard/issues/4862 - "//third_party:tensorflow.patch", - ], - # NOTE: when updating this, MAKE SURE to also update the protobuf_js runtime version - # in third_party/workspace.bzl to >= the protobuf/protoc version provided by TF. - sha256 = "2595a5c401521f20a2734c4e5d54120996f8391f00bb62a57267d930bce95350", - strip_prefix = "tensorflow-2.3.0", - urls = [ - "http://mirror.tensorflow.org/github.com/tensorflow/tensorflow/archive/v2.3.0.tar.gz", # 2020-07-23 - "https://github.com/tensorflow/tensorflow/archive/v2.3.0.tar.gz", - ], -) - -load("@org_tensorflow//tensorflow:workspace.bzl", "tf_workspace") - -tf_workspace() - -load("@bazel_skylib//lib:versions.bzl", "versions") - -# Keep this version in sync with the BAZEL environment variable defined -# in our .github/workflows/ci.yml config. -versions.check(minimum_bazel_version = "3.7.0") - load("@io_bazel_rules_sass//:package.bzl", "rules_sass_dependencies") rules_sass_dependencies() @@ -110,22 +97,33 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories") sass_repositories() +# gRPC. +http_archive( + name = "com_github_grpc_grpc", + sha256 = "b2f2620c762427bfeeef96a68c1924319f384e877bc0e084487601e4cc6e434c", + strip_prefix = "grpc-1.42.0", + urls = [ + "http://mirror.tensorflow.org/github.com/grpc/grpc/archive/v1.42.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.42.0.tar.gz", # 2021-11-17 + ], +) + load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") grpc_deps() -load("@upb//bazel:repository_defs.bzl", "bazel_version_repository") +load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") -bazel_version_repository(name = "bazel_version") +grpc_extra_deps() http_archive( name = "rules_rust", - sha256 = "9c7d7fd4378d75232858423d574cff677b16ac9a49cd1a11df545a6e72a315ca", - strip_prefix = "rules_rust-42a674093251fb6a603a2652980c9be28a6fea50", + sha256 = "08109dccfa5bbf674ff4dba82b15d40d85b07436b02e62ab27e0b894f45bb4a3", + strip_prefix = "rules_rust-d5ab4143245af8b33d1947813d411a6cae838409", urls = [ - # Master branch as of 2021-04-14 - "http://mirror.tensorflow.org/github.com/bazelbuild/rules_rust/archive/42a674093251fb6a603a2652980c9be28a6fea50.tar.gz", - "https://github.com/bazelbuild/rules_rust/archive/42a674093251fb6a603a2652980c9be28a6fea50.tar.gz", + # Master branch as of 2022-01-31 + "http://mirror.tensorflow.org/github.com/bazelbuild/rules_rust/archive/d5ab4143245af8b33d1947813d411a6cae838409.tar.gz", + "https://github.com/bazelbuild/rules_rust/archive/d5ab4143245af8b33d1947813d411a6cae838409.tar.gz", ], ) diff --git a/tensorboard/data/server/BUILD b/tensorboard/data/server/BUILD index 99d69e6e267..27af4bf8e09 100644 --- a/tensorboard/data/server/BUILD +++ b/tensorboard/data/server/BUILD @@ -1,4 +1,4 @@ -load("@rules_rust//rust:rust.bzl", "rust_binary", "rust_doc", "rust_doc_test", "rust_library", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_doc", "rust_doc_test", "rust_library", "rust_test") package(default_visibility = ["//tensorboard:internal"]) @@ -117,13 +117,13 @@ rust_binary( rust_doc_test( name = "rustboard_core_doc_test", - dep = ":rustboard_core", + crate = ":rustboard_core", tags = ["manual"], # https://github.com/bazelbuild/rules_rust/issues/689 ) rust_doc( name = "rustboard_core_doc", - dep = ":rustboard_core", + crate = ":rustboard_core", tags = ["manual"], # https://github.com/bazelbuild/rules_rust/issues/689 ) diff --git a/tensorboard/data/server/descriptor.bin b/tensorboard/data/server/descriptor.bin index c8481d7a0a2ec355bb378eb6a4549453a72f3bf4..cc44201bd48f5d3d2d5d7bf5ce321f609aaf39c6 100644 GIT binary patch delta 1148 zcmYL}eN3BG6vlhs_odJmVbCcs29yM3WzEWf%wov|>5!ETCYdNBhRH|i`07h&1!377 zC1i8B1^QqV!z_Vp6Ws@JM_B@v6DMQ>y>Ax+dkN*OG&B{Y}wV`;5tyDzuAg;(1Y+b|UN98C)_ zGR$qB_5@ufC=M>hcfmPG*>1{ag1L_SI!Nx8Uosm!6~J>?z} zNh?m}gws0-X#@(b9rv^vY)#bQh#2-n4P8ofGPvJ~vtg=d`kzk}u86Rg91Y@~DZ4}D$O-8j)WsIq;5-dW& z+r=@K+Dd~trpzSNm|`p?6$Y~e?F9FIEh?(nn-Mf1W$!hy}8X3^R?0#y-93jvZ%$r%ILS$JRj~po7r$N8@~4` zxi#2Tr;u%EL>Ug&MZ73x)kcFQwNfZNcGyrTn2MCq(f>)Fv{Rc6mdt#UU{-F5-JnEo zT_AY@nbq6q4|N&RAa9=KBt*`gCSLyh1;TTjgptU(CcIMrL4ptO;YJUU3FFCcqNr{n zUR$0b>qhxjerdxjR$CBZozrZniD+*5-%Q+P;^nhxCZf58`1uz|pR7Edx7q3bhQEUN zmWqvM_X{Jw*k@^8dp$=VcYvU|(}C=+JUY_#8o~1y>(PJlK0dlML<=vg7+mN+PIr8^ zkD%`JbzrSmhpfIl6$=35rZ*$zCMeI3bP&m!u<9`Rb}SO|dm!HW2O my!p+P2ek7VoSL6Q`9d6NhJB%pc`T#a#T6E@kLD1%6#Fj<7PiL# delta 3082 zcmY+GeNdHE9>?$bJ?CEVG2p(xgS;l2D5N8bGm9*np^m1_#%NkY5O9fAz(9p|7g*di zT^q;zNez}8s3{>Y!PyZEOmo#*x23GH$kLh?9o@~H%4&DpX4&)dJa^nbpU?fB-}!#O z=jEQ8quTfd&8i1%!;T3Q`UB1U-gYGz(a$le%eq0*-6dQAjxSQMZdN zpbjlQPPbAE2$lsieXJ0L zfYXh;f)5)Ac$FVKKKyI2(?A+WVemV#E%ZABQI3)!?8E8d7orly1nD#_fG>v&qEKke zpy@uG4BsUGX5)#^Q}`$mBdOoTDHCFp9TIST+Ar=<DPG7*0#`cwbH;X) z30)bG6k@Aq?uwOTiOg;ttWCzt*;NJ-3Lb%VKKw~eKm3r-zRDT4!RWoLXF-kGNoj}+ zW7e8kSeUo@j%Hr)`0;q&LaCO>$bI0&FY@vXq5|__+9Hz(T>^1f5>Tj}L+=S8$=@nRgY+~PvNhbAUv3~#H6P|C;^qA91`;|J z!u%jBS$x0p1t65*>P|Y+Rz&NkEwrUGKr+C8wj6qGvgM#Eo0- z?~6jwG(yV*m|E0gK$ZIjTJ6BjqQ|08^sJ#9f;d&w7=@x|9jyuBmZkfmQ1q;)bzz*g z%#=hxq}D*|({Sms-A1Jfqls>H;H71^qfkuLOq&Ai&EV#wEUPRT+8 ziJ1#vv6EGltT$5^yJ-b1*YMP1YA1nA_W@WD!g-}?q*O;&!2^j{U3yA3)8s-I!_PvP zS+>tWqW@YbcCgVhzdH6*meoP6AK$B3Ez7JDH9&m`Qz{j*Nz@2ild-N+O=*)VnxJte z9*rWg8c#t}241avP;TfLIj|Xig|j0q3Gw`%iIG9J5@<=rW073#n`|9#wI(C2T1A?% zxGFPiR^*9>s?B9{9KjTo*5RvF zv!;DNTaR&ClPo*gWYuolU4{BI9b%_DwRB4%HrE#0Z-;cC7N@n@vXhYDwGf-E?TBHK z#+5dou4~jnoLY0NLq9-t%CA9-leXd8&FxEtT6uk1+XytfbmM}t^4|%>n4d&^#wM7b zn)r0O^lPda|8)m;v|L%5U|zAd9R%8l+o&hJ8wX}LBI-$OocSy7wu9ImWi}bWJpI{j z*4O$kKkV7Uj&>ZNa=FwEe>Y?#v7i2apV~EQbLGH~X5a@e4a+ih+2le_2%qUJF_2iV zJjivjzjYRyBgNqXa105-*-Qcu69)xmLn*FXEw-1`?ZVHLUcoRfn@c zGPP|=p~Q_(9r>k1YC}{)d6<2BWQm${n%pFtpvI1Q-KtENXbUt1*dMxk2tS%udY53f zZ3KQz;_%U)R}9FfwQVP`jX2SIY@38}vT_%Jog|D;9~(5FsN79p7YX5lUbB)%VB14r zH%Y-0y=R;be%j;Jt!8_U(00P5_YE6Z#%kM7Xa~nR{r5$&===hq`-vax``hJo2~tBB zftNUp8K^g)s60fVi+HeUpw56o!^;E?abY(GlrXy--b0|9Td00jS+I*UXX_)-!z+V> zW~CTDK%kFXcyVyQ>}eO5wQY#N07=F9L&}%K@HIl{FgNhskn-iwl&>*DM>+0g_c=rg z0*mQR5;{iMKiF@?UyYTzq_A-UZ*yUrjw@jOtc1D5Nw>XE;35}xXjo}* z8yY?$bb?P-KB6?Z4GmWa{e);ukaWjJ)yGoNDY$&KIibO6DnJeth`QO zl4tw)Ybslh)Nq5qbuR3^*OV}?9Da+y-?@c{MwJDx9R4MNTfCBvnU%uA*95-g7PgP6 zY`rquZwY+Ovz>8L`SKaQ{zK^Z+`wlil`o&+Yl_hSa{S!uDqDetuU4Q_giXBOrLql3 zVS54gKq@xAF(LyG$jWwry%56eGfG%M`g$Iq9a3=cjM5M^G#mi>BDnF%KPnADLqiwP zPL4Crs%!-o8V&;O;?IkppH