From d732ad2bd358e9db3d8e3a0293ccc175cb0ad833 Mon Sep 17 00:00:00 2001 From: Kyle Shores Date: Thu, 14 Mar 2024 14:35:21 -0500 Subject: [PATCH] removing gfortran dependencies for builds that don't need them --- docker/Dockerfile | 4 ---- docker/Dockerfile.memcheck | 4 ---- docker/Dockerfile.mpi | 2 -- docker/Dockerfile.mpi_openmp | 2 -- docker/Dockerfile.openmp | 2 -- 5 files changed, 14 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 72e3d2a9..e6104d97 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,7 +4,6 @@ RUN dnf -y update \ && dnf -y install \ cmake \ gcc-c++ \ - gcc-gfortran \ gdb \ git \ lcov \ @@ -14,9 +13,6 @@ RUN dnf -y update \ valgrind \ && dnf clean all -# Set environment variables -ENV FC=gfortran - # Copy the musica code COPY . musica diff --git a/docker/Dockerfile.memcheck b/docker/Dockerfile.memcheck index 516f023f..0c1aca9f 100644 --- a/docker/Dockerfile.memcheck +++ b/docker/Dockerfile.memcheck @@ -4,7 +4,6 @@ RUN dnf -y update \ && dnf -y install \ cmake \ gcc-c++ \ - gcc-gfortran \ gdb \ git \ lcov \ @@ -14,9 +13,6 @@ RUN dnf -y update \ valgrind \ && dnf clean all -# Set environment variables -ENV FC=gfortran - # Copy the musica code COPY . musica diff --git a/docker/Dockerfile.mpi b/docker/Dockerfile.mpi index dde8e808..b5e4d7e0 100644 --- a/docker/Dockerfile.mpi +++ b/docker/Dockerfile.mpi @@ -12,7 +12,6 @@ WORKDIR /home/test_user RUN sudo dnf -y install \ cmake \ gcc-c++ \ - gcc-gfortran \ git \ lcov \ make \ @@ -26,7 +25,6 @@ RUN sudo dnf -y install \ ENV PATH="${PATH}:/usr/lib64/openmpi/bin/" ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib64/openmpi/lib" ENV OMP_NUM_THREADS=3 -ENV FC=gfortran # Copy the musica code COPY . musica/ diff --git a/docker/Dockerfile.mpi_openmp b/docker/Dockerfile.mpi_openmp index 7bca962a..a06f1f03 100644 --- a/docker/Dockerfile.mpi_openmp +++ b/docker/Dockerfile.mpi_openmp @@ -12,7 +12,6 @@ WORKDIR /home/test_user RUN sudo dnf -y install \ cmake \ gcc-c++ \ - gcc-gfortran \ git \ lcov \ make \ @@ -26,7 +25,6 @@ RUN sudo dnf -y install \ ENV PATH="${PATH}:/usr/lib64/openmpi/bin/" ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib64/openmpi/lib" ENV OMP_NUM_THREADS=3 -ENV FC=gfortran # copy the MusicBox code COPY . musica/ diff --git a/docker/Dockerfile.openmp b/docker/Dockerfile.openmp index af35da3e..7c48052a 100644 --- a/docker/Dockerfile.openmp +++ b/docker/Dockerfile.openmp @@ -12,7 +12,6 @@ WORKDIR /home/test_user RUN sudo dnf -y install \ cmake \ gcc-c++ \ - gcc-gfortran \ git \ lcov \ make \ @@ -25,7 +24,6 @@ RUN sudo dnf -y install \ # Set environment variables ENV PATH="${PATH}:/usr/lib64/openmpi/bin/" ENV OMP_NUM_THREADS=3 -ENV FC=gfortran # copy the MusicBox code COPY . musica/