Further consistency between workflows

Author: joewallwork

.github/workflows/test_suite_ubuntu_cpu_gnu.yml

@@ -10,17 +10,21 @@ on:
   # Triggers the workflow on pushes to open pull requests with code changes
   pull_request:
     paths:
+      # This workflow
       - '.github/workflows/test_suite_ubuntu_cpu_gnu.yml'
+      # Source files
       - '**.c'
       - '**.cpp'
       - '**.fypp'
       - '**.f90'
       - '**.F90'
-      - '**.pf'
       - '**.py'
-      - '**.sh'
+      # Unit tests
+      - '**.pf'
+      # Build system
       - '**CMakeLists.txt'
       - '**requirements.txt'
+      # Data
       - '**data/*'
 
   # Allows you to run this workflow manually from the Actions tab
@@ -155,10 +159,10 @@ jobs:
             -DCMAKE_Fortran_COMPILER=gfortran  \
             -DCMAKE_C_COMPILER=gcc  \
             -DCMAKE_CXX_COMPILER=g++  \
-            -DCMAKE_INSTALL_PREFIX=${BUILD_DIR} \
+            -DCMAKE_INSTALL_PREFIX="${BUILD_DIR}" \
             -DCMAKE_BUILD_TESTS=TRUE \
             -DCMAKE_PREFIX_PATH="${PFUNIT_DIR};${Torch_DIR}" \
-            -DCMAKE_Fortran_FLAGS="-std=$FORTRAN_STANDARD"
+            -DCMAKE_Fortran_FLAGS="-std=${FORTRAN_STANDARD}"
           cmake --build .
           cmake --install .
 

.github/workflows/test_suite_ubuntu_cpu_intel.yml

@@ -44,6 +44,7 @@ jobs:
           - toolchain: intel-ifort
             FC: ifort
             MPIFC: mpiifort
+        std: [f08]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -92,6 +93,8 @@ jobs:
           make -j 4 install
 
       - name: Build and install FTorch
+        env:
+          FORTRAN_STANDARD: ${{ matrix.std }}
         run: |
           . ftorch/bin/activate
           VN=$(python -c "import sys; print('.'.join(sys.version.split('.')[:2]))")
@@ -109,10 +112,10 @@ jobs:
             -DCMAKE_CXX_COMPILER=icpx \
             -DCMAKE_Fortran_COMPILER=${{ matrix.FC }} \
             -DMPI_Fortran_COMPILER=${{ matrix.MPIFC }} \
-            -DCMAKE_INSTALL_PREFIX=${BUILD_DIR} \
+            -DCMAKE_INSTALL_PREFIX="${BUILD_DIR}" \
             -DCMAKE_BUILD_TESTS=TRUE \
             -DCMAKE_PREFIX_PATH="${PFUNIT_DIR};${Torch_DIR}" \
-            -DCMAKE_Fortran_FLAGS="-stand f08"
+            -DCMAKE_Fortran_FLAGS="${FORTRAN_STANDARD}"
           cmake --build .
           cmake --install .
 

.github/workflows/test_suite_ubuntu_cuda_gnu.yml

@@ -8,6 +8,7 @@ on:
   push:
     branches: [ "main" ]
     paths:
+      # This workflow
       - '.github/workflows/test_suite_ubuntu_cuda_gnu.yml'
       # Library source files
       - 'src/*.fypp'
@@ -97,6 +98,8 @@ jobs:
           make -j 4 install
 
       - name: Build FTorch
+        env:
+          FORTRAN_STANDARD: f2008
         run: |
           . ftorch/bin/activate
           VN=$(python -c "import sys; print('.'.join(sys.version.split('.')[:2]))")
@@ -109,12 +112,12 @@ jobs:
           cmake .. \
             -DPython_EXECUTABLE="$(which python)" \
             -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_INSTALL_PREFIX=${BUILD_DIR} \
+            -DCMAKE_INSTALL_PREFIX="${BUILD_DIR}" \
             -DCMAKE_BUILD_TESTS=TRUE \
             -DGPU_DEVICE=CUDA \
             -DMULTI_GPU=OFF \
             -DCMAKE_PREFIX_PATH="${PFUNIT_DIR};${Torch_DIR}" \
-            -DCMAKE_Fortran_FLAGS="-std=f2008"
+            -DCMAKE_Fortran_FLAGS="-std=${FORTRAN_STANDARD}"
           cmake --build .
           cmake --install .
 

.github/workflows/test_suite_windows_cpu_intel.yml

@@ -11,17 +11,21 @@ on:
   # # Triggers the workflow on pushes to open pull requests with code changes
   # pull_request:
   #   paths:
+  #     # This workflow
   #     - '.github/workflows/test_suite_windows_cpu_intel.yml'
-  #     - '**.bat'
+  #     # Source files
   #     - '**.c'
   #     - '**.cpp'
   #     - '**.fypp'
   #     - '**.f90'
   #     - '**.F90'
-  #     - '**.pf'
   #     - '**.py'
+  #     # Unit tests
+  #     - '**.pf'
+  #     # Build system
   #     - '**CMakeLists.txt'
   #     - '**requirements.txt'
+  #     # Data
   #     - '**data/*'
 
   # Allows you to run this workflow manually from the Actions tab