repo-sync-2024-03-13T19:54:00+0800 (#131)

* repo-sync-2024-03-13T19:54:00+0800

* repo-sync-2024-03-13T20:19:27+0800

* Update .bazelrc

* Update WORKSPACE

.bazelrc

@@ -71,4 +71,9 @@ build:ubsan --linkopt -fsanitize=undefined
 
 test --keep_going
 test --test_output=errors
-test --test_timeout=360
+test --test_timeout=600
+
+coverage --test_timeout=1800
+
+# delete this line when YACL repo is synced
+build:linux --cxxopt -Wno-error=mismatched-new-delete

.circleci/continue-config.yml

@@ -1,3 +1,17 @@
+# 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.
+
 # Use the latest 2.1 version of CircleCI pipeline process engine.
 # See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1

.circleci/release-config.yml

@@ -1,3 +1,17 @@
+# 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.
+
 # Use the latest 2.1 version of CircleCI pipeline process engine.
 # See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1

.clang-format

@@ -17,6 +17,8 @@ IncludeCategories:
 SeparateDefinitionBlocks: Always
 EmptyLineBeforeAccessModifier: LogicalBlock
 InsertNewlineAtEOF: true
+
+DerivePointerAlignment: false
 PointerAlignment: Right
 ReferenceAlignment: Pointer
 QualifierAlignment: Left

.github/workflows/black.yml

@@ -1,3 +1,17 @@
+# 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.
+
 ---
 name: Python Linter
 on:

.github/workflows/buildifier.yml

@@ -1,3 +1,17 @@
+# 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.
+
 ---
 name: Bazel files linter
 on:

.github/workflows/cla.yml

@@ -1,3 +1,17 @@
+# 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.
+
 ---
 name: CLA Assistant
 on:

.github/workflows/clang-format-linter.yml

@@ -1,3 +1,17 @@
+# 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.
+
 ---
 name: Run clang-format Linter
 on:

.github/workflows/trigger-circleci.yml

@@ -1,3 +1,17 @@
+# 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.
+
 name: "Publish Python Package"
 on:
   release:

.github/workflows/yaml-linter.yaml

@@ -1,3 +1,17 @@
+# 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.
+
 ---
 name: Yaml Lint
 on:

README.md

@@ -114,8 +114,8 @@ Architecture Transition Milestones:
 
 - [x] HE SPI: Designed a unified interface that supports all PHE/FHE algorithms.
 - [ ] Implementation of SPI Sketches. (in progress)
-- [ ] Migration of existing algorithms to SPI.
-- [ ] Automated testing framework for PHE/FHE algorithms.
+- [ ] Migration of existing algorithms to SPI. (in progress)
+- [ ] Automated testing framework for PHE/FHE algorithms. (in progress)
 - [ ] Transition of Tensor Lib's underlying layer from Dispatcher to SPI.
 - [ ] Transition of PyLib's underlying layer from Dispatcher to SPI.
 

README_cn.md

@@ -103,9 +103,9 @@ https://www.secretflow.org.cn/docs/heu/
 架构切换里程碑：
 
 - [x] HE SPI：设计一套大一统接口，同时支持所有的 PHE/FHE 算法
-- [ ] 实现 SPI Sketches （doing）
-- [ ] 存量算法迁移至 SPI
-- [ ] HE 算法自动化测试框架
+- [ ] 实现 SPI Sketches (in progress)
+- [ ] 存量算法迁移至 SPI (in progress)
+- [ ] HE 算法自动化测试框架 (in progress)
 - [ ] Tensor Lib 底层从 Dispatcher 切到 SPI
 - [ ] PyLib 底层从 Dispatcher 切到 SPI
 

WORKSPACE

@@ -7,7 +7,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 SECRETFLOW_GIT = "https://github.com/secretflow"
 
-YACL_COMMIT_ID = "cbe5436f27ff9c4c9c7f7f6664f9fb9f6c852ec2"
+YACL_COMMIT_ID = "9a74ab6f4bb0c9c21171e945a379e27fde482cea"
 
 git_repository(
     name = "yacl",
@@ -107,3 +107,9 @@ load("@rules_cuda//cuda:repositories.bzl", "register_detected_cuda_toolchains",
 rules_cuda_dependencies()
 
 register_detected_cuda_toolchains()
+
+#### for other third-party libs ####
+
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()

docs/_static/css/custom.css

@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
+
 html[data-theme="light"] {
     --pst-color-primary: rgb(22 119 255);
     --pst-color-secondary: rgb(22 255 201);

heu/BUILD.bazel

@@ -1,3 +1,17 @@
+# 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.
+
 package(default_visibility = ["//visibility:public"])
 
 ### global configs ###

heu/algorithms/BUILD.bazel

@@ -0,0 +1,26 @@
+# 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.
+
+load("@yacl//bazel:yacl.bzl", "yacl_cc_library")
+load("@bazel_skylib//lib:subpackages.bzl", "subpackages")
+
+package(default_visibility = ["//visibility:public"])
+
+# A collection of all implementation libraries.
+# doc of @bazel_skylib//lib:subpackages.bzl:
+# https://github.com/bazelbuild/bazel-skylib/blob/main/docs/subpackages_doc.md
+yacl_cc_library(
+    name = "algorithms",
+    deps = subpackages.all(exclude = ["common"]),
+)

heu/algorithms/common/BUILD.bazel

@@ -0,0 +1,23 @@
+# 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.
+
+load("@yacl//bazel:yacl.bzl", "yacl_cc_library", "yacl_cc_test")
+
+package(default_visibility = ["//visibility:public"])
+
+yacl_cc_library(
+    name = "type_alias",
+    hdrs = ["type_alias.h"],
+    deps = ["@yacl//yacl/math/mpint"],
+)

heu/spi/he/he_kit.cc → heu/algorithms/common/type_alias.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "heu/spi/he/he_kit.h"
+#pragma once
 
-namespace heu::lib::spi {
+#include "yacl/math/mpint/mp_int.h"
 
-HeFactory& HeFactory::Instance() {
-  static HeFactory factory;
-  return factory;
-}
+namespace heu::algos {
 
-}  // namespace heu::lib::spi
+using yacl::math::MPInt;
+using yacl::math::PrimeType;
+
+}  // namespace heu::algos

heu/algorithms/mock_phe/BUILD.bazel

@@ -0,0 +1,67 @@
+# 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.
+
+load("@yacl//bazel:yacl.bzl", "yacl_cc_library", "yacl_cc_test")
+
+package(default_visibility = ["//visibility:public"])
+
+yacl_cc_library(
+    name = "mock_phe",
+    srcs = ["he_kit.cc"],
+    hdrs = ["he_kit.h"],
+    deps = [
+        ":decryptor",
+        ":encryptor",
+        ":evaluator",
+        "@yacl//yacl/utils:serializer",
+    ],
+    alwayslink = 1,
+)
+
+yacl_cc_library(
+    name = "base",
+    srcs = ["base.cc"],
+    hdrs = ["base.h"],
+    deps = [
+        "//heu/spi/he/sketches/scalar/phe",
+        "@com_github_msgpack_msgpack//:msgpack",
+    ],
+)
+
+yacl_cc_library(
+    name = "encryptor",
+    srcs = ["encryptor.cc"],
+    hdrs = ["encryptor.h"],
+    deps = [
+        ":base",
+    ],
+)
+
+yacl_cc_library(
+    name = "decryptor",
+    srcs = ["decryptor.cc"],
+    hdrs = ["decryptor.h"],
+    deps = [
+        ":base",
+    ],
+)
+
+yacl_cc_library(
+    name = "evaluator",
+    srcs = ["evaluator.cc"],
+    hdrs = ["evaluator.h"],
+    deps = [
+        ":base",
+    ],
+)