Skip to content

Commit

Permalink
More CI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
linusseelinger committed May 19, 2024
1 parent 6b498ca commit 54a9ff8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark-deconvolution-1d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: |
sudo apt update && DEBIAN_FRONTEND="noninteractive" sudo apt install -y python3-pip python3-venv && \
python3 -m venv venv && . venv/bin/activate && \
pip3 install pytest umbridge
pip3 install pytest umbridge cuqi
-
name: Validate output
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmark-heat-1d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: |
sudo apt update && DEBIAN_FRONTEND="noninteractive" sudo apt install -y python3-pip python3-venv && \
python3 -m venv venv && . venv/bin/activate && \
pip3 install pytest umbridge
pip3 install pytest umbridge cuqi
-
name: Validate output
run: |
Expand Down
10 changes: 5 additions & 5 deletions models/cookies-problem/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ FROM ubuntu:mantic

RUN apt update
RUN DEBIAN_FRONTEND=noninteractive apt install -y bash python3-pip pbzip2 wget clang-17 git cmake curl zip pkg-config gfortran lld libomp5-17 libomp-17-dev
RUN pip3 install --break-system-packages umbridge
RUN pip3 install --break-system-packages umbridge


RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \ | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
RUN echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list

RUN apt update
RUN apt install -y intel-basekit
RUN apt install -y intel-basekit
# RUN . /opt/intel/oneapi/setvars.sh

RUN git clone https://gitlab.com/max.martinelli/igatools.git && \
Expand All @@ -20,7 +20,7 @@ RUN git clone https://gitlab.com/max.martinelli/igatools.git && \
cd vcpkg && ./bootstrap-vcpkg.sh

# git checkout a335daa3bf480cb6e57e2ea8522e3817e841a66d && \


WORKDIR /build_igatools
RUN . /opt/intel/oneapi/setvars.sh && cd /build_igatools && \
Expand All @@ -47,10 +47,10 @@ RUN . /opt/intel/oneapi/setvars.sh && cd /build_igatools && \
-DCMAKE_CXX_COMPILER=clang++-17 \
-DBUILD_SHARED_LIBS=ON

RUN make -j8 && \
RUN make -j4 && \
make setup_tests && \
cd tests/ && \
make poisson_lorenzo.release
make poisson_lorenzo.release

WORKDIR /

Expand Down

0 comments on commit 54a9ff8

Please sign in to comment.