Merge branch 'jose/modern-petscinfo' into 'main'

Sync with PETSc: update output_files after change in -info See merge request slepc/slepc!438
firedrakeproject · Sep 8, 2022 · 759057d · 759057d
2 parents 91aeba3 + 5c9be83
commit 759057d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -163,7 +163,7 @@ gnu-c99-mlib-static:
 gnu-lint:
   extends: .stage-1
   tags:
-    - linux-fedora, name:jepri
+    - linux-debian, name:selene
   variables:
     PETSC_CONFIG_OPTS: --with-fc=0 --with-debugging=1
     TEST_SEARCH: eps_tests-test10_1
@@ -426,7 +426,7 @@ pip-install:
   extends: .test
   stage: stage-2
   tags:
-    - pip, name:jepri
+    - pip, name:selene
   before_script:
     - date
     - hostname
@@ -506,7 +506,7 @@ gnu-c-c99-nompi:
     - .stage-3
     - .linux_test
   tags:
-    - linux-fedora, name:jepri
+    - name:sejmet
   variables:
     PETSC_CONFIG_OPTS: --CFLAGS='-std=c99 -pedantic -Wno-long-long -Wno-overlength-strings' --with-fortran-bindings=0 --with-mpi=0
     SLEPC_CONFIG_OPTS: --DATAFILESPATH=/var/local --with-arpack-lib='-L/usr/local/opt/arpack-ng-3.8.0/lib -Wl,-rpath,/usr/local/opt/arpack-ng-3.8.0/lib -lparpack -larpack' --with-blopex-dir=/usr/local/opt/blopex --with-trlan-dir=/usr/local/opt/trlan-201009 --with-packages-download-dir=/var/local/downloads --download-primme --download-primme-cflags=-std=c99
@@ -526,7 +526,7 @@ gnu-c-complex:
     - .stage-3
     - .linux_test
   tags:
-    - linux-fedora, name:jepri
+    - name:selene
   variables:
     PETSC_CONFIG_OPTS: --with-scalar-type=complex --with-petsc4py
     SLEPC_CONFIG_OPTS: --DATAFILESPATH=/var/local --with-arpack-dir=/usr/local/opt/arpack-ng-3.8.0 --download-primme --download-blopex --with-packages-download-dir=/var/local/downloads --with-slepc4py
@@ -560,7 +560,7 @@ clang-c-complex:
     - .stage-3
     - .linux_test
   tags:
-    - linux-fedora, compiler:clang, name:jepri
+    - compiler:clang, name:maat
   variables:
     PETSC_CONFIG_OPTS: --with-cc=/opt/mpich/clang/bin/mpicc --with-cxx=/opt/mpich/clang/bin/mpicxx --with-fc=0 --with-mpiexec=/opt/mpich/clang/bin/mpiexec --with-scalar-type=complex
     SLEPC_CONFIG_OPTS: --DATAFILESPATH=/var/local --with-primme-dir=/usr/local/opt/primme-3.2 --with-blopex-dir=/usr/local/opt/blopex
@@ -582,7 +582,7 @@ gnu-c-float128:
     - .stage-3
     - .linux_test
   tags:
-    - linux-fedora, name:jepri
+    - name:athor
   variables:
     PETSC_CONFIG_OPTS: --download-f2cblaslapack --with-precision=__float128
     SLEPC_CONFIG_OPTS: --DATAFILESPATH=/var/local
@@ -603,7 +603,7 @@ gnu-c-single:
     - .stage-3
     - .linux_test
   tags:
-    - linux-fedora, name:jepri
+    - name:selene
   variables:
     PETSC_CONFIG_OPTS: --with-precision=single --download-scalapack
     SLEPC_CONFIG_OPTS: --DATAFILESPATH=/var/local --with-arpack-dir=/usr/local/opt/arpack-ng-3.8.0
@@ -718,7 +718,7 @@ clang-c-single:
     - .stage-2
     - .linux_test
   tags:
-    - compiler:clang, name:jepri
+    - compiler:clang, name:maat
   variables:
     PETSC_CONFIG_OPTS: --with-cc=/opt/mpich/clang/bin/mpicc --with-cxx=/opt/mpich/clang/bin/mpicxx --with-fc=0 --with-mpiexec=/opt/mpich/clang/bin/mpiexec --with-precision=single
     SLEPC_CONFIG_OPTS: --DATAFILESPATH=/var/local --with-packages-download-dir=/var/local/downloads --download-primme
@@ -728,7 +728,7 @@ gnu-c-complex-single:
     - .stage-3
     - .linux_test
   tags:
-    - compiler:clang, name:jepri
+    - name:selene
   variables:
     PETSC_CONFIG_OPTS: --with-precision=single --with-scalar-type=complex
     SLEPC_CONFIG_OPTS: --DATAFILESPATH=/var/local --with-packages-download-dir=/var/local/downloads --download-primme --download-arpack
@@ -748,7 +748,7 @@ gnu-c-nocxx:
     - .stage-3
     - .linux_test
   tags:
-    - name:jepri
+    - name:athor
   variables:
     PETSC_CONFIG_OPTS: --with-cxx=0 --COPTFLAGS='-g -O -fsanitize=address' --FOPTFLAGS='-g -O -fsanitize=address'
     SLEPC_CONFIG_OPTS: --DATAFILESPATH=/var/local --with-packages-download-dir=/var/local/downloads --download-primme --download-arpack

diff --git a/src/lme/tests/output/test1_3.out b/src/lme/tests/output/test1_3.out
@@ -1,27 +1,27 @@
-[0] SlepcInitialize(): SLEPc successfully started
+[0] <sys> SlepcInitialize(): SLEPc successfully started
 
 Lyapunov equation, N=100 (10x10 grid)
 
-[0] MatSetUp(): Warning not preallocating matrix storage
-[0] MatAssemblyEnd_SeqAIJ(): Matrix size: 100 X 100; storage space: 40 unneeded,460 used
-[0] MatAssemblyEnd_SeqAIJ(): Number of mallocs during MatSetValues() is 0
-[0] MatAssemblyEnd_SeqAIJ(): Maximum nonzeros in any row is 5
-[0] MatCheckCompressedRow(): Found the ratio (num_zerorows 0)/(num_localrows 100) < 0.6. Do not use CompressedRow routines.
-[0] MatSeqAIJCheckInode(): Found 100 nodes out of 100 rows. Not using Inode routines
-[0] MatSetUp(): Warning not preallocating matrix storage
+[0] <mat> MatSetUp(): Warning not preallocating matrix storage
+[0] <mat> MatAssemblyEnd_SeqAIJ(): Matrix size: 100 X 100; storage space: 40 unneeded,460 used
+[0] <mat> MatAssemblyEnd_SeqAIJ(): Number of mallocs during MatSetValues() is 0
+[0] <mat> MatAssemblyEnd_SeqAIJ(): Maximum nonzeros in any row is 5
+[0] <mat> MatCheckCompressedRow(): Found the ratio (num_zerorows 0)/(num_localrows 100) < 0.6. Do not use CompressedRow routines.
+[0] <mat> MatSeqAIJCheckInode(): Found 100 nodes out of 100 rows. Not using Inode routines
+[0] <mat> MatSetUp(): Warning not preallocating matrix storage
  Equation type set to 1
  Equation type changed to 0
  Solver being used: krylov
  Tolerance: -2., max iterations: 100
  Subspace dimension: 21
  Erroring out if convergence fails
-[0] LMEDenseHessLyapunovChol(): Residual norm of dense Lyapunov equation = (removed)
-[0] LMEDenseHessLyapunovChol(): Residual norm of dense Lyapunov equation = (removed)
-[0] LMEDenseHessLyapunovChol(): Residual norm of dense Lyapunov equation = (removed)
-[0] LMEDenseHessLyapunovChol(): Residual norm of dense Lyapunov equation = (removed)
+[0] <lme> LMEDenseHessLyapunovChol(): Residual norm of dense Lyapunov equation = (removed)
+[0] <lme> LMEDenseHessLyapunovChol(): Residual norm of dense Lyapunov equation = (removed)
+[0] <lme> LMEDenseHessLyapunovChol(): Residual norm of dense Lyapunov equation = (removed)
+[0] <lme> LMEDenseHessLyapunovChol(): Residual norm of dense Lyapunov equation = (removed)
  Error estimate reported by the solver: 2.948e-10
-[0] MatProductSetFromOptions_Private(): MatProductType AB for A seqaij, B seqdense
+[0] <mat> MatProductSetFromOptions_Private(): MatProductType AB for A seqaij, B seqdense
  Computed residual norm: 4.03e-10
 
-[0] SlepcFinalize(): SlepcFinalize() called
-[0] PetscFinalize(): PetscFinalize() called
+[0] <sys> SlepcFinalize(): SlepcFinalize() called
+[0] <sys> PetscFinalize(): PetscFinalize() called
diff --git a/src/lme/tests/output/test2_1.out b/src/lme/tests/output/test2_1.out
@@ -1,5 +1,5 @@
 Dense matrix equations, n=10.
 Solving Lyapunov equation for B
-[0] LMEDenseLyapunov(): Residual norm of dense Lyapunov equation = 1e-14
+[0] <lme> LMEDenseLyapunov(): Residual norm of dense Lyapunov equation = 1e-14
 Solving Lyapunov equation for C (Cholesky)
-[0] LMEDenseHessLyapunovChol(): Residual norm of dense Lyapunov equation = 1e-15
+[0] <lme> LMEDenseHessLyapunovChol(): Residual norm of dense Lyapunov equation = 1e-15