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

Merge branch 'link_with_lapacke' into 'master' 

Link with LAPACKe

See merge request giacomo.mulas/np_tmcode!24
parents 1aaea3d6 6293080a

.gitlab-ci.yml

+38 −9
Original line number Diff line number Diff line
@@ -18,14 +18,15 @@ workflow: 
    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH



stages:

   - compatibility

   - build

   - run

   - test



building_stage:

   stage: build

compatibility_stage:

   stage: compatibility

   tags: ["np-tmcode"]

   allow_failure: false

   allow_failure: true

   artifacts:

      paths:

         - build/cluster/*
@@ -33,7 +34,6 @@ building_stage: 
         - build/testing/*

         - build/trapping/*

         - build/libnptm/*

         - doc/build/*

      exclude:

         - ".git*"

         - ".git/**/*"
@@ -52,18 +52,44 @@ building_stage: 
      - echo "Running make with gnu compilers version 12..."

      - make clean && BUILDDIR=$PWD/../build_gnu12 CXX=g++-12 FC=gfortran-12 make -j

      - echo "Running make with flang version 16 and clang version 13..."

      - make clean && BUILDDIR=$PWD/../build_clang13-flang16 CXX="clang++-13 -stdlib=libc++" FC=flang-new-16 FCFLAGS=-O3 LDFLAGS=-L/usr/lib/llvm-16/lib make -j

      - make clean && BUILDDIR=$PWD/../build_clang13-flang16 CXX="clang++-13 -stdlib=libstdc++ -I/usr/include/c++/12 -I/usr/include/x86_64-linux-gnu/c++/12" FC=flang-new-16 FCFLAGS=-O3 LDFLAGS="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/12" make -j

      - echo "Running make with flang version 16 and clang version 14..."

      - make clean && BUILDDIR=$PWD/../build_clang14-flang16 CXX="clang++-14 -stdlib=libc++" FC=flang-new-16 FCFLAGS=-O3 LDFLAGS=-L/usr/lib/llvm-16/lib make -j

      - make clean && BUILDDIR=$PWD/../build_clang14-flang16 CXX="clang++-14 -stdlib=libstdc++ -I/usr/include/c++/12 -I/usr/include/x86_64-linux-gnu/c++/12" FC=flang-new-16 FCFLAGS=-O3 LDFLAGS="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/12" make -j

      - echo "Running make with flang version 16 and clang version 15..."

      - make clean && BUILDDIR=$PWD/../build_clang15-flang16 CXX="clang++-15 -stdlib=libc++" FC=flang-new-16 FCFLAGS=-O3 LDFLAGS=-L/usr/lib/llvm-16/lib make -j

      - make clean && BUILDDIR=$PWD/../build_clang15-flang16 CXX="clang++-15 -stdlib=libstdc++ -I/usr/include/c++/12 -I/usr/include/x86_64-linux-gnu/c++/12" FC=flang-new-16 FCFLAGS=-O3 LDFLAGS="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/12" make -j

      - echo "Running make with flang version 16 and clang version 16..."

      - make clean && BUILDDIR=$PWD/../build_clang16-flang16 CXX="clang++-16 -stdlib=libc++" FC=flang-new-16 FCFLAGS=-O3 LDFLAGS=-L/usr/lib/llvm-16/lib make -j

      - make clean && BUILDDIR=$PWD/../build_clang16-flang16 CXX="clang++-16 -stdlib=libstdc++ -I/usr/include/c++/12 -I/usr/include/x86_64-linux-gnu/c++/12" FC=flang-new-16 FCFLAGS=-O3 LDFLAGS="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/12" make -j

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

      - make clean && PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH BUILDDIR=$PWD/../build_ifort-icpx CXX=icpx FC=ifort FCFLAGS="-O3 -diag-disable=10448" make -j

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

      - make clean && LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/latest/lib PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH BUILDDIR=$PWD/../build_ifx-icpx CXX=icpx FC=ifx FCFLAGS=-O3 make -j

      - echo "Finally running make with default compilers..."

   

building_stage:

   stage: build

   tags: ["np-tmcode"]

   allow_failure: false

   artifacts:

      paths:

         - build/cluster/*

         - build/sphere/*

         - build/testing/*

         - build/trapping/*

         - build/libnptm/*

         - doc/build/*

      exclude:

         - ".git*"

         - ".git/**/*"

      expire_in: 2 hours

   script:

      # bash commands to be executed

      - pwd

      - hostname

      - echo $CI_COMMIT_SHA

      - echo $CI_COMMIT_BRANCH

      - echo "Getting system info ..."

      - cat /etc/os-release

      - cd src

      - echo "Running make with default compilers..."

      - make clean && make -j

      - make docs -j && make -C ../doc/build/latex -j
@@ -135,6 +161,9 @@ testing_stage: 
      - python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OCLU --html

      - echo "Testing cluster with 24 spheres"

      - ./np_cluster ../../test_data/cluster/DEDFB_24 ../../test_data/cluster/DCLU_24 .

      - echo "Comparing output of CLUSTER with 24 spheres"

      - export FFILE=../../test_data/cluster/OCLU_24

      - python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OCLU --html

      - echo "Checking consistency among legacy and HDF5 configuration files"

      - ../testing/test_TEDF ../../test_data/cluster/DEDFB_24 c_TEDF c_TEDF.hd5

      - echo "Checking consistency among legacy and HDF5 TM files"

COPYING

0 → 100644
+674 −0

File added.

Preview size limit exceeded, changes collapsed.

README.md

+4 −0
Original line number Diff line number Diff line
@@ -7,3 +7,7 @@ The aim of the project, funded by PNRR-CNS, is to refactor the original, very ol 
The current implementation offers a set of elementary tests to check that the original FORTRAN code can be compiled and executed on a limited set of pre-defined input data. The functionality of this initial stage can be verified by cloning the gitLab repository on a local machine and building the binaries from the `src` folder.



*NOTE:* The building process requires a working installation of the GNU Compiler Collection (`gcc`), of the GNU FORTRAN compiler (`gfortran`) and of the GNU `make` builder.



# License



This project is distributed under the terms of the *GNU General Public License V3.0 or later* (GPL-3.0-or-later). Check the contents of the *COPYING* file for further details.
 
 No newline at end of file

build/README.md

+2 −0
Original line number Diff line number Diff line 
Distributed under the terms of *GNU GPL-3.0-or-later*



# Folder instructions



This directory collects all the output of make builds.

containers/docker/Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ COPY --chown=root:root containers/docker/dockerstuff/intelcomps/oneapi-archive-k 
COPY --chown=root:root containers/docker/dockerstuff/intelcomps/oneAPI.list /etc/apt/sources.list.d/

RUN apt update

RUN DEBIAN_FRONTEND=noninteractive apt -y install intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-compiler-dpcpp-cpp

# install lapacke and its dependencies, both standard and the version with 64 bit integers

RUN DEBIAN_FRONTEND=noninteractive apt -y install liblapacke-dev liblapacke64-dev libopenblas-dev libopenblas-openmp-dev libopenblas64-dev libopenblas64-openmp-dev

# install packages needed to run python scripts for checks

RUN DEBIAN_FRONTEND=noninteractive apt -y install python3 python-is-python3 python3-regex

# install packages needed to run doxygen to create html docs
@@ -51,7 +53,7 @@ FROM debian:bookworm-slim AS np-tmcode-run-minimal 
WORKDIR /root

# install the strictly needed runtime libraries needed to run the executables

# and the python check scripts

RUN DEBIAN_FRONTEND=noninteractive apt update && DEBIAN_FRONTEND=noninteractive apt upgrade && DEBIAN_FRONTEND=noninteractive apt -y install libgfortran5 libgcc-s1 libhdf5-103-1 libstdc++6 libssl3 libcurl4 libsz2 zlib1g libnghttp2-14 libidn2-0 librtmp1 libssh2-1 libpsl5 libgssapi-krb5-2 libldap-2.5-0 libzstd1 libbrotli1 libaec0 libunistring2 libgmp10 libkrb5-3 libk5crypto3 libcom-err2 libkrb5support0 libsasl2-2 libp11-kit0 libtasn1-6 libkeyutils1 libffi8 python3 python-is-python3 python3-regex hdf5-tools && rm -rf /var/lib/apt/lists/*

RUN DEBIAN_FRONTEND=noninteractive apt update && DEBIAN_FRONTEND=noninteractive apt upgrade && DEBIAN_FRONTEND=noninteractive apt -y install libgfortran5 libgcc-s1 libhdf5-103-1 libstdc++6 libssl3 libcurl4 libsz2 zlib1g libnghttp2-14 libidn2-0 librtmp1 libssh2-1 libpsl5 libgssapi-krb5-2 libldap-2.5-0 libzstd1 libbrotli1 libaec0 libunistring2 libgmp10 libkrb5-3 libk5crypto3 libcom-err2 libkrb5support0 libsasl2-2 libp11-kit0 libtasn1-6 libkeyutils1 libffi8 liblapacke64 libopenblas64-0-openmp python3 python-is-python3 python3-regex hdf5-tools && rm -rf /var/lib/apt/lists/*

COPY --from=np-tmcode-run-dev /root /root

# remove everything which is not needed to run the codes

RUN cd /root/np-tmcode && find build -name "*.o" -exec rm -v \{\} \; && find build -name "*.gcno" -exec rm -v \{\} \; && cd src && rm -rvf cluster libnptm trapping include sphere Makefile make.inc README.md && cd .. && rm -rvf containers && cd doc && rm -rvf src && cd build/latex && rm -rvf *.tex *.out *.sty *.ind *.log *.toc *.ilg *.idx *.aux *.eps Makefile class*.pdf