From 6a4131fe18d2916b405ddc22edcca14b1c9db99a Mon Sep 17 00:00:00 2001 From: Jamie Cui Date: Thu, 16 May 2024 18:17:51 +0800 Subject: [PATCH 1/2] Bump: yacl --- bazel/repositories.bzl | 6 +++--- psi/kkrt/BUILD.bazel | 6 +++--- psi/kkrt/kkrt_psi.cc | 6 +++--- psi/kkrt/kkrt_psi.h | 2 +- psi/kkrt/receiver.h | 2 +- psi/kkrt/sender.h | 2 +- psi/rr22/BUILD.bazel | 2 +- psi/rr22/rr22_oprf.h | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 5bbd792..131ac90 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -51,10 +51,10 @@ def _yacl(): http_archive, name = "yacl", urls = [ - "https://github.com/secretflow/yacl/archive/refs/tags/0.4.4b3.tar.gz", + "https://github.com/secretflow/yacl/archive/refs/tags/0.4.5b0.tar.gz", ], - strip_prefix = "yacl-0.4.4b3", - sha256 = "c6b5f32e92d2e31c1c5d7176792965fcf332d1ae892ab8b049d2e66f6f47e4f2", + strip_prefix = "yacl-0.4.5b0", + sha256 = "68d1dbeb255d404606d3ba9380b915fbbe3886cde575bbe89795657286742bd2", ) def _bazel_platform(): diff --git a/psi/kkrt/BUILD.bazel b/psi/kkrt/BUILD.bazel index 1b2c4c6..fc22612 100644 --- a/psi/kkrt/BUILD.bazel +++ b/psi/kkrt/BUILD.bazel @@ -27,9 +27,9 @@ psi_cc_library( "@com_google_absl//absl/strings", "@yacl//yacl/crypto/hash:hash_utils", "@yacl//yacl/crypto/rand", - "@yacl//yacl/kernels/algorithms:base_ot", - "@yacl//yacl/kernels/algorithms:iknp_ote", - "@yacl//yacl/kernels/algorithms:kkrt_ote", + "@yacl//yacl/kernel/algorithms:base_ot", + "@yacl//yacl/kernel/algorithms:iknp_ote", + "@yacl//yacl/kernel/algorithms:kkrt_ote", "@yacl//yacl/link", ], ) diff --git a/psi/kkrt/kkrt_psi.cc b/psi/kkrt/kkrt_psi.cc index 50519ab..7d5e652 100644 --- a/psi/kkrt/kkrt_psi.cc +++ b/psi/kkrt/kkrt_psi.cc @@ -25,9 +25,9 @@ #include "yacl/crypto/hash/hash_utils.h" #include "yacl/crypto/rand/rand.h" #include "yacl/crypto/tools/prg.h" -#include "yacl/kernels/algorithms/base_ot.h" -#include "yacl/kernels/algorithms/iknp_ote.h" -#include "yacl/kernels/algorithms/kkrt_ote.h" +#include "yacl/kernel/algorithms/base_ot.h" +#include "yacl/kernel/algorithms/iknp_ote.h" +#include "yacl/kernel/algorithms/kkrt_ote.h" #include "psi/utils/communication.h" #include "psi/utils/cuckoo_index.h" diff --git a/psi/kkrt/kkrt_psi.h b/psi/kkrt/kkrt_psi.h index c97bf8d..3201e8f 100644 --- a/psi/kkrt/kkrt_psi.h +++ b/psi/kkrt/kkrt_psi.h @@ -21,7 +21,7 @@ #include #include -#include "yacl/kernels/algorithms/ot_store.h" +#include "yacl/kernel/algorithms/ot_store.h" #include "yacl/link/link.h" // diff --git a/psi/kkrt/receiver.h b/psi/kkrt/receiver.h index d2cd81d..aa7d694 100644 --- a/psi/kkrt/receiver.h +++ b/psi/kkrt/receiver.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "yacl/kernels/algorithms/ot_store.h" +#include "yacl/kernel/algorithms/ot_store.h" #include "psi/interface.h" #include "psi/utils/hash_bucket_cache.h" diff --git a/psi/kkrt/sender.h b/psi/kkrt/sender.h index 5435373..d9b3cee 100644 --- a/psi/kkrt/sender.h +++ b/psi/kkrt/sender.h @@ -13,7 +13,7 @@ // limitations under the License. #pragma once -#include "yacl/kernels/algorithms/ot_store.h" +#include "yacl/kernel/algorithms/ot_store.h" #include "psi/interface.h" #include "psi/utils/hash_bucket_cache.h" diff --git a/psi/rr22/BUILD.bazel b/psi/rr22/BUILD.bazel index a2f3814..a8668cc 100644 --- a/psi/rr22/BUILD.bazel +++ b/psi/rr22/BUILD.bazel @@ -51,7 +51,7 @@ psi_cc_library( "@yacl//yacl/crypto/rand", "@yacl//yacl/crypto/tools:prg", "@yacl//yacl/crypto/tools:ro", - "@yacl//yacl/kernels/algorithms:silent_vole", + "@yacl//yacl/kernel/algorithms:silent_vole", "@yacl//yacl/link", "@yacl//yacl/math/f2k", "@yacl//yacl/utils:parallel", diff --git a/psi/rr22/rr22_oprf.h b/psi/rr22/rr22_oprf.h index c2b5af7..6579dce 100644 --- a/psi/rr22/rr22_oprf.h +++ b/psi/rr22/rr22_oprf.h @@ -18,7 +18,7 @@ #include #include "yacl/base/int128.h" -#include "yacl/kernels/algorithms/silent_vole.h" +#include "yacl/kernel/algorithms/silent_vole.h" #include "yacl/link/context.h" #include "psi/rr22/okvs/baxos.h" From 60185bcf087c4c0182b7e6ef4f8b26e0b3050e18 Mon Sep 17 00:00:00 2001 From: Jamie Cui Date: Thu, 16 May 2024 18:23:15 +0800 Subject: [PATCH 2/2] format --- psi/rr22/rr22_psi_test.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/psi/rr22/rr22_psi_test.cc b/psi/rr22/rr22_psi_test.cc index ecbcba7..afcb080 100644 --- a/psi/rr22/rr22_psi_test.cc +++ b/psi/rr22/rr22_psi_test.cc @@ -150,7 +150,6 @@ TEST_P(Rr22PsiTest, CompressParamsFalseTest) { EXPECT_EQ(indices_psi, indices); } - INSTANTIATE_TEST_SUITE_P( CorrectTest_Instances, Rr22PsiTest, testing::Values(TestParams{35, Rr22PsiMode::FastMode},