repo-sync-2024-01-03T11:32:21+0800

secretflow · Jan 3, 2024 · e5d6965 · e5d6965
1 parent 9e716bb
commit e5d6965
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/.circleci/continue-config.yml b/.circleci/continue-config.yml
@@ -37,12 +37,18 @@ jobs:
     # See: https://circleci.com/docs/2.0/configuration-reference/#steps
     steps:
       - checkout
+      - run:
+          name: Checkout devtools
+          command: git clone https://github.com/secretflow/devtools.git ../devtools
+      - run:
+          name: Setup GCS
+          command: ../devtools/base64_converter.py --str ${gcs_content} --out_file ../gcs.json
       - run:
           name: "build and test"
           command: |
             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]}
+            bazel test //... -c opt --ui_event_filters=-info,-debug,-warning --test_output=errors --jobs 16 --remote_cache=https://storage.googleapis.com/secretflow --google_credentials=../gcs.json --remote_download_minimal | tee test_result.log; test_status=${PIPESTATUS[0]}
 
             git clone https://github.com/secretflow/devtools.git
             sh devtools/rename-junit-xml.sh
@@ -67,14 +73,19 @@ jobs:
       - run:
           name: "Install homebrew dependencies"
           command: |
-            brew install bazel cmake ninja libomp wget md5sha1sum
-            (cd /opt/homebrew/Cellar/bazel/*.*.*/libexec/bin && curl -fLO https://github.com/bazelbuild/bazel/releases/download/6.2.1/bazel-6.2.1-darwin-arm64 && chmod +x bazel-6.2.1-darwin-arm64)
+            brew install bazelisk cmake ninja libomp wget md5sha1sum
+      - run:
+          name: Checkout devtools
+          command: git clone https://github.com/secretflow/devtools.git ../devtools
       - run:
-          name: "test"
+          name: Setup GCS
+          command: ../devtools/base64_converter.py --str ${gcs_content} --out_file ../gcs.json
+      - run:
+          name: "build and test"
           command: |
             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]}
+            bazel test //... -c opt --ui_event_filters=-info,-debug,-warning --test_output=errors --remote_cache=https://storage.googleapis.com/secretflow --google_credentials=../gcs.json --remote_download_minimal | tee test_result.log; test_status=${PIPESTATUS[0]}
 
             git clone https://github.com/secretflow/devtools.git
             sh devtools/rename-junit-xml.sh
@@ -99,4 +110,8 @@ workflows:
           matrix:
             parameters:
               resource_class: ["2xlarge", "arm-xlarge"]
-      - macOS_ut_arm64
+          context:
+            - gcs
+      - macOS_ut_arm64:
+          context:
+            - gcs
diff --git a/yacl/math/galois_field/mcl_field/mcl_field.cc b/yacl/math/galois_field/mcl_field/mcl_field.cc
@@ -305,7 +305,7 @@ T MclField<T, degree>::DeserializeT(ByteContainerView buffer) const {
 template <typename T, size_t degree>
 MclField<T, degree>::MclField(const MPInt& order, Type field_type) {
   switch (field_type) {
-    case Type::Normal: {
+    case Type::Add: {
       order_ = 0_mp;
       order_mul_ = 0_mp;
       order_add_ = order;

diff --git a/yacl/math/mpint/tommath_ext_types.h b/yacl/math/mpint/tommath_ext_types.h
@@ -19,7 +19,7 @@
 #include "yacl/base/int128.h"
 
 #define MP_BITS_TO_DIGITS(bits) ((bits) + MP_DIGIT_BIT - 1) / MP_DIGIT_BIT
-#define MP_BYTES_TO_DIGITS(bytes) MP_BITS_TO_DIGITS((bytes)*CHAR_BIT)
+#define MP_BYTES_TO_DIGITS(bytes) MP_BITS_TO_DIGITS((bytes) * CHAR_BIT)
 
 void mpx_init(mp_int *a);
 void mpx_reserve(mp_int *a, size_t n_digits);