Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change to bzlmod #14

Merged
merged 2 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions dataproxy_sdk/bazel/rapidjson.BUILD → .bazeliskrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

package(default_visibility = ["//visibility:public"])

licenses(["notice"]) # MIT/JSON license

cc_library(
name = "rapidjson",
srcs = glob([
"include/**/*.h",
]),
copts = [],
includes = [
"include",
],
)
USE_BAZEL_VERSION=7.4.1
6 changes: 5 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@
# limitations under the License.

common --experimental_repo_remote_exec
common --modify_execution_info=CppLink=+no-remote-cache
common --experimental_cc_shared_library

common --registry=https://raw.githubusercontent.com/secretflow/bazel-registry/main
common --registry=https://bcr.bazel.build
common --registry=https://baidu.github.io/babylon/registry

build --incompatible_new_actions_api=false
build --copt=-fdiagnostics-color=always
build --enable_platform_specific_config

build --cxxopt=-std=c++17
build --host_cxxopt=-std=c++17
build --linkopt -lm

build:avx --copt=-mavx
build:avx --host_copt=-mavx
Expand Down
1 change: 0 additions & 1 deletion .bazelversion

This file was deleted.

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ CTestTestfile.cmake
# bazel
bazel-*

# bazel module lock
MODULE.bazel.lock
resolved.bzl

#python
*.pyc
*egg-info
Expand Down
81 changes: 81 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# Copyright 2025 Ant Group Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

module(
name = "dataproxy",
compatibility_level = 1,
)

DEFAULT_PYTHON_VERSION = "3.11"

SUPPORTED_PYTHON_VERSIONS = [
"3.9",
"3.10",
"3.11",
]

python = use_extension("@rules_python//python/extensions:python.bzl", "python")

[
python.toolchain(
ignore_root_user_error = True,
is_default = python_version == DEFAULT_PYTHON_VERSION,
python_version = python_version,
)
for python_version in SUPPORTED_PYTHON_VERSIONS
]

use_repo(python, "python_versions")

pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")

[
pip.parse(
hub_name = "dataproxy_sdk_pip",
python_version = python_version,
requirements_linux = "//dataproxy_sdk/python:requirements_lock_{}.txt".format(python_version.replace(".", "_")),
)
for python_version in SUPPORTED_PYTHON_VERSIONS
]

use_repo(pip, "dataproxy_sdk_pip")

bazel_dep(name = "arrow", version = "14.0.2")
bazel_dep(name = "rules_foreign_cc", version = "0.13.0")
bazel_dep(name = "spdlog", version = "1.14.1")
bazel_dep(name = "yacl", version = "0.4.5b10-nightly-20241224")
bazel_dep(name = "pybind11_bazel", version = "2.13.6")
bazel_dep(name = "rules_python", version = "0.34.0")
bazel_dep(name = "rules_proto_grpc_python", version = "5.0.1")
bazel_dep(name = "grpc")
single_version_override(
module_name = "grpc",
patch_strip = 1,
patches = [
"//dataproxy_sdk/bazel/patches:grpc_1.66.patch",
"//dataproxy_sdk/bazel/patches:grpc_module_file.patch",
],
version = "1.66.0.bcr.3",
)

bazel_dep(name = "kuscia")
git_override(
module_name = "kuscia",
commit = "a1208dcdab6682dfc6d3ae21b2d5990e917cbf2f",
remote = "https://github.com/secretflow/kuscia.git",
)

# # test
bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True)
# bazel_dep(name = "google_benchmark", version = "1.8.5", dev_dependency = True)
72 changes: 0 additions & 72 deletions WORKSPACE

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
# Copyright 2024 Ant Group Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

org.secretflow.dataproxy.core.config.DefaultFlightServerConfigLoader
Original file line number Diff line number Diff line change
@@ -1,2 +1,16 @@
# Copyright 2024 Ant Group Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

org.secretflow.dataproxy.plugin.odps.config.DefaultOdpsFlightConfigLoader
org.secretflow.dataproxy.plugin.odps.config.EnvironmentOdpsFlightConfigLoader
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
# Copyright 2024 Ant Group Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

org.secretflow.dataproxy.plugin.odps.producer.OdpsFlightProducer
Loading
Loading