Skip to content

Commit

Permalink
Enable linux arm ci
Browse files Browse the repository at this point in the history
  • Loading branch information
anakinxc committed Dec 10, 2023
1 parent ac4d774 commit 57d87b3
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 3 deletions.
10 changes: 8 additions & 2 deletions .circleci/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ jobs:
# See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
docker:
- image: secretflow/ubuntu-base-ci:latest
resource_class: 2xlarge+
parameters:
resource_class:
type: string
resource_class: << parameters.resource_class >>
shell: /bin/bash --login -eo pipefail
# Add steps to the job
# See: https://circleci.com/docs/2.0/configuration-reference/#steps
Expand Down Expand Up @@ -143,5 +146,8 @@ workflows:
unittest:
when: << pipeline.parameters.build-and-run >>
jobs:
- linux_ut
- linux_ut:
matrix:
parameters:
resource_class: ["2xlarge", "arm-xlarge"]
- macos_ut
20 changes: 19 additions & 1 deletion bazel/patches/apsi.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
From c0ce586da1f98b8603e001852b2f467353a728b4 Mon Sep 17 00:00:00 2001
From: anakinxc <zhengyancheng.zyc@alibaba-inc.com>
Date: Sun, 10 Dec 2023 15:32:12 +0800
Subject: [PATCH] patch

---
CMakeLists.txt | 27 +++------------------------
1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78d54a6..0b50650 100644
index 78d54a6..51ec679 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,25 +140,6 @@ else()
Expand Down Expand Up @@ -39,6 +48,15 @@ index 78d54a6..0b50650 100644
if(APSI_USE_LOG4CPLUS)
target_link_libraries(apsi PUBLIC log4cplus::log4cplus)
endif()
@@ -299,7 +278,7 @@ endif()
if(APSI_FOURQ_AMD64)
target_compile_options(apsi PUBLIC -D_AMD64_)
message(STATUS "FourQlib optimization: arch=AMD64")
-elseif(APSI_FOURQ_ARM64 AND UNIX)
+elseif(APSI_FOURQ_ARM64 AND UNIX AND APPLE)
message(STATUS "FourQlib optimization: arch=ARM64")
else()
target_compile_options(apsi PUBLIC -D_GENERIC_)
@@ -326,7 +305,7 @@ else()
endif()

Expand Down

0 comments on commit 57d87b3

Please sign in to comment.