Skip to content

[CI] improve intel compiler handling #11714

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.

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

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
88 changes: 3 additions & 85 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ jobs:
python kratos/python_scripts/testing/run_tests.py -l nightly -c python


ubuntu-intel-legacy:
ubuntu-intel:
runs-on: ubuntu-latest
env:
KRATOS_BUILD_TYPE: Custom
Expand All @@ -416,91 +416,9 @@ jobs:
# - name: Installing dependencies
# => must be added to the docker container to avoid reinstalling it in every CI run

- name: Build
shell: bash
run: |
export CC=icc
export CXX=icpc
source /opt/intel/oneapi/setvars.sh
cp .github/workflows/intel_configure.sh configure.sh
bash configure.sh

- name: Running python tests
shell: bash
run: |
source /opt/intel/oneapi/setvars.sh
export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin/Custom
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin/Custom/libs
python3 kratos/python_scripts/testing/run_tests.py -l nightly -c python3

- name: Running MPI C++ tests (2 Cores)
shell: bash
timeout-minutes : 10
run: |
source /opt/intel/oneapi/setvars.sh
export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin/Custom
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin/Custom/libs
mpiexec -np 2 python3 kratos/python_scripts/testing/run_cpp_mpi_tests.py --using-mpi

- name: Running MPI C++ tests (3 Cores)
- name: Installing intel compiler
shell: bash
timeout-minutes : 10
run: |
source /opt/intel/oneapi/setvars.sh
export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin/Custom
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin/Custom/libs
mpiexec -np 3 python3 kratos/python_scripts/testing/run_cpp_mpi_tests.py --using-mpi

- name: Running MPI C++ tests (4 Cores)
shell: bash
timeout-minutes : 10
run: |
source /opt/intel/oneapi/setvars.sh
export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin/Custom
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin/Custom/libs
mpiexec -np 4 python3 kratos/python_scripts/testing/run_cpp_mpi_tests.py --using-mpi

- name: Running Python MPI tests (2 Cores)
shell: bash
run: |
source /opt/intel/oneapi/setvars.sh
export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin/Custom
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin/Custom/libs
python3 kratos/python_scripts/testing/run_python_mpi_tests.py -l mpi_nightly -n 2

- name: Running Python MPI tests (3 Cores)
shell: bash
run: |
source /opt/intel/oneapi/setvars.sh
export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin/Custom
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin/Custom/libs
python3 kratos/python_scripts/testing/run_python_mpi_tests.py -l mpi_nightly -n 3

- name: Running Python MPI tests (4 Cores)
shell: bash
run: |
source /opt/intel/oneapi/setvars.sh
export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin/Custom
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin/Custom/libs
python3 kratos/python_scripts/testing/run_python_mpi_tests.py -l mpi_nightly -n 4


ubuntu-intel:
runs-on: ubuntu-latest
env:
KRATOS_BUILD_TYPE: Custom
OMPI_MCA_rmaps_base_oversubscribe: 1 # Allow oversubscription for MPI (needed for OpenMPI >= 3.0)
OMPI_MCA_btl_vader_single_copy_mechanism: none # suppressing some annoying OpenMPI messages

container:
image: kratosmultiphysics/kratos-image-ci-ubuntu-22-04:latest
options: --user 1001

steps:
- uses: actions/checkout@v4

# - name: Installing dependencies
# => must be added to the docker container to avoid reinstalling it in every CI run
run: apt-get install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic

- name: Build
shell: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ RUN apt-get update -y && apt-get upgrade -y && \
cmake \
gfortran \
git \
intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic \
intel-oneapi-mkl-devel \
valgrind \
libboost-dev \
Expand Down