Switch from ifx to ifort

JCSDA · Dec 24, 2024 · 08f7518 · 08f7518
1 parent 752ae44
commit 08f7518
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/configs/containers/docker-ubuntu-oneapi-impi.yaml b/configs/containers/docker-ubuntu-oneapi-impi.yaml
@@ -26,10 +26,10 @@ spack:
       paths:
         cc: /opt/intel/oneapi/compiler/2024.2/bin/icx
         cxx: /opt/intel/oneapi/compiler/2024.2/bin/icpx
-        f77: /opt/intel/oneapi/compiler/2024.2/bin/ifx
-        fc: /opt/intel/oneapi/compiler/2024.2/bin/ifx
-        #f77: /opt/intel/oneapi/compiler/2024.2/bin/ifort
-        #fc: /opt/intel/oneapi/compiler/2024.2/bin/ifort
+        #f77: /opt/intel/oneapi/compiler/2024.2/bin/ifx
+        #fc: /opt/intel/oneapi/compiler/2024.2/bin/ifx
+        f77: /opt/intel/oneapi/compiler/2024.2/bin/ifort
+        fc: /opt/intel/oneapi/compiler/2024.2/bin/ifort
       flags: {}
       operating_system: ubuntu24.04
       target: x86_64
@@ -272,7 +272,7 @@ spack:
         ENV TZ=Etc/UTC
         ENV CC=icx
         ENV CXX=icpx
-        ENV FC=ifx
+        ENV FC=ifort
       build: |
         # Put output of spack find into a file
         RUN cd /opt/spack-environment && \
@@ -297,22 +297,17 @@ spack:
         COPY --from=builder /root/spack_find.out /root/spack_find.out
         # Make a non-root user:nonroot / group:nonroot for running MPI
         RUN useradd -U -k /etc/skel -s /bin/bash -d /home/nonroot -m nonroot --uid 43891 && \
-        echo "ulimit -s unlimited" >> /home/nonroot/.bashrc && \
-        echo "ulimit -v unlimited" >> /home/nonroot/.bashrc && \
-        echo "export CC=icx" >> /home/nonroot/.bashrc && \
-        echo "export CXX=icpx" >> /home/nonroot/.bashrc && \
-        echo "export FC=ifx" >> /home/nonroot/.bashrc && \
         echo "source /opt/intel/oneapi/setvars.sh" >> /etc/bash.bashrc && \
+        echo "ulimit -s unlimited" >> /etc/bash.bashrc && \
+        echo "ulimit -v unlimited" >> /etc/bash.bashrc && \
+        echo "export CC=icx" >> /etc/bash.bashrc && \
+        echo "export CXX=icpx" >> /etc/bash.bashrc && \
+        echo "export FC=ifort" >> /etc/bash.bashrc && \
+        echo "export jedi_cmake_ROOT=$(ls -d /opt/software/linux-ubuntu*/oneapi-*/jedi-cmake-*)" >> /etc/bash.bashrc && \
+        printf "[credential]\n    helper = cache --timeout=7200\n" >> /root/.gitconfig && \
+        # Replicate gitconfig for nonroot user.
         printf "[credential]\n    helper = cache --timeout=7200\n" >> /home/nonroot/.gitconfig && \
         chown -R nonroot:nonroot /home/nonroot/.gitconfig
-        # Replicate settings for root user
-        RUN echo "ulimit -s unlimited" >> /root/.bashrc && \
-        echo "ulimit -v unlimited" >> /root/.bashrc && \
-        echo "export CC=icx" >> /root/.bashrc && \
-        echo "export CXX=icpx" >> /root/.bashrc && \
-        echo "export FC=ifx" >> /root/.bashrc && \
-        echo "export jedi_cmake_ROOT=$(ls -d /opt/software/linux-ubuntu*/oneapi-*/jedi-cmake-*)" >> /root/.bashrc && \
-        printf "[credential]\n    helper = cache --timeout=7200\n" >> /root/.gitconfig
 
     # Labels for the image
     labels: