Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

concrete-sys #1197

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 8 additions & 1 deletion .github/workflows/concrete_compiler_test_cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,16 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Format with clang-format (Cpp)
run: |
sudo apt install moreutils
sudo apt update
sudo apt install -y moreutils clang-format
cd compilers/concrete-compiler/compiler
./scripts/format_cpp.sh
- name: Upload format diff
if: failure()
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: format_diff
path: compilers/concrete-compiler/compiler/format_diff.patch
- name: Format with cmake-format (Cmake)
run: |
pip3 install cmakelang
Expand Down
13 changes: 11 additions & 2 deletions compilers/concrete-compiler/compiler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ ifeq ($(BUILD_TYPE),Debug)
LIBOMP_LINK_TO_LIBSTDCXX_OPT=-DLIBOMP_USE_STDCPPLIB=ON
endif

all: concretecompiler python-bindings build-tests build-benchmarks doc
all: concretecompiler python-bindings build-tests build-benchmarks doc fatlib

# HPX #####################################################

Expand Down Expand Up @@ -195,7 +195,16 @@ clientlib: build-initialized
serverlib: build-initialized
cmake --build $(BUILD_DIR) --target ConcretelangServerLib


ifeq ($(OS), linux)
LIBTOOL_EXTRA_ARGS=--tag=CXX --mode=link cc
else
LIBTOOL_EXTRA_ARGS=
endif
LIBCONCRETE_CPU=$(abspath ../../../backends/concrete-cpu/implementation/target/release/libconcrete_cpu.a)
fatlib: concretecompiler
cmake --build $(BUILD_DIR) --target ConcretelangRuntimeStatic
cd $(BUILD_DIR)/lib && \
libtool $(LIBTOOL_EXTRA_ARGS) -static -o libConcretelangFat.a lib*.a $(LIBCONCRETE_CPU)

GITHUB_URL=https://api.github.com/repos/zama-ai/concrete-compiler-internal
GITHUB_URL_LIST_ARTIFACTS="${GITHUB_URL}/actions/artifacts?name=${KEYSETCACHENAME}&per_page=1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ void emitErrorBadLutSize(Op &op, std::string lutName, std::string inputName,
auto s = op.emitOpError();
s << ": `" << lutName << "` (operand #2)"
<< " inner dimension should have size " << expectedSize << "(=2^"
<< bitWidth << ") to match "
<< "`" << inputName << "` (operand #1)"
<< bitWidth << ") to match " << "`" << inputName << "` (operand #1)"
<< " elements bitwidth (" << bitWidth << ")";
}

Expand Down
Loading
Loading