Skip to content

Commit

Permalink
Use GRCP and Bazel 1.0 (#6002)
Browse files Browse the repository at this point in the history
  • Loading branch information
pcmoritz authored Nov 8, 2019
1 parent afca6d3 commit ccbcc4b
Show file tree
Hide file tree
Showing 15 changed files with 63 additions and 468 deletions.
6 changes: 5 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# build config
build --compilation_mode=opt
build --action_env=PATH
build --action_env=PYTHON_BIN_PATH
build --action_env=PYTHON2_BIN_PATH
build --action_env=PYTHON3_BIN_PATH
# Warnings should be errors
build --per_file_copt=-src/ray/thirdparty/hiredis/dict.c,-.*/arrow/util/logging.cc@-Werror
# Ignore warnings for protobuf generated files and external projects.
Expand All @@ -10,3 +11,6 @@ build --per_file_copt='external*@-w'
# This workaround is needed due to https://github.com/bazelbuild/bazel/issues/4341
build --per_file_copt="external/com_github_grpc_grpc/.*@-DGRPC_BAZEL_BUILD"
build --http_timeout_scaling=5.0
# This workaround is due to an incompatibility of
# bazel_common/tools/maven/pom_file.bzl with Bazel 1.0
build --incompatible_depset_is_not_iterable=false
7 changes: 3 additions & 4 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# C/C++ documentation: https://docs.bazel.build/versions/master/be/c-cpp.html

load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
load("@build_stack_rules_proto//python:python_proto_compile.bzl", "python_proto_compile")
load("@build_stack_rules_proto//python:python_grpc_compile.bzl", "python_grpc_compile")
load("@com_github_grpc_grpc//bazel:cython_library.bzl", "pyx_library")
load("@rules_proto_grpc//python:defs.bzl", "python_proto_compile")
load("@rules_proto_grpc//python:defs.bzl", "python_grpc_compile")
load("@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_cc_library")
load("@//bazel:ray.bzl", "flatbuffer_py_library")
load("@//bazel:cython_library.bzl", "pyx_library")

COPTS = ["-DRAY_USE_GLOG"] + select({
"@bazel_tools//src/conditions:windows": [
Expand Down Expand Up @@ -744,7 +744,6 @@ pyx_library(
"python/ray/includes/*.pxd",
"python/ray/includes/*.pxi",
]),
copts = COPTS,
deps = [
"//:core_worker_lib",
"//:raylet_lib",
Expand Down
7 changes: 7 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@ ray_deps_setup()
load("//bazel:ray_deps_build_all.bzl", "ray_deps_build_all")

ray_deps_build_all()

# This needs to be run after grpc_deps() in ray_deps_build_all() to make
# sure all the packages loaded by grpc_deps() are available. However a
# load() statement cannot be in a function so we put it here.
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")

grpc_extra_deps()
36 changes: 0 additions & 36 deletions bazel/BUILD.tpl

This file was deleted.

73 changes: 0 additions & 73 deletions bazel/cython_library.bzl

This file was deleted.

Loading

0 comments on commit ccbcc4b

Please sign in to comment.