Commit c5590e0b authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Merge branch 'master' into inclusions to use updated CI pipeline

parents ebe0e8c4 f3a4077b

.gitlab-ci.yml

+13 −13
Original line number Diff line number Diff line
@@ -95,25 +95,25 @@ compatibility_stage: 
      - CXX=clang++-17 F77=flang-new-17 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-17/lib -L/usr/lib/gcc/x86_64-linux-gnu/13"  --disable-openmp

      - make clean

      - make -j

      - echo "Running make with Intel ifort and Intel icpx..."

      #- echo "Running make with Intel ifort and Intel icpx..."

      - cd ..

      - rm -rf build_clang17

      - mkdir build_ifort_icpx

      - cd build_ifort_icpx

      - cp -r ../build/* .

      - export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/2024.2/lib

      - export PATH=/opt/intel/oneapi/compiler/2024.2/bin:$PATH

      - CXX=icpx F77=ifort ./configure --with-fflags="-O3 -diag-disable=10448" --disable-openmp

      - make clean

      - make -j

      #- mkdir build_ifort_icpx

      #- cd build_ifort_icpx

      #- cp -r ../build/* .

      #- export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/latest/lib

      #- export PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH

      #- CXX=icpx F77=ifort ./configure --with-fflags="-O3 -diag-disable=10448" --disable-openmp

      #- make clean

      #- make -j

      - echo "Running make with Intel ifx and Intel icpx..."

      - cd ..

      - rm -rf build_ifort_icpx

      #- cd ..

      #- rm -rf build_ifort_icpx

      - mkdir build_ifx_icpx

      - cd build_ifx_icpx

      - cp -r ../build/* .

      - export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/2024.2/lib

      - export PATH=/opt/intel/oneapi/compiler/2024.2/bin:$PATH

      - export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/latest/lib

      - export PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH

      - CXX=icpx F77=ifx ./configure --with-fflags="-O3" --disable-openmp

      - make clean

      - make -j

containers/docker/Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt -y install intel-oneapi-compiler-fortran 
RUN DEBIAN_FRONTEND=noninteractive apt -y install liblapacke-dev liblapacke64-dev libopenblas-openmp-dev libopenblas64-openmp-dev

# install MPI stack

RUN DEBIAN_FRONTEND=noninteractive apt -y install mpi-default-dev mpi-default-bin

#install valgrind

RUN DEBIAN_FRONTEND=noninteractive apt -y install valgrind valgrind-mpi

# install nvidia stuff

COPY --chown=root:root containers/docker/dockerstuff/debian-nonfree/debian.sources /etc/apt/sources.list.d/

RUN apt update