Use the same output format for wrapper as for normal compilers/tools.

MetOffice · Feb 4, 2025 · c4872d7 · c4872d7
1 parent 16bf511
commit c4872d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/source/fab/tools/compiler_wrapper.py b/source/fab/tools/compiler_wrapper.py
@@ -40,9 +40,6 @@ def __init__(self, name: str, exec_name: str,
             mpi=mpi,
             availability_option=self._compiler.availability_option)
 
-    def __str__(self):
-        return f"{type(self).__name__}({self._compiler.name})"
-
     def get_version(self) -> Tuple[int, ...]:
         """Determines the version of the compiler. The implementation in the
         compiler wrapper additionally ensures that the wrapper compiler and

diff --git a/tests/unit_tests/tools/test_compiler_wrapper.py b/tests/unit_tests/tools/test_compiler_wrapper.py
@@ -62,8 +62,8 @@ def test_compiler_wrapper_version_consistency():
             with pytest.raises(RuntimeError) as err:
                 mpicc.get_version()
             assert ("Different version for compiler 'Gcc - gcc: gcc' (8.5.0) "
-                    "and compiler wrapper 'Mpicc(gcc)' (8.6.0)" in
-                    str(err.value))
+                    "and compiler wrapper 'Mpicc - mpicc-gcc: mpicc' (8.6.0)"
+                    in str(err.value))
 
 
 def test_compiler_wrapper_version_compiler_unavailable():
@@ -317,7 +317,7 @@ def test_compiler_wrapper_mpi_gcc():
     '''Tests the MPI enables gcc class.'''
     mpi_gcc = Mpicc(Gcc())
     assert mpi_gcc.name == "mpicc-gcc"
-    assert str(mpi_gcc) == "Mpicc(gcc)"
+    assert str(mpi_gcc) == "Mpicc - mpicc-gcc: mpicc"
     assert isinstance(mpi_gcc, CompilerWrapper)
     assert mpi_gcc.category == Category.C_COMPILER
     assert mpi_gcc.mpi
@@ -328,7 +328,7 @@ def test_compiler_wrapper_mpi_gfortran():
     '''Tests the MPI enabled gfortran class.'''
     mpi_gfortran = Mpif90(Gfortran())
     assert mpi_gfortran.name == "mpif90-gfortran"
-    assert str(mpi_gfortran) == "Mpif90(gfortran)"
+    assert str(mpi_gfortran) == "Mpif90 - mpif90-gfortran: mpif90"
     assert isinstance(mpi_gfortran, CompilerWrapper)
     assert mpi_gfortran.category == Category.FORTRAN_COMPILER
     assert mpi_gfortran.mpi
@@ -339,7 +339,7 @@ def test_compiler_wrapper_mpi_icc():
     '''Tests the MPI enabled icc class.'''
     mpi_icc = Mpicc(Icc())
     assert mpi_icc.name == "mpicc-icc"
-    assert str(mpi_icc) == "Mpicc(icc)"
+    assert str(mpi_icc) == "Mpicc - mpicc-icc: mpicc"
     assert isinstance(mpi_icc, CompilerWrapper)
     assert mpi_icc.category == Category.C_COMPILER
     assert mpi_icc.mpi
@@ -350,7 +350,7 @@ def test_compiler_wrapper_mpi_ifort():
     '''Tests the MPI enabled ifort class.'''
     mpi_ifort = Mpif90(Ifort())
     assert mpi_ifort.name == "mpif90-ifort"
-    assert str(mpi_ifort) == "Mpif90(ifort)"
+    assert str(mpi_ifort) == "Mpif90 - mpif90-ifort: mpif90"
     assert isinstance(mpi_ifort, CompilerWrapper)
     assert mpi_ifort.category == Category.FORTRAN_COMPILER
     assert mpi_ifort.mpi
@@ -361,7 +361,7 @@ def test_compiler_wrapper_cray_icc():
     '''Tests the Cray wrapper for icc.'''
     craycc = CrayCcWrapper(Icc())
     assert craycc.name == "craycc-icc"
-    assert str(craycc) == "CrayCcWrapper(icc)"
+    assert str(craycc) == "CrayCcWrapper - craycc-icc: cc"
     assert isinstance(craycc, CompilerWrapper)
     assert craycc.category == Category.C_COMPILER
     assert craycc.mpi
@@ -372,7 +372,7 @@ def test_compiler_wrapper_cray_ifort():
     '''Tests the Cray wrapper for ifort.'''
     crayftn = CrayFtnWrapper(Ifort())
     assert crayftn.name == "crayftn-ifort"
-    assert str(crayftn) == "CrayFtnWrapper(ifort)"
+    assert str(crayftn) == "CrayFtnWrapper - crayftn-ifort: ftn"
     assert isinstance(crayftn, CompilerWrapper)
     assert crayftn.category == Category.FORTRAN_COMPILER
     assert crayftn.mpi
@@ -383,7 +383,8 @@ def test_compiler_wrapper_cray_gcc():
     '''Tests the Cray wrapper for gcc.'''
     craycc = CrayCcWrapper(Gcc())
     assert craycc.name == "craycc-gcc"
-    assert str(craycc) == "CrayCcWrapper(gcc)"
+
+    assert str(craycc) == "CrayCcWrapper - craycc-gcc: cc"
     assert isinstance(craycc, CompilerWrapper)
     assert craycc.category == Category.C_COMPILER
     assert craycc.mpi
@@ -394,7 +395,7 @@ def test_compiler_wrapper_cray_gfortran():
     '''Tests the Cray wrapper for gfortran.'''
     crayftn = CrayFtnWrapper(Gfortran())
     assert crayftn.name == "crayftn-gfortran"
-    assert str(crayftn) == "CrayFtnWrapper(gfortran)"
+    assert str(crayftn) == "CrayFtnWrapper - crayftn-gfortran: ftn"
     assert isinstance(crayftn, CompilerWrapper)
     assert crayftn.category == Category.FORTRAN_COMPILER
     assert crayftn.mpi