Commit bf59ad85 authored by Mccaskey, Alex's avatar Mccaskey, Alex
Browse files

setup docker ci to work with latest llvm 



Signed-off-by: Mccaskey, Alex's avatarAlex McCaskey <mccaskeyaj@ornl.gov>
parent 799ba176

docker/ci/ubuntu1804/base/Dockerfile

+15 −7
Original line number Diff line number Diff line 
from xacc/ubuntu:18.04

from ubuntu:20.04



run apt-get update && apt-get install -y ninja-build \

    && git clone https://github.com/hfinkel/llvm-project-csp llvm \

    && cd llvm && mkdir build && cd build \

    && cmake -G Ninja ../llvm -DCMAKE_INSTALL_PREFIX=$HOME/.llvm -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_ENABLE_PROJECTS=clang \

    && cmake --build . --target install \

    && ln -sf $HOME/.llvm/bin/llvm-config /usr/bin/ && cd ../../ && rm -rf /llvm /var/lib/apt/lists/*
 
 No newline at end of file
 
ENV DEBIAN_FRONTEND noninteractive 

run apt-get -y update && apt-get install -y gcc g++ git wget gnupg lsb-release \

            libcurl4-openssl-dev python3 \

            libpython3-dev python3-pip libblas-dev ninja-build liblapack-dev \

    && python3 -m pip install ipopo cmake \

    && wget -qO- https://aide-qc.github.io/deploy/aide_qc/debian/PUBLIC-KEY.gpg | apt-key add - \

    && wget -qO- "https://aide-qc.github.io/deploy/aide_qc/debian/$(lsb_release -cs)/aide-qc.list" | tee -a /etc/apt/sources.list.d/aide-qc.list \

    && apt-get update \

    && apt-get install aideqc-llvm 

# run git clone https://github.com/ornl-qci/llvm-project-csp llvm \

#     && cd llvm && mkdir build && cd build \

#     && cmake -G Ninja ../llvm -DCMAKE_INSTALL_PREFIX=$HOME/.llvm -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_ENABLE_PROJECTS="clang;mlir" \

#     && cmake --build . --target install \

#     && ln -sf $HOME/.llvm/bin/llvm-config /usr/bin/ && cd ../../ && rm -rf /llvm /var/lib/apt/lists/*
 
 No newline at end of file

docker/ci/ubuntu1804/master/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ run git clone --recursive https://github.com/eclipse/xacc && cd xacc && mkdir bu 
    && cmake .. \

    && make -j$(nproc) install 

run cd ../../ && git clone -b master https://github.com/ornl-qci/qcor && cd qcor && mkdir build && cd build \

    && cmake .. -DXACC_DIR=~/.xacc -DQCOR_BUILD_TESTS=TRUE \

    && cmake .. -DXACC_DIR=~/.xacc -DLLVM_ROOT=/usr/local/aideqc/llvm -DMLIR_DIR=/usr/local/aideqc/llvm/lib/cmake/mlir -DQCOR_BUILD_TESTS=TRUE \

    && make -j$(nproc) install && ctest --output-on-failure
 
 No newline at end of file