Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: secretflow/serving
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.5.0dev20240702
Choose a base ref
...
head repository: secretflow/serving
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.6.0b0
Choose a head ref
  • 15 commits
  • 96 files changed
  • 3 contributors

Commits on Jul 10, 2024

  1. Update dependency platforms to v0.0.10 (#43)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 10, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    cdc64a6 View commit details
  2. Fix CI Failed (#78)

    * debug ci
    
    * format
    
    * fix it
    oeqqwq authored Jul 10, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    4f276c5 View commit details

Commits on Jul 17, 2024

  1. update version (#82)

    huocun-ant authored Jul 17, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    79a4100 View commit details

Commits on Jul 18, 2024

  1. Update CircleCI-Public/trigger-circleci-pipeline-action action to v1.…

    …2.0 (#37)
    
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    20c17b3 View commit details
  2. Update dependency pybind11 to v2.13.1 (#52)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    e057021 View commit details
  3. Update dependency rstcheck to v6.2.4 (#58)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    5dc4350 View commit details
  4. Update dependency nbsphinx to v0.9.4 (#50)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d6b1d59 View commit details
  5. Update dependency pydata-sphinx-theme to v0.15.4 (#53)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    9cd25df View commit details
  6. Update dependency path-filtering to v1.1.0 (#87)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    4c21c55 View commit details
  7. Update dependency rules_pkg to v0.10.1 (#88)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    a571168 View commit details
  8. Update dependency com_github_jupp0r_prometheus_cpp to v1.2.4 (#84)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    aea9ba0 View commit details
  9. Update dependency io_opentelemetry_cpp to v1.16.1 (#85)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored Jul 18, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    8a3f849 View commit details

Commits on Aug 20, 2024

  1. repo-sync-2024-08-20T16:28:18+0800 (#97)

    * repo-sync-2024-08-20T16:28:18+0800
    
    * fix License Check
    oeqqwq authored Aug 20, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    1568ff4 View commit details
  2. bump version (#99)

    oeqqwq authored Aug 20, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    bd8c948 View commit details
  3. revert release-ci tag

    oeqqwq committed Aug 20, 2024
    Copy the full SHA
    46a1b75 View commit details
Showing with 2,640 additions and 1,756 deletions.
  1. +1 −1 .bazelrc
  2. +1 −1 .circleci/config.yml
  3. +5 −0 .circleci/continue-config.yml
  4. +2 −2 .circleci/release-config.yml
  5. +1 −1 .github/workflows/deploy.yml
  6. +10 −0 CHANGELOG.md
  7. +4 −0 WORKSPACE
  8. +0 −166 bazel/arrow.BUILD
  9. +0 −38 bazel/brotli.BUILD
  10. +0 −39 bazel/bzip2.BUILD
  11. +0 −31 bazel/double_conversion.BUILD
  12. +0 −37 bazel/lz4.BUILD
  13. +0 −42 bazel/patches/rules_boost.patch
  14. +0 −28 bazel/rapidjson.BUILD
  15. +31 −182 bazel/repositories.bzl
  16. +0 −39 bazel/snappy.BUILD
  17. +0 −71 bazel/thrift.BUILD
  18. +0 −45 bazel/xsimd.BUILD
  19. +0 −38 bazel/zstd.BUILD
  20. +0 −6 docker/Dockerfile
  21. +9 −7 docs/locales/zh_CN/LC_MESSAGES/intro/tutorial.po
  22. +306 −63 docs/locales/zh_CN/LC_MESSAGES/reference/config.po
  23. +79 −45 docs/locales/zh_CN/LC_MESSAGES/topics/deployment/deployment.po
  24. +90 −64 docs/locales/zh_CN/LC_MESSAGES/topics/deployment/serving_on_kuscia.po
  25. +3 −3 docs/requirements.txt
  26. +1 −0 docs/source/index.rst
  27. +1 −1 docs/source/intro/tutorial.rst
  28. +115 −4 docs/source/reference/config.md
  29. +4 −1 docs/source/topics/deployment/deployment.rst
  30. +5 −4 docs/source/topics/deployment/serving_on_kuscia.rst
  31. +0 −4 docs/source/topics/index.rst
  32. +1 −1 python_lib/secretflow_serving_lib/version.py
  33. +21 −3 secretflow_serving/config/BUILD.bazel
  34. +4 −0 secretflow_serving/config/cluster_config.proto
  35. +4 −0 secretflow_serving/config/feature_config.proto
  36. +11 −0 secretflow_serving/config/model_config.proto
  37. +80 −0 secretflow_serving/config/retry_policy_config.proto
  38. +5 −5 secretflow_serving/config/server_config.proto
  39. +1 −2 secretflow_serving/core/BUILD.bazel
  40. +6 −1 secretflow_serving/feature_adapter/http_adapter.cc
  41. +1 −0 secretflow_serving/feature_adapter/http_adapter.h
  42. +3 −2 secretflow_serving/framework/executable.cc
  43. +4 −2 secretflow_serving/framework/executable.h
  44. +116 −121 secretflow_serving/framework/execute_context.cc
  45. +34 −108 secretflow_serving/framework/execute_context.h
  46. +56 −62 secretflow_serving/framework/execute_context_test.cc
  47. +51 −21 secretflow_serving/framework/executor.cc
  48. +9 −8 secretflow_serving/framework/executor.h
  49. +163 −97 secretflow_serving/framework/executor_test.cc
  50. +1 −1 secretflow_serving/framework/model_info_processor.cc
  51. +58 −80 secretflow_serving/framework/predictor.cc
  52. +1 −13 secretflow_serving/framework/predictor.h
  53. +231 −35 secretflow_serving/framework/predictor_test.cc
  54. +0 −5 secretflow_serving/ops/BUILD.bazel
  55. +5 −4 secretflow_serving/ops/arrow_processing.cc
  56. +1 −2 secretflow_serving/ops/arrow_processing_test.cc
  57. +1 −11 secretflow_serving/ops/dot_product.cc
  58. +1 −2 secretflow_serving/ops/dot_product_test.cc
  59. +32 −18 secretflow_serving/ops/graph.cc
  60. +17 −13 secretflow_serving/ops/graph.h
  61. +105 −14 secretflow_serving/ops/graph_test.cc
  62. +2 −2 secretflow_serving/ops/merge_y_test.cc
  63. +1 −0 secretflow_serving/ops/node.cc
  64. +19 −11 secretflow_serving/ops/node_def_util.h
  65. +9 −9 secretflow_serving/ops/op_kernel.h
  66. +0 −1 secretflow_serving/ops/tree_merge_test.cc
  67. +2 −10 secretflow_serving/ops/tree_select.cc
  68. +1 −2 secretflow_serving/ops/tree_select_test.cc
  69. +6 −8 secretflow_serving/server/execution_core.cc
  70. +1 −1 secretflow_serving/server/execution_service_impl.cc
  71. +31 −0 secretflow_serving/server/kuscia/config_parser.cc
  72. +26 −0 secretflow_serving/server/kuscia/config_parser_test.cc
  73. +1 −31 secretflow_serving/server/prediction_core.cc
  74. +11 −8 secretflow_serving/server/server.cc
  75. +21 −0 secretflow_serving/source/BUILD.bazel
  76. +55 −0 secretflow_serving/source/dataproxy_source.cc
  77. +13 −5 secretflow_serving/{util/test_utils.h → source/dataproxy_source.h}
  78. +1 −2 secretflow_serving/source/http_source_test.cc
  79. +8 −7 secretflow_serving/source/oss_source.cc
  80. +1 −0 secretflow_serving/source/oss_source.h
  81. +62 −0 secretflow_serving/source/source_test.cc
  82. +28 −5 secretflow_serving/util/BUILD.bazel
  83. +39 −3 secretflow_serving/util/arrow_helper.cc
  84. +6 −0 secretflow_serving/util/arrow_helper.h
  85. +90 −0 secretflow_serving/util/backoff_policy.h
  86. +4 −4 secretflow_serving/util/csv_extractor.cc
  87. +28 −4 secretflow_serving/util/network.cc
  88. +5 −2 secretflow_serving/util/network.h
  89. +202 −0 secretflow_serving/util/retry_policy.cc
  90. +52 −0 secretflow_serving/util/retry_policy.h
  91. +182 −0 secretflow_serving/util/retry_policy_test.cc
  92. +0 −40 secretflow_serving/util/test_utils.cc
  93. +1 −1 secretflow_serving/util/thread_safe_queue_test.cc
  94. +36 −0 secretflow_serving/util/utils.cc
  95. +4 −5 secretflow_serving/util/utils.h
  96. +1 −1 version.txt
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
# limitations under the License.

common --experimental_repo_remote_exec
common --experimental_remote_download_regex='.*libserving\.so$|.*_pb2\.py$|.*\/secretflow_serving$|.*sf_serving\.tar\.gz$'
common --experimental_remote_download_regex='.*libserving\.so$|.*_pb2\.py$|.*\/secretflow_serving$|.*sf_serving\.tar\.gz$|.*\/simple_feature_service$'

build --incompatible_new_actions_api=false
build --copt=-fdiagnostics-color=always
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ version: 2.1
setup: true

orbs:
path-filtering: circleci/path-filtering@1.0.0
path-filtering: circleci/path-filtering@1.1.0
continuation: circleci/continuation@1.0.0

parameters:
5 changes: 5 additions & 0 deletions .circleci/continue-config.yml
Original file line number Diff line number Diff line change
@@ -91,6 +91,11 @@ jobs:
command: |
set +e
declare -i test_status
ls -al ./bazel-bin/secretflow_serving/tools
ls -al ./bazel-bin/secretflow_serving/tools/simple_feature_service
python3 .ci/integration_test.py 2>&1 | tee integration_test.log; test_status=${PIPESTATUS[0]}
exit ${test_status}
- store_artifacts:
4 changes: 2 additions & 2 deletions .circleci/release-config.yml
Original file line number Diff line number Diff line change
@@ -30,12 +30,12 @@ parameters:
executors:
linux_x64_executor: # declares a reusable executor
docker:
- image: secretflow/release-ci:latest
- image: secretflow/release-ci:20240619
resource_class: 2xlarge+
shell: /bin/bash --login -eo pipefail
linux_aarch64_executor:
docker:
- image: secretflow/release-ci-aarch64:latest
- image: secretflow/release-ci-aarch64:20240619
resource_class: arm.2xlarge
shell: /bin/bash --login -eo pipefail
macos_arm64_executor:
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -23,6 +23,6 @@ jobs:
steps:
- name: secretflow-serving-deploy
id: secretflow-serving-deploy
uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.1.0
uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.2.0
env:
CCI_TOKEN: ${{ secrets.CCI_TOKEN }}
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -11,6 +11,16 @@

> please add your unreleased change here.
## 20240820 - 0.6.0b0

- [Feature] enhanced Retry Strategy
- [Feature] support Kuscia Dataproxy model source
- [Infra] refator the communication logic between parties.

## 20240716 - 0.5.0b0

- [DOC] add docs for secretflow_serving_lib

## 20240625 - 0.4.0b0

- [Feature] `MERGE_Y` operator support `EXP_TAYLOR` link function
4 changes: 4 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -22,6 +22,10 @@ load("@yacl//bazel:repositories.bzl", "yacl_deps")

yacl_deps()

load("@dataproxy//dataproxy_sdk/bazel:repositories.bzl", "dataproxy_deps")

dataproxy_deps()

load(
"@rules_foreign_cc//foreign_cc:repositories.bzl",
"rules_foreign_cc_dependencies",
166 changes: 0 additions & 166 deletions bazel/arrow.BUILD

This file was deleted.

38 changes: 0 additions & 38 deletions bazel/brotli.BUILD

This file was deleted.

39 changes: 0 additions & 39 deletions bazel/bzip2.BUILD

This file was deleted.

31 changes: 0 additions & 31 deletions bazel/double_conversion.BUILD

This file was deleted.

37 changes: 0 additions & 37 deletions bazel/lz4.BUILD

This file was deleted.

Loading