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.

Sign up for GitHub

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

docker: fix oneapi setup #2351

Merged
merged 2 commits into from
Apr 15, 2024
Merged

docker: fix oneapi setup #2351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f35ff9
docker: fix oneapi setup
mloubout Apr 14, 2024
74577c2
docker: make sure mpi4py version requirement is met using the require…
mloubout Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/Dockerfile.devito
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ RUN python3 -m venv /venv && \
/venv/bin/pip install --no-cache-dir --upgrade pip && \
/venv/bin/pip install --no-cache-dir jupyter && \
/venv/bin/pip install --no-cache-dir wheel && \
eval "$MPI4PY_FLAGS /venv/bin/pip install --no-cache-dir mpi4py" && \
/venv/bin/pip install --no-cache-dir -e /app/devito[extras,mpi,tests] && \
eval "$MPI4PY_FLAGS /venv/bin/pip install --no-cache-dir -r /app/devito/requirements-mpi.txt" && \
/venv/bin/pip install --no-cache-dir -e /app/devito[extras,tests] && \
rm -rf ~/.cache/pip

# Usefull utilities
Expand Down
10 changes: 8 additions & 2 deletions docker/Dockerfile.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ RUN apt-get update -y && apt-get dist-upgrade -y && \
# Development packages
libigc-dev intel-igc-cm libigdfcl-dev libigfxcmrt-dev level-zero-dev

ENV MPI4PY_FLAGS='. /opt/intel/oneapi/setvars.sh intel64 && '

##############################################################
# ICC image
# This is a legacy setup that is not built anymore but kept for reference
Expand All @@ -70,12 +72,13 @@ RUN apt-get update -y && apt-get install -y intel-oneapi-compiler-dpcpp-cpp-and-
rm -rf /var/lib/apt/lists/*

# Devito config
ENV I_MPI_CC="icc"
ENV I_MPI_CXX="icpc"
ENV DEVITO_ARCH="icc"
ENV DEVITO_LANGUAGE="openmp"
ENV DEVITO_PLATFORM="intel64"
# MPICC compiler for mpi4py
ENV MPICC=mpiicc
ENV MPI4PY_FLAGS='. /opt/intel/oneapi/setvars.sh && CFLAGS="-cc=icc"'

##############################################################
# ICX OpenMP image
Expand All @@ -87,11 +90,12 @@ RUN apt-get update -y && apt-get install -y intel-oneapi-compiler-dpcpp-cpp inte
rm -rf /var/lib/apt/lists/*

# Devito config
ENV I_MPI_CC="icx"
ENV I_MPI_CXX="icpx"
ENV DEVITO_ARCH="icx"
ENV DEVITO_LANGUAGE="openmp"
# MPICC compiler for mpi4py
ENV MPICC=mpiicc
ENV MPI4PY_FLAGS='. /opt/intel/oneapi/setvars.sh && CFLAGS="-cc=icx"'

##############################################################
# ICX SYCL CPU image
Expand All @@ -102,6 +106,7 @@ FROM icx as cpu-sycl
ENV DEVITO_ARCH="sycl"
ENV DEVITO_LANGUAGE="sycl"
ENV DEVITO_PLATFORM="intel64"
ENV MPICC=sycl

##############################################################
# ICX SYCL GPU image
Expand All @@ -112,3 +117,4 @@ FROM icx as gpu-sycl
ENV DEVITO_ARCH="sycl"
ENV DEVITO_LANGUAGE="sycl"
ENV DEVITO_PLATFORM="intelgpuX"
ENV MPICC=sycl
Loading