Repo sync (#135)

* repo-sync-2024-05-24T13:48:38+0800 * fix patch
secretflow · May 24, 2024 · f0dad15 · f0dad15
1 parent da1b6b5
commit f0dad15
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git a/bazel/patches/emp-tool.patch b/bazel/patches/emp-tool.patch
@@ -161,3 +161,16 @@ index 23bbf42..5101d7e 100644
  		}
  	}
 
+diff --git a/emp-tool/utils/block.h b/emp-tool/utils/block.h
+index f7d3d34..3c25a73 100644
+--- a/emp-tool/utils/block.h
++++ b/emp-tool/utils/block.h
+@@ -19,6 +19,7 @@ inline __m128i _mm_aesdeclast_si128 (__m128i a, __m128i RoundKey)
+ #include <cstring>
+ #include <iostream>
+ #include <iomanip>
++#include <cstdint>
+
+ namespace emp {
+
+
diff --git 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.5b0.tar.gz",
+            "https://github.com/secretflow/yacl/archive/refs/tags/0.4.5b1.tar.gz",
         ],
-        strip_prefix = "yacl-0.4.5b0",
-        sha256 = "68d1dbeb255d404606d3ba9380b915fbbe3886cde575bbe89795657286742bd2",
+        strip_prefix = "yacl-0.4.5b1",
+        sha256 = "28064053b9add0db8e1e8e648421a0579f1d3e7ee8a4bbd7bd5959cb59598088",
     )
 
 def _bazel_platform():

diff --git a/psi/apsi/BUILD.bazel b/psi/apsi/BUILD.bazel
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("//bazel:psi.bzl", "psi_cc_binary", "psi_cc_library", "psi_cc_test")
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@rules_cc//cc:defs.bzl", "cc_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("//bazel:psi.bzl", "psi_cc_binary", "psi_cc_library", "psi_cc_test")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/psi/rr22/BUILD.bazel b/psi/rr22/BUILD.bazel
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("//bazel:psi.bzl", "psi_cc_binary", "psi_cc_library", "psi_cc_test")
 load("@yacl//bazel:yacl.bzl", "AES_COPT_FLAGS")
+load("//bazel:psi.bzl", "psi_cc_binary", "psi_cc_library", "psi_cc_test")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/psi/utils/BUILD.bazel b/psi/utils/BUILD.bazel
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("//bazel:psi.bzl", "psi_cc_library", "psi_cc_test")
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@rules_cc//cc:defs.bzl", "cc_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@yacl//bazel:yacl.bzl", "AES_COPT_FLAGS")
+load("//bazel:psi.bzl", "psi_cc_library", "psi_cc_test")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/psi/utils/csv_checker.h b/psi/utils/csv_checker.h
@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 #include <vector>
 

diff --git a/psi/utils/ec.h b/psi/utils/ec.h
@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 #include <vector>