From be750e55e2d536961fed46a2798149f227d12037 Mon Sep 17 00:00:00 2001 From: anakinxc Date: Thu, 19 Sep 2024 19:09:03 +0800 Subject: [PATCH 1/8] wip --- .bazelrc | 7 +++-- WORKSPACE | 4 +++ bazel/repositories.bzl | 12 ++++---- libspu/compiler/front_end/BUILD.bazel | 3 +- libspu/compiler/tools/BUILD.bazel | 3 +- libspu/core/shape.h | 30 ++++++++++++------- libspu/dialect/pphlo/IR/ops.cc | 1 + .../mpc/semi2k/beaver/beaver_impl/BUILD.bazel | 2 +- .../beaver/beaver_impl/ttp_server/BUILD.bazel | 2 +- setup.py | 4 +-- 10 files changed, 43 insertions(+), 25 deletions(-) diff --git a/.bazelrc b/.bazelrc index 118c3bd2..2157ce73 100644 --- a/.bazelrc +++ b/.bazelrc @@ -55,11 +55,12 @@ build:linux --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a:-l%:libgcc.a # platform specific config # Bazel will automatic pick platform config since we have enable_platform_specific_config set -build:macos --copt="-Xpreprocessor -fopenmp" +build:macos --copt=-Xclang=-fopenmp build:macos --copt=-Wno-unused-command-line-argument build:macos --features=-supports_dynamic_linker -build:macos --macos_minimum_os=12.0 -build:macos --host_macos_minimum_os=12.0 +build:macos --macos_minimum_os=13.0 +build:macos --host_macos_minimum_os=13.0 +build:macos --action_env MACOSX_DEPLOYMENT_TARGET=13.0 build:linux --copt=-fopenmp build:linux --linkopt=-fopenmp diff --git a/WORKSPACE b/WORKSPACE index 207eb359..8a40fb58 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -53,6 +53,10 @@ rules_foreign_cc_dependencies( register_preinstalled_tools = True, ) +load("@bazel_features//:deps.bzl", "bazel_features_deps") + +bazel_features_deps() + load("@rules_cuda//cuda:repositories.bzl", "register_detected_cuda_toolchains", "rules_cuda_dependencies") rules_cuda_dependencies() diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 1c554868..d3f53839 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -39,10 +39,10 @@ def _yacl(): http_archive, name = "yacl", urls = [ - "https://github.com/secretflow/yacl/archive/refs/tags/0.4.5b4_nightly_20240731.tar.gz", + "https://github.com/secretflow/yacl/archive/refs/tags/0.4.5b5_nightly_20240919.tar.gz", ], - strip_prefix = "yacl-0.4.5b4_nightly_20240731", - sha256 = "952715bd56f6d9386984e9963426a1399bd2bd3702cf3efede9c82591cfab99b", + strip_prefix = "yacl-0.4.5b5_nightly_20240919", + sha256 = "0ef295f6878dce6160fd44e6af59fa369099f736fa8d4a10f9685dda66aefa71", ) def _libpsi(): @@ -50,10 +50,10 @@ def _libpsi(): http_archive, name = "psi", urls = [ - "https://github.com/secretflow/psi/archive/refs/tags/v0.4.0.dev240814.tar.gz", + "https://github.com/secretflow/psi/archive/refs/tags/v0.4.3.dev240919.tar.gz", ], - strip_prefix = "psi-0.4.0.dev240814", - sha256 = "2a16a5751d1b7051f01edd11f1fcf01b67ff4d67ec136e7bc6d1d729d7f22634", + strip_prefix = "psi-0.4.3.dev240919", + sha256 = "1ee34fbbd9a8f36dea8f7c45588a858e8c31f3a38e60e1fc67cb428ea79334e3", ) def _rules_proto_grpc(): diff --git a/libspu/compiler/front_end/BUILD.bazel b/libspu/compiler/front_end/BUILD.bazel index 5cd6691a..1cbca11b 100644 --- a/libspu/compiler/front_end/BUILD.bazel +++ b/libspu/compiler/front_end/BUILD.bazel @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@yacl//bazel:yacl.bzl", "OMP_DEPS") load("//bazel:spu.bzl", "spu_cc_library") spu_cc_library( @@ -60,7 +61,7 @@ spu_cc_library( "@xla//xla/service:zero_sized_hlo_elimination", "@xla//xla/service/gpu/transforms:dot_dimension_sorter", "@xla//xla/translate/hlo_to_mhlo:hlo_module_importer", - ], + ] + OMP_DEPS, ) spu_cc_library( diff --git a/libspu/compiler/tools/BUILD.bazel b/libspu/compiler/tools/BUILD.bazel index 6465c247..562da61b 100644 --- a/libspu/compiler/tools/BUILD.bazel +++ b/libspu/compiler/tools/BUILD.bazel @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@yacl//bazel:yacl.bzl", "OMP_DEPS") load("//bazel:spu.bzl", "spu_cc_binary") package( @@ -32,7 +33,7 @@ spu_cc_binary( "@llvm-project//mlir:Pass", "@xla//xla/mlir_hlo", "@xla//xla/mlir_hlo:mhlo_passes", - ], + ] + OMP_DEPS, ) spu_cc_binary( diff --git a/libspu/core/shape.h b/libspu/core/shape.h index 3b6a5c40..151872e5 100644 --- a/libspu/core/shape.h +++ b/libspu/core/shape.h @@ -22,6 +22,7 @@ #include #include "absl/types/span.h" +#include "fmt/ranges.h" #include "llvm/ADT/ArrayRef.h" #include "libspu/core/prelude.h" @@ -73,8 +74,6 @@ class Shape : public std::vector { bool empty() const { return Base::empty(); } }; -inline auto format_as(const Shape &s) { return fmt::streamed(s); } - class Index : public std::vector { private: using Base = std::vector; @@ -95,8 +94,6 @@ class Index : public std::vector { } }; -inline auto format_as(const Index &idx) { return fmt::streamed(idx); } - using Stride = int64_t; class Strides : public std::vector { @@ -117,8 +114,6 @@ class Strides : public std::vector { } }; -inline auto format_as(const Strides &s) { return fmt::streamed(s); } - class Sizes : public std::vector { private: using Base = std::vector; @@ -135,8 +130,6 @@ class Sizes : public std::vector { } }; -inline auto format_as(const Sizes &s) { return fmt::streamed(s); } - class Axes : public std::vector { private: using Base = std::vector; @@ -153,8 +146,6 @@ class Axes : public std::vector { } }; -inline auto format_as(const Axes &axes) { return fmt::streamed(axes); } - Strides makeCompactStrides(const Shape &shape); int64_t flattenIndex(const Index &index, const Shape &shape); @@ -191,3 +182,22 @@ inline size_t calcFlattenOffset(const Index &indices, const Shape &shape, } } // namespace spu + +namespace fmt { + +template <> +struct formatter : ostream_formatter {}; + +template <> +struct formatter : ostream_formatter {}; + +template <> +struct formatter : ostream_formatter {}; + +template <> +struct formatter : ostream_formatter {}; + +template <> +struct formatter : ostream_formatter {}; + +} // namespace fmt diff --git a/libspu/dialect/pphlo/IR/ops.cc b/libspu/dialect/pphlo/IR/ops.cc index 4d199e93..e65313cc 100644 --- a/libspu/dialect/pphlo/IR/ops.cc +++ b/libspu/dialect/pphlo/IR/ops.cc @@ -15,6 +15,7 @@ #include "libspu/dialect/pphlo/IR/ops.h" #include "fmt/format.h" +#include "fmt/ranges.h" #include "llvm/Support/FormatVariadic.h" #include "mlir/IR/Builders.h" #include "mlir/IR/TypeUtilities.h" diff --git a/libspu/mpc/semi2k/beaver/beaver_impl/BUILD.bazel b/libspu/mpc/semi2k/beaver/beaver_impl/BUILD.bazel index 423b53b0..7ced7026 100644 --- a/libspu/mpc/semi2k/beaver/beaver_impl/BUILD.bazel +++ b/libspu/mpc/semi2k/beaver/beaver_impl/BUILD.bazel @@ -54,7 +54,7 @@ spu_cc_library( "//libspu/mpc/semi2k/beaver:beaver_interface", "//libspu/mpc/semi2k/beaver/beaver_impl/ttp_server:service_cc_proto", "//libspu/mpc/utils:ring_ops", - "@yacl//yacl/crypto/pke:asymmetric_sm2_crypto", + "@yacl//yacl/crypto/pke:sm2_enc", "@yacl//yacl/link", "@yacl//yacl/link/algorithm:barrier", "@yacl//yacl/utils:parallel", diff --git a/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/BUILD.bazel b/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/BUILD.bazel index 816841b3..3b7df2a0 100644 --- a/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/BUILD.bazel +++ b/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/BUILD.bazel @@ -36,7 +36,7 @@ spu_cc_library( ":service_cc_proto", "//libspu/mpc/semi2k/beaver/beaver_impl/trusted_party", "@com_github_brpc_brpc//:brpc", - "@yacl//yacl/crypto/pke:asymmetric_sm2_crypto", + "@yacl//yacl/crypto/pke:sm2_enc", ], ) diff --git a/setup.py b/setup.py index f1585582..cb1cac99 100644 --- a/setup.py +++ b/setup.py @@ -256,9 +256,9 @@ def has_ext_modules(self): if sys.platform == "darwin": # Due to a bug in conda x64 python, platform tag has to be 10_16 for X64 wheel if platform.machine() == "x86_64": - plat_name = "macosx_12_0_x86_64" + plat_name = "macosx_13_0_x86_64" else: - plat_name = "macosx_12_0_arm64" + plat_name = "macosx_13_0_arm64" elif platform.machine() == "aarch64": # Linux aarch64 plat_name = "manylinux_2_28_aarch64" From c7711f91cc944d6e6a3748a106e5d25d7b66ea44 Mon Sep 17 00:00:00 2001 From: anakinxc Date: Sat, 21 Sep 2024 17:14:28 +0800 Subject: [PATCH 2/8] More fixes --- bazel/eigen.BUILD | 2 ++ bazel/repositories.bzl | 4 ++-- experimental/squirrel/BUILD.bazel | 2 +- libspu/core/ndarray_ref.h | 8 +++++++- libspu/core/trace.h | 1 + libspu/mpc/utils/BUILD.bazel | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bazel/eigen.BUILD b/bazel/eigen.BUILD index 73df40c8..80ccf3ca 100644 --- a/bazel/eigen.BUILD +++ b/bazel/eigen.BUILD @@ -20,6 +20,7 @@ # matrices, and related algorithms. load("@rules_cc//cc:defs.bzl", "cc_library") +load("@yacl//bazel:yacl.bzl", "OMP_DEPS") licenses([ # Note: Eigen is an MPL2 library that includes GPL v3 and LGPL v2.1+ code. @@ -64,6 +65,7 @@ cc_library( ], includes = ["."], visibility = ["//visibility:public"], + deps = OMP_DEPS, ) filegroup( diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index d3f53839..1ceee975 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -229,7 +229,7 @@ def _com_github_eigenteam_eigen(): EIGEN_SHA256 = "01fcd68409c038bbcfd16394274c2bf71e2bb6dda89a2319e23fc59a2da17210" maybe( http_archive, - name = "com_github_eigenteam_eigen", + name = "eigen_archive", sha256 = EIGEN_SHA256, build_file = "@spulib//bazel:eigen.BUILD", strip_prefix = "eigen-{commit}".format(commit = EIGEN_COMMIT), @@ -241,7 +241,7 @@ def _com_github_eigenteam_eigen(): def _com_github_nvidia_cutlass(): maybe( http_archive, - name = "com_github_nvidia_cutlass", + name = "cutlass_archive", strip_prefix = "cutlass-3.5.1", urls = [ "https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.5.1.tar.gz", diff --git a/experimental/squirrel/BUILD.bazel b/experimental/squirrel/BUILD.bazel index 5717fcbf..64c794a5 100644 --- a/experimental/squirrel/BUILD.bazel +++ b/experimental/squirrel/BUILD.bazel @@ -60,8 +60,8 @@ spu_cc_library( "//libspu/mpc/cheetah/rlwe:cheetah_rlwe", "//libspu/mpc/cheetah/rlwe:lwe", "//libspu/mpc/cheetah/rlwe:packlwes", - "@com_github_eigenteam_eigen//:eigen3", "@com_github_microsoft_seal//:seal", + "@eigen_archive//:eigen3", "@yacl//yacl/utils:elapsed_timer", ], ) diff --git a/libspu/core/ndarray_ref.h b/libspu/core/ndarray_ref.h index 87e43c2c..b74a0427 100644 --- a/libspu/core/ndarray_ref.h +++ b/libspu/core/ndarray_ref.h @@ -409,7 +409,6 @@ struct SimdTrait { NdArrayRef makeConstantArrayRef(const Type& eltype, const Shape& shape); std::ostream& operator<<(std::ostream& out, const NdArrayRef& v); -inline auto format_as(const spu::NdArrayRef& f) { return fmt::streamed(f); } template class NdArrayView { @@ -491,3 +490,10 @@ struct std::hash { return std::hash{}(r.data()); } }; + +namespace fmt { + +template <> +struct formatter : ostream_formatter {}; + +} // namespace fmt diff --git a/libspu/core/trace.h b/libspu/core/trace.h index d05b798f..dbe4b460 100644 --- a/libspu/core/trace.h +++ b/libspu/core/trace.h @@ -23,6 +23,7 @@ #include "absl/types/span.h" #include "fmt/format.h" +#include "fmt/ranges.h" #include "spdlog/spdlog.h" #include "yacl/link/context.h" diff --git a/libspu/mpc/utils/BUILD.bazel b/libspu/mpc/utils/BUILD.bazel index 7523c4f3..ea70dbb9 100644 --- a/libspu/mpc/utils/BUILD.bazel +++ b/libspu/mpc/utils/BUILD.bazel @@ -106,7 +106,7 @@ spu_cc_library( linkopts = OMP_LINKFLAGS, deps = [ "//libspu/core:parallel_utils", - "@com_github_eigenteam_eigen//:eigen3", + "@eigen_archive//:eigen3", ] + OMP_DEPS, ) From bf889e21cf434f28b3100a3eb87b19f32dedf009 Mon Sep 17 00:00:00 2001 From: anakinxc Date: Sat, 21 Sep 2024 17:15:05 +0800 Subject: [PATCH 3/8] Move to Xcode 16 --- .circleci/continue-config.yml | 2 +- .circleci/release-config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/continue-config.yml b/.circleci/continue-config.yml index df2d3faa..93071b92 100644 --- a/.circleci/continue-config.yml +++ b/.circleci/continue-config.yml @@ -120,7 +120,7 @@ jobs: extra_bazel_test_args: --test_env LD_LIBRARY_PATH=/root/miniconda3/lib/ macOS_ut: macos: - xcode: 15.4.0 + xcode: 16.0.0 resource_class: macos.m1.large.gen1 steps: - checkout diff --git a/.circleci/release-config.yml b/.circleci/release-config.yml index c52b787d..762fa599 100644 --- a/.circleci/release-config.yml +++ b/.circleci/release-config.yml @@ -63,7 +63,7 @@ commands: jobs: macOS_publish: macos: - xcode: 15.4.0 + xcode: 16.0.0 resource_class: macos.m1.large.gen1 parameters: python_ver: From c89983e4097c44dadbcacc9c0c7d5383d87be828 Mon Sep 17 00:00:00 2001 From: anakinxc Date: Sat, 21 Sep 2024 17:36:27 +0800 Subject: [PATCH 4/8] Fix --- .../beaver/beaver_impl/ttp_server/beaver_server.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/beaver_server.cc b/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/beaver_server.cc index 8b7a9903..c83d11d1 100644 --- a/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/beaver_server.cc +++ b/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/beaver_server.cc @@ -21,7 +21,7 @@ #include "spdlog/spdlog.h" #include "yacl/base/byte_container_view.h" #include "yacl/base/exception.h" -#include "yacl/crypto/pke/asymmetric_sm2_crypto.h" +#include "yacl/crypto/pke/sm2_enc.h" #include "libspu/core/ndarray_ref.h" #include "libspu/mpc/common/prg_tensor.h" @@ -49,9 +49,8 @@ class DecryptError : public yacl::Exception { template std::tuple, std::vector>, size_t> -BuildOperand( - const AdjustRequest& req, uint32_t field_size, - const std::unique_ptr& decryptor) { +BuildOperand(const AdjustRequest& req, uint32_t field_size, + const std::unique_ptr& decryptor) { std::vector ops; std::vector> seeds; size_t pad_length = 0; @@ -177,7 +176,7 @@ struct dependent_false : std::false_type {}; template std::vector AdjustImpl( const AdjustRequest& req, - const std::unique_ptr& decryptor) { + const std::unique_ptr& decryptor) { std::vector ret; size_t field_size; if constexpr (std::is_same_v) { @@ -228,7 +227,7 @@ std::vector AdjustImpl( class ServiceImpl final : public BeaverService { private: - std::unique_ptr decryptor_; + std::unique_ptr decryptor_; public: ServiceImpl(const std::string& asym_crypto_schema, From 3c5337b0b1fb472a5ec0663362a411192f22363a Mon Sep 17 00:00:00 2001 From: anakinxc Date: Sat, 21 Sep 2024 17:42:26 +0800 Subject: [PATCH 5/8] Fix --- .bazelrc | 2 +- CONTRIBUTING.md | 2 +- libspu/compiler/front_end/fe.cc | 1 + libspu/mpc/semi2k/beaver/beaver_impl/beaver_ttp.cc | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.bazelrc b/.bazelrc index 2157ce73..7ba09399 100644 --- a/.bazelrc +++ b/.bazelrc @@ -43,7 +43,7 @@ build --copt=-fstack-protector-strong build:linux --copt=-Wl,-z,noexecstack build:macos --copt=-Wa,--noexecstack -test --keep_going +build --keep_going test --test_output=errors build:benchmark --copt -O3 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0aaf7287..9701c407 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,7 +72,7 @@ python3 -m pip install -r requirements-dev.txt #### macOS ```sh -# macOS >= 12.0, Xcode >= 14.0 +# macOS >= 13.0, Xcode >= 15.0 # Install Xcode https://apps.apple.com/us/app/xcode/id497799835?mt=12 diff --git a/libspu/compiler/front_end/fe.cc b/libspu/compiler/front_end/fe.cc index 5bcb693f..7f9529e5 100644 --- a/libspu/compiler/front_end/fe.cc +++ b/libspu/compiler/front_end/fe.cc @@ -14,6 +14,7 @@ #include "libspu/compiler/front_end/fe.h" +#include "fmt/ranges.h" #include "mlir/Dialect/Func/Extensions/InlinerExtension.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/IR/BuiltinOps.h" diff --git a/libspu/mpc/semi2k/beaver/beaver_impl/beaver_ttp.cc b/libspu/mpc/semi2k/beaver/beaver_impl/beaver_ttp.cc index cca2c571..85f15fe0 100644 --- a/libspu/mpc/semi2k/beaver/beaver_impl/beaver_ttp.cc +++ b/libspu/mpc/semi2k/beaver/beaver_impl/beaver_ttp.cc @@ -17,7 +17,7 @@ #include #include -#include "yacl/crypto/pke/asymmetric_sm2_crypto.h" +#include "yacl/crypto/pke/sm2_enc.h" #include "yacl/crypto/rand/rand.h" #include "yacl/link/algorithm/allgather.h" @@ -179,7 +179,7 @@ BeaverTtp::BeaverTtp(std::shared_ptr lctx, Options ops) yacl::Buffer encrypted_seed; { - std::unique_ptr encryptor; + std::unique_ptr encryptor; auto lower_schema = absl::AsciiStrToLower(options_.asym_crypto_schema); if (lower_schema == "sm2") { encryptor = std::make_unique( From 4a3d53cfa69fa1a6925c4d70a75117654330b629 Mon Sep 17 00:00:00 2001 From: anakinxc Date: Sat, 21 Sep 2024 17:55:33 +0800 Subject: [PATCH 6/8] cleanup --- libspu/compiler/tools/BUILD.bazel | 3 +-- libspu/compiler/tools/spu-translate.cc | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libspu/compiler/tools/BUILD.bazel b/libspu/compiler/tools/BUILD.bazel index 562da61b..6465c247 100644 --- a/libspu/compiler/tools/BUILD.bazel +++ b/libspu/compiler/tools/BUILD.bazel @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@yacl//bazel:yacl.bzl", "OMP_DEPS") load("//bazel:spu.bzl", "spu_cc_binary") package( @@ -33,7 +32,7 @@ spu_cc_binary( "@llvm-project//mlir:Pass", "@xla//xla/mlir_hlo", "@xla//xla/mlir_hlo:mhlo_passes", - ] + OMP_DEPS, + ], ) spu_cc_binary( diff --git a/libspu/compiler/tools/spu-translate.cc b/libspu/compiler/tools/spu-translate.cc index 68857fa0..acf2ed87 100644 --- a/libspu/compiler/tools/spu-translate.cc +++ b/libspu/compiler/tools/spu-translate.cc @@ -41,9 +41,6 @@ #include "libspu/compiler/core/core.h" #undef EXPOSE_PIPELINE_BUILDER -template -struct fmt::formatter> : ostream_formatter {}; - llvm::cl::opt ProtocolKind( "protocol_kind", llvm::cl::init(1), llvm::cl::desc("1 for REF2k, 2 for SEMI2k, 3 for ABY3, 4 for Cheetah")); @@ -109,7 +106,7 @@ bool testOpHandler(::spu::SPUContext *sctx, mlir::Operation *op, auto error = xt::fabs(lhs - rhs); - for (auto v : error) { + for (double v : error) { if (v > tol) { llvm::report_fatal_error( fmt::format("Diff {} greater than tol {}", v, tol).c_str()); From bf25a0ef09ef1726bfa3fb8d3274acf43e383302 Mon Sep 17 00:00:00 2001 From: anakinxc Date: Sat, 21 Sep 2024 18:18:36 +0800 Subject: [PATCH 7/8] remove --jobs --- .circleci/continue-config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/continue-config.yml b/.circleci/continue-config.yml index 93071b92..50ff328c 100644 --- a/.circleci/continue-config.yml +++ b/.circleci/continue-config.yml @@ -64,7 +64,7 @@ commands: ../devtools/bazel_cache_setup.py --in_file=../gcs.data --out_file=../gcs.json --min_download - run: name: "build" - command: bazel build <> -c opt --ui_event_filters=-info,-debug,-warning --jobs 20 + command: bazel build <> -c opt --ui_event_filters=-info,-debug,-warning - run: name: "test" command: | From aacb0d951bda337222158bb931038c87b60773d5 Mon Sep 17 00:00:00 2001 From: anakinxc Date: Tue, 24 Sep 2024 11:16:34 +0800 Subject: [PATCH 8/8] Fix merge --- .../mpc/semi2k/beaver/beaver_impl/ttp_server/beaver_server.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/beaver_server.cc b/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/beaver_server.cc index 448d77a9..865cbb9c 100644 --- a/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/beaver_server.cc +++ b/libspu/mpc/semi2k/beaver/beaver_impl/ttp_server/beaver_server.cc @@ -259,7 +259,7 @@ class StreamReader : public brpc::StreamInputHandler { template std::vector AdjustImpl( - const AdjustRequest& req, + const AdjustRequest& req, StreamReader& stream_reader, const std::unique_ptr& decryptor) { std::vector ret; size_t field_size;