Internal Change

PiperOrigin-RevId: 570676345
google · Oct 4, 2023 · 6cd50c8 · 6cd50c8
1 parent 7980b0b
commit 6cd50c8
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 77 deletions.
diff --git a/.bazelignore b/.bazelignore
@@ -0,0 +1 @@
+yggdrasil_decision_forests/port/python
diff --git a/WORKSPACE b/WORKSPACE
@@ -18,7 +18,4 @@ ydf_load_deps(exclude_repo=["tensorflow"])
 load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
 grpc_deps()
 load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
-grpc_extra_deps()
-
-load("@pybind11_bazel//:python_configure.bzl", "python_configure")
-python_configure(name = "local_config_python")
+grpc_extra_deps()
diff --git a/WORKSPACE_NO_TF b/WORKSPACE_NO_TF
@@ -20,9 +20,6 @@ grpc_deps()
 load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
 grpc_extra_deps()
 
-load("@pybind11_bazel//:python_configure.bzl", "python_configure")
-python_configure(name = "local_config_python")
-
 # Emscripten
 http_archive(
   name = "emsdk",

diff --git a/third_party/pybind11/BUILD b/third_party/pybind11/BUILD
diff --git a/third_party/pybind11/workspace.bzl b/third_party/pybind11/workspace.bzl
diff --git a/third_party/pybind11_abseil/BUILD b/third_party/pybind11_abseil/BUILD
diff --git a/third_party/pybind11_abseil/workspace.bzl b/third_party/pybind11_abseil/workspace.bzl
diff --git a/third_party/pybind11_protobuf/BUILD b/third_party/pybind11_protobuf/BUILD
diff --git a/third_party/pybind11_protobuf/workspace.bzl b/third_party/pybind11_protobuf/workspace.bzl
diff --git a/tools/test_pydf.sh b/tools/test_pydf.sh
@@ -40,13 +40,13 @@ build_and_maybe_test () {
     ${BAZEL} version
 
     local flags="--config=linux_cpp17 --config=linux_avx2 --features=-fully_static_link --repo_env=CC=${1}"
-    local pydf_targets="//yggdrasil_decision_forests/port/python/...:all"
-    # No tensorflow support
-    cp -f WORKSPACE_NO_TF WORKSPACE
+    local pydf_targets="//ydf/...:all"
     # Install PYDF components
     python3 -m pip install -r yggdrasil_decision_forests/port/python/requirements.txt
     python3 -m pip install -r yggdrasil_decision_forests/port/python/dev_requirements.txt
 
+    cd yggdrasil_decision_forests/port/python
+
     time ${BAZEL} build ${flags} -- ${pydf_targets}
     if [[ "$RUN_TESTS" = 1 ]]; then
       time ${BAZEL} test ${flags} -- ${pydf_targets}

diff --git a/yggdrasil_decision_forests/library.bzl b/yggdrasil_decision_forests/library.bzl
@@ -9,20 +9,8 @@ load("//third_party/boost:workspace.bzl", boost = "deps")
 load("//third_party/grpc:workspace.bzl", grpc = "deps")
 load("//third_party/rapidjson:workspace.bzl", rapidjson = "deps")
 load("//third_party/eigen3:workspace.bzl", eigen = "deps")
-load("//third_party/pybind11:workspace.bzl", pybind11 = "deps")
-load("//third_party/pybind11_abseil:workspace.bzl", pybind11_abseil = "deps")
-load("//third_party/pybind11_protobuf:workspace.bzl", pybind11_protobuf = "deps")
 
 def load_dependencies(repo_name = "", exclude_repo = []):
-    if "pybind11" not in exclude_repo:
-        pybind11()
-
-    if "pybind11_abseil" not in exclude_repo:
-        pybind11_abseil()
-
-    if "pybind11_protobuf" not in exclude_repo:
-        pybind11_protobuf()
-
     if "gtest" not in exclude_repo:
         gtest()