Skip to content

Commit 7d414b8

Browse files
authored
Prevent dependency building failure in Intel Dockerfile (#7741)
1 parent e71af25 commit 7d414b8

4 files changed

Lines changed: 8 additions & 2 deletions

File tree

.github/workflows/build_test_cmake.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
test:
1212
runs-on: ubuntu-latest
1313
strategy:
14+
fail-fast: false
1415
matrix:
1516
include:
1617
- tag: gnu

.github/workflows/build_test_makefile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
include:
1616
- tag: intel
17-
build_args: "CXX=mpiicpc ELPA_LIB_DIR=/usr/local/lib ELPA_INCLUDE_DIR=/usr/local/include CEREAL_DIR=/usr/include/cereal OPENMP=ON"
17+
build_args: "CXX=mpiicpx ELPA_LIB_DIR=/usr/local/lib ELPA_INCLUDE_DIR=/usr/local/include CEREAL_DIR=/usr/include/cereal OPENMP=ON"
1818
name: "Build with Makefile & Intel compilers"
1919
name: ${{ matrix.name }}
2020
container: ghcr.io/deepmodeling/abacus-${{ matrix.tag }}

.github/workflows/devcontainer.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
startsWith(github.ref, 'refs/tags/v'))
3232
3333
strategy:
34+
fail-fast: false
3435
matrix:
3536
dockerfile:
3637
- gnu

Dockerfile.intel

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ FROM intel/oneapi-hpckit:2025.2.2-0-devel-ubuntu22.04
33
RUN apt-get update && apt-get install -y \
44
bc cmake git gnupg gcc g++ python3-numpy sudo wget vim unzip \
55
libcereal-dev libxc-dev libgtest-dev libgmock-dev libbenchmark-dev \
6-
pkg-config build-essential autoconf automake libtool && \
6+
pkg-config build-essential autoconf automake libtool ca-certificates && \
77
rm -rf /var/lib/apt/lists/*
88

9+
ENV CC="mpiicx"
10+
ENV CXX="mpiicpx"
11+
ENV FC="mpiifx"
12+
913
# https://elpa.mpcdf.mpg.de/software/tarball-archive/ELPA_TARBALL_ARCHIVE.html
1014
RUN cd /tmp && \
1115
ELPA_VER=2022.11.001 && \

0 commit comments

Comments
 (0)