github/concrete
1
1
Fork 0
mirror of https://github.com/zama-ai/concrete.git synced 2026-02-09 03:55:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

ci: update df image to use latest hpx

Browse Source 
also removes some old copies in dockerfile that were meant to reduce
image size. However, as many entities need to be copied now, we might
need to have a better approach for this (using make install maybe), and
copy everything that is necessary into the right place.
This commit is contained in:
youben11
2022-09-09 09:04:34 +01:00
committed by Ayoub Benaissa
parent 0cd9a7984d
commit f88cd95eaf
3 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/continuous-integration.yml vendored
View File

@@ -807,8 +807,8 @@ jobs:
- name: Build Tag and Publish
if: ${{ steps.login.conclusion != 'skipped' }}
run: |
docker build -t $IMAGE:libc_2_28 -f builders/Dockerfile.hpx-env .
docker push $IMAGE:libc_2_28
docker build -t $IMAGE -f builders/Dockerfile.hpx-env .
docker push $IMAGE:latest
- name: Is Image Built
id: is-built

21
builders/Dockerfile.concrete-compiler-df-env
View File

@@ -4,20 +4,14 @@ RUN apt-get update
RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y curl cmake g++ \
build-essential python3 python3-pip \
python3-setuptools ninja-build git \
zlib1g-dev ccache libboost-filesystem-dev libhwloc-dev
zlib1g-dev ccache cmake libboost-filesystem-dev libhwloc-dev
# setup ccache with an unlimited amount of files and storage
RUN ccache -M 0
RUN ccache -F 0
RUN pip install numpy pybind11==2.8 PyYAML
# Setup Concrete
COPY --from=ghcr.io/zama-ai/concrete-compiler-api-env:latest /target/release /concrete/target/release
ENV CONCRETE_PROJECT=/concrete
# Setup HPX
COPY --from=ghcr.io/zama-ai/hpx:latest /hpx /hpx
ENV HPX_INSTALL_DIR=/hpx/build
# Setup Cmake
COPY --from=ghcr.io/zama-ai/hpx:latest /cmake /cmake
ENV PATH=/cmake/cmake-3.22.0-linux-x86_64/bin:${PATH}
# Setup LLVM
COPY /llvm-project /llvm-project
# Setup and build compiler
@@ -25,18 +19,7 @@ COPY /compiler /compiler
WORKDIR /compiler
RUN mkdir -p /build
RUN make DATAFLOW_EXECUTION_ENABLED=ON BUILD_DIR=/build CCACHE=ON \
concretecompiler python-bindings && \
mv /build/tools/concretelang/python_packages/concretelang_core /concretelang_core && \
mv /build/bin/concretecompiler /bin && \
mv /build/lib/libConcretelangRuntime.so /lib && \
rm -rf /build && \
mkdir -p /build/tools/concretelang/python_packages/ && \
mkdir -p /build/bin && \
mkdir -p /build/lib && \
mv /concretelang_core /build/tools/concretelang/python_packages/ && \
mv /bin/concretecompiler /build/bin && \
mv /lib/libConcretelangRuntime.so /build/lib
concretecompiler python-bindings
ENV PYTHONPATH "$PYTHONPATH:/build/tools/concretelang/python_packages/concretelang_core"
ENV PATH "$PATH:/build/bin"
ENV RT_LIB "/build/lib/libConcretelangRuntime.so"
RUN ccache -z

13
builders/Dockerfile.concrete-compiler-env
View File

@@ -15,18 +15,7 @@ COPY /llvm-project /llvm-project
COPY /compiler /compiler
WORKDIR /compiler
RUN mkdir -p /build
RUN make BUILD_DIR=/build CCACHE=ON concretecompiler python-bindings && \
mv /build/tools/concretelang/python_packages/concretelang_core /concretelang_core && \
mv /build/bin/concretecompiler /bin && \
mv /build/lib/libConcretelangRuntime.so /lib && \
rm -rf /build && \
mkdir -p /build/tools/concretelang/python_packages/ && \
mkdir -p /build/bin && \
mkdir -p /build/lib && \
mv /concretelang_core /build/tools/concretelang/python_packages/ && \
mv /bin/concretecompiler /build/bin && \
mv /lib/libConcretelangRuntime.so /build/lib
RUN make BUILD_DIR=/build CCACHE=ON concretecompiler python-bindings
ENV PYTHONPATH "$PYTHONPATH:/build/tools/concretelang/python_packages/concretelang_core"
ENV PATH "$PATH:/build/bin"
ENV RT_LIB "/build/lib/libConcretelangRuntime.so"
RUN ccache -z