Skip to content

Commit

Permalink
Merge pull request plumed#704 from plumed/fortran-typesafe
Browse files Browse the repository at this point in the history
Fortran typesafe
  • Loading branch information
GiovanniBussi authored Jun 25, 2021
2 parents 945fd55 + 033f3af commit 1db9045
Show file tree
Hide file tree
Showing 20 changed files with 1,488 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,12 @@ jobs:
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
sudo apt-get update
sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-mkl intel-oneapi-mkl-devel
sudo apt-get install intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-mkl intel-oneapi-mkl-devel intel-oneapi-compiler-fortran
source /opt/intel/oneapi/setvars.sh
printenv >> $GITHUB_ENV
echo "CXX=icpc" >> $GITHUB_ENV
echo "CC=icc" >> $GITHUB_ENV
echo "FC=ifort" >> $GITHUB_ENV
- name: Install MPI
# install MPI at last since it modifies CC and CXX
if: contains( matrix.variant, '-mpi-' )
Expand Down
2 changes: 2 additions & 0 deletions docker/fedora34
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ WORKDIR /home/plumed
COPY plumed2.tgz /home/plumed

# build and test plumed (no install)
# FC is needed on gfortran 10 to pass regression tests
RUN . /etc/bashrc \
&& module load mpi \
&& export OMPI_MCA_btl_base_warn_component_unused=0 \
Expand All @@ -29,6 +30,7 @@ RUN . /etc/bashrc \
&& export INCLUDE=$HOME/opt/include:$INCLUDE \
&& export LIBRARY_PATH=$HOME/opt/lib:$LIBRARY_PATH \
&& export LD_LIBRARY_PATH=$HOME/opt/lib:$LD_LIBRARY_PATH \
&& export FC="gfortran -fallow-argument-mismatch" \
&& tar xzf plumed2.tgz \
&& cd plumed2 \
&& export PYTHONPATH=$PWD/python:$PYTHONPATH \
Expand Down
2 changes: 2 additions & 0 deletions fortran/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/test*
/*.mod
Loading

0 comments on commit 1db9045

Please sign in to comment.