Repo sync

.circleci/continue-config.yml

@@ -1,11 +1,11 @@
 # Copyright 2023 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.
@@ -43,7 +43,7 @@ jobs:
             set +e
             declare -i test_status
             bazel test //... -c opt --ui_event_filters=-info,-debug,-warning --test_output=errors --jobs 16 | tee test_result.log; test_status=${PIPESTATUS[0]}
-            
+
             git clone https://github.com/secretflow/devtools.git
             sh devtools/rename-junit-xml.sh
 
@@ -75,10 +75,10 @@ jobs:
             set +e
             declare -i test_status
             bazel test //... -c opt --ui_event_filters=-info,-debug,-warning --test_output=errors | tee test_result.log; test_status=${PIPESTATUS[0]}
-            
+
             git clone https://github.com/secretflow/devtools.git
             sh devtools/rename-junit-xml.sh
-            
+
             find bazel-bin/ -perm +111 -type f -name "*_test"  -print0 | xargs -0 tar -cvzf test_binary.tar.gz
             find bazel-testlogs/ -type f -name "test.log"  -print0 | xargs -0 tar -cvzf test_logs.tar.gz
             exit ${test_status}
@@ -93,7 +93,7 @@ jobs:
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
 workflows:
   unittest:
-    when: << pipeline.parameters.build-and-run >> 
+    when: << pipeline.parameters.build-and-run >>
     jobs:
       - linux_ut:
           matrix:

bazel/msgpack.BUILD

@@ -25,10 +25,12 @@ yacl_cmake_external(
     name = "msgpack",
     cache_entries = {
         "MSGPACK_CXX17": "ON",
+        "MSGPACK_USE_BOOST": "OFF",
         "MSGPACK_BUILD_EXAMPLES": "OFF",
         "BUILD_SHARED_LIBS": "OFF",
         "MSGPACK_BUILD_TESTS": "OFF",
     },
+    defines = ["MSGPACK_NO_BOOST"],
     lib_source = ":all_srcs",
     out_headers_only = True,
 )

bazel/openssl.BUILD

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_foreign_cc//foreign_cc:defs.bzl", "configure_make")
+load("@yacl//bazel:yacl.bzl", "yacl_configure_make")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -28,7 +28,7 @@ config_setting(
     visibility = ["//visibility:private"],
 )
 
-configure_make(
+yacl_configure_make(
     name = "openssl",
     configure_command = select(
         {
@@ -66,10 +66,7 @@ configure_make(
         "libcrypto.a",
     ],
     targets = [
-        # NOTE: $(nproc --all) returns host number of cpus in ANT ACI pod
-        # Hence we choose a fixed number of 4.
-        # "make -j`nproc --all`",
-        "-s -j4",
+        "-s",
         "-s install_sw",
     ],
 )

bazel/patches/brpc.patch

@@ -142,15 +142,3 @@ index a2eea9cf..d5c7372f 100644
      "//conditions:default": [
          "test_file_util_linux.cc",
          "proc_maps_linux_unittest.cc",
-diff --git a/BUILD.bazel b/BUILD.bazel
-index 58e8863d..1b35348a 100644
---- a/BUILD.bazel
-+++ b/BUILD.bazel
-@@ -256,6 +256,7 @@ objc_library(
-         "src/butil/memory/scoped_ptr.h",
-         "src/butil/move.h",
-         "src/butil/port.h",
-+        "src/butil/string_printf.h",
-         "src/butil/posix/eintr_wrapper.h",
-         "src/butil/scoped_generic.h",
-         "src/butil/strings/string16.h",

bazel/patches/ippcp.patch

@@ -170,3 +170,81 @@ index 0015431..f93411c 100644
 
  # DEBUG flags - optimization level = 0, generation GDB information (-g)
  set (CMAKE_C_FLAGS_DEBUG " -O0 -g")
+
+diff --git a/sources/include/dispatcher.h b/sources/include/dispatcher.h
+index 8290df6..a2f93d7 100644
+--- a/sources/include/dispatcher.h
++++ b/sources/include/dispatcher.h
+@@ -92,9 +92,13 @@ extern "C" {
+   #define LIB_W7 LIB_S8
+ #elif defined( _ARCH_EM64T ) && !defined( OSXEM64T ) && !defined( WIN32E ) /* Linux* OS Intel64 supports N0 */
+   enum lib_enum {
+-     LIB_M7=0, LIB_N8=1, LIB_Y8=2, LIB_E9=3, LIB_L9=4, LIB_N0=5, LIB_K0=6, LIB_K1=7,LIB_NOMORE
++     LIB_E9=0, LIB_L9=1, LIB_K0=2, LIB_K1=3,LIB_NOMORE
+   };
+-  #define LIB_PX LIB_M7
++  #define LIB_PX LIB_E9
++  #define LIB_M7 LIB_E9
++  #define LIB_N8 LIB_E9
++  #define LIB_Y8 LIB_E9
++  #define LIB_N0 LIB_L9
+ #elif defined( _ARCH_EM64T ) && !defined( OSXEM64T ) /* Windows* OS Intel64 doesn't support N0 */
+   enum lib_enum {
+      LIB_M7=0, LIB_N8=1, LIB_Y8=2, LIB_E9=3, LIB_L9=4, LIB_K0=5, LIB_K1=6, LIB_NOMORE
+@@ -103,11 +107,12 @@ extern "C" {
+   #define LIB_N0 LIB_L9
+ #elif defined( OSXEM64T )
+   enum lib_enum {
+-     LIB_Y8=0, LIB_E9=1, LIB_L9=2, LIB_K0=3, LIB_K1=4, LIB_NOMORE
++     LIB_E9=0, LIB_L9=1, LIB_K0=2, LIB_K1=3, LIB_NOMORE
+   };
+-  #define LIB_PX LIB_Y8
+-  #define LIB_M7 LIB_Y8
+-  #define LIB_N8 LIB_Y8
++  #define LIB_PX LIB_E9
++  #define LIB_M7 LIB_E9
++  #define LIB_N8 LIB_E9
++  #define LIB_Y8 LIB_E9
+   #define LIB_N0 LIB_L9
+ #elif defined( _ARCH_LRB2 )
+   enum lib_enum {
+diff --git a/sources/include/owndefs.h b/sources/include/owndefs.h
+index dcc1ede..7c1e93e 100644
+--- a/sources/include/owndefs.h
++++ b/sources/include/owndefs.h
+@@ -632,14 +632,14 @@ extern double            __intel_castu64_f64(unsigned __int64 val);
+
+       #elif defined(linux)
+          /* LIN-32, LIN-64 */
+-         #if ( defined(_W7) || defined(_M7) )
++         #if ( defined(_W7) || defined(_E9) )
+          #define _IPP_DATA 1
+          #endif
+
+
+       /* OSX-32, OSX-64 */
+       #elif defined(OSX32) || defined(OSXEM64T)
+-         #if ( defined(_Y8) )
++         #if ( defined(_E9) )
+          #define _IPP_DATA 1
+          #endif
+       #endif
+diff --git a/sources/ippcp/CMakeLists.txt b/sources/ippcp/CMakeLists.txt
+index 315d1a3..8b11c7a 100644
+--- a/sources/ippcp/CMakeLists.txt
++++ b/sources/ippcp/CMakeLists.txt
+@@ -40,12 +40,12 @@ if(WIN32)
+ endif(WIN32)
+ if(UNIX)
+   if(APPLE)
+-    set(BASE_PLATFORM_LIST ${BASE_PLATFORM_LIST} y8 e9 l9 k0 k1)
++    set(BASE_PLATFORM_LIST ${BASE_PLATFORM_LIST} e9 l9 k0 k1)
+   else()
+     if (${ARCH} MATCHES "ia32")
+       set(BASE_PLATFORM_LIST ${BASE_PLATFORM_LIST} w7 s8 p8 g9 h9)
+     else()
+-      set(BASE_PLATFORM_LIST ${BASE_PLATFORM_LIST} m7 n8 y8 e9 l9 n0 k0 k1)
++      set(BASE_PLATFORM_LIST ${BASE_PLATFORM_LIST} e9 l9 k0 k1)
+     endif(${ARCH} MATCHES "ia32")
+   endif(APPLE)
+ endif(UNIX)

bazel/repositories.bzl

@@ -41,7 +41,6 @@ def yacl_deps():
 
     # crypto related
     _com_github_openssl_openssl()
-    _com_github_floodyberry_curve25519_donna()
     _com_github_blake3team_blake3()
     _com_github_intel_ipp()
     _com_github_libsodium()
@@ -67,17 +66,16 @@ def _com_github_brpc_brpc():
     maybe(
         http_archive,
         name = "com_github_brpc_brpc",
-        sha256 = "d286d520ec4d317180d91ea3970494c1b8319c8867229e5c4784998c4536718f",
-        strip_prefix = "brpc-1.6.0",
+        sha256 = "48668cbc943edd1b72551e99c58516249d15767b46ea13a843eb8df1d3d1bc42",
+        strip_prefix = "brpc-1.7.0",
         type = "tar.gz",
         patch_args = ["-p1"],
         patches = [
             "@yacl//bazel:patches/brpc.patch",
             "@yacl//bazel:patches/brpc_m1.patch",
-            "@yacl//bazel:patches/brpc-2324.patch",
         ],
         urls = [
-            "https://github.com/apache/brpc/archive/refs/tags/1.6.0.tar.gz",
+            "https://github.com/apache/brpc/archive/refs/tags/1.7.0.tar.gz",
         ],
     )
 
@@ -137,11 +135,11 @@ def _com_google_absl():
     maybe(
         http_archive,
         name = "com_google_absl",
-        sha256 = "5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36",
+        sha256 = "987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed",
         type = "tar.gz",
-        strip_prefix = "abseil-cpp-20230125.3",
+        strip_prefix = "abseil-cpp-20230802.1",
         urls = [
-            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz",
+            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.tar.gz",
         ],
     )
 
@@ -162,11 +160,11 @@ def _com_github_fmtlib_fmt():
     maybe(
         http_archive,
         name = "com_github_fmtlib_fmt",
-        strip_prefix = "fmt-10.0.0",
-        sha256 = "ede1b6b42188163a3f2e0f25ad5c0637eca564bd8df74d02e31a311dd6b37ad8",
+        strip_prefix = "fmt-10.1.1",
+        sha256 = "78b8c0a72b1c35e4443a7e308df52498252d1cefc2b08c9a97bc9ee6cfe61f8b",
         build_file = "@yacl//bazel:fmtlib.BUILD",
         urls = [
-            "https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz",
+            "https://github.com/fmtlib/fmt/archive/refs/tags/10.1.1.tar.gz",
         ],
     )
 
@@ -219,6 +217,7 @@ def _com_github_blake3team_blake3():
         ],
     )
 
+# Required by protobuf
 def _rule_python():
     maybe(
         http_archive,
@@ -234,23 +233,10 @@ def _rules_foreign_cc():
     maybe(
         http_archive,
         name = "rules_foreign_cc",
-        sha256 = "2a4d07cd64b0719b39a7c12218a3e507672b82a97b98c6a89d38565894cf7c51",
-        strip_prefix = "rules_foreign_cc-0.9.0",
+        sha256 = "476303bd0f1b04cc311fc258f1708a5f6ef82d3091e53fd1977fa20383425a6a",
+        strip_prefix = "rules_foreign_cc-0.10.1",
         urls = [
-            "https://github.com/bazelbuild/rules_foreign_cc/archive/refs/tags/0.9.0.tar.gz",
-        ],
-    )
-
-def _com_github_floodyberry_curve25519_donna():
-    maybe(
-        http_archive,
-        name = "com_github_floodyberry_curve25519_donna",
-        strip_prefix = "curve25519-donna-2fe66b65ea1acb788024f40a3373b8b3e6f4bbb2",
-        sha256 = "ba57d538c241ad30ff85f49102ab2c8dd996148456ed238a8c319f263b7b149a",
-        type = "tar.gz",
-        build_file = "@yacl//bazel:curve25519-donna.BUILD",
-        urls = [
-            "https://github.com/floodyberry/curve25519-donna/archive/2fe66b65ea1acb788024f40a3373b8b3e6f4bbb2.tar.gz",
+            "https://github.com/bazelbuild/rules_foreign_cc/archive/refs/tags/0.10.1.tar.gz",
         ],
     )
 
@@ -287,14 +273,12 @@ def _com_github_google_cpu_features():
     maybe(
         http_archive,
         name = "com_github_google_cpu_features",
-        strip_prefix = "cpu_features-0.8.0",
+        strip_prefix = "cpu_features-0.9.0",
         type = "tar.gz",
-        sha256 = "7021729f2db97aa34f218d12727314f23e8b11eaa2d5a907e8426bcb41d7eaac",
         build_file = "@yacl//bazel:cpu_features.BUILD",
-        patch_args = ["-p1"],
-        patches = ["@yacl//bazel:patches/cpu_features.patch"],
+        sha256 = "bdb3484de8297c49b59955c3b22dba834401bc2df984ef5cfc17acbe69c5018e",
         urls = [
-            "https://github.com/google/cpu_features/archive/refs/tags/v0.8.0.tar.gz",
+            "https://github.com/google/cpu_features/archive/refs/tags/v0.9.0.tar.gz",
         ],
     )
 
@@ -333,10 +317,10 @@ def _com_github_msgpack_msgpack():
         http_archive,
         name = "com_github_msgpack_msgpack",
         type = "tar.gz",
-        strip_prefix = "msgpack-c-cpp-3.3.0",
-        sha256 = "754c3ace499a63e45b77ef4bcab4ee602c2c414f58403bce826b76ffc2f77d0b",
+        strip_prefix = "msgpack-c-cpp-6.1.0",
+        sha256 = "5e63e4d9b12ab528fccf197f7e6908031039b1fc89cd8da0e97fbcbf5a6c6d3a",
         urls = [
-            "https://github.com/msgpack/msgpack-c/archive/refs/tags/cpp-3.3.0.tar.gz",
+            "https://github.com/msgpack/msgpack-c/archive/refs/tags/cpp-6.1.0.tar.gz",
         ],
         build_file = "@yacl//bazel:msgpack.BUILD",
     )

bazel/yacl.bzl

@@ -74,7 +74,7 @@ def yacl_cmake_external(**attrs):
 
 def yacl_configure_make(**attrs):
     if "args" not in attrs:
-        attrs["args"] = ["-j 4"]
+        attrs["args"] = ["-j 8"]
     return configure_make(**attrs)
 
 def yacl_cc_test(