diff --git a/doc/shared/sundials/Install.rst b/doc/shared/sundials/Install.rst index 72ec18c58a..0b778bb07c 100644 --- a/doc/shared/sundials/Install.rst +++ b/doc/shared/sundials/Install.rst @@ -870,8 +870,8 @@ illustration only. .. cmakeoption:: MPIEXEC_PREFLAGS - Specifies flags that come before the MPI executable, but after ``MPIEXEC_EXECUTABLE``, - ``MPIEXEC_NUMPROC_FLAG``, and ``MPIEXEC_MAX_NUMPROCS``. + Specifies flags that come directly after ``MPIEXEC_EXECUTABLE`` and before + ``MPIEXEC_NUMPROC_FLAG`` and ``MPIEXEC_MAX_NUMPROCS``. Default: none @@ -879,7 +879,7 @@ illustration only. .. cmakeoption:: MPIEXEC_POSTFLAGS - Specifies flags that come after the MPI executable but before any other program arguments. + Specifies flags that come after the executable to run but before any other program arguments. Default: none diff --git a/doc/superbuild/source/developers/testing/CI.rst b/doc/superbuild/source/developers/testing/CI.rst index 6cdcffff25..0abf6ff9d9 100644 --- a/doc/superbuild/source/developers/testing/CI.rst +++ b/doc/superbuild/source/developers/testing/CI.rst @@ -166,18 +166,18 @@ Take for example, this Tioga job: .. code-block:: YAML - tioga_rocmcc_620_tpls: - parallel: - matrix: - - COMPILER_SPEC: rocmcc@6.2.0 - AMDGPU_TARGET: [gfx90a] - variables: - # have to use ginkgo@master because our spack version does not have ginkgo@1.8.0: yet (which seems to be needed) - # similarly, we need a newer magma than available to compile with 'rocm@6:' so we turn it off - SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=14 precision=double amdgpu_target=${AMDGPU_TARGET} +rocm+mpi~magma+ginkgo+kokkos ^ginkgo@master+rocm amdgpu_target=${AMDGPU_TARGET} ^kokkos+rocm amdgpu_target=${AMDGPU_TARGET}" - before_script: - - module load rocmcc/6.2.0-magic - extends: [.sundials_job_on_tioga] + tioga_rocmcc_620_tpls: + parallel: + matrix: + - COMPILER_SPEC: rocmcc@6.2.0 + AMDGPU_TARGET: [gfx90a] + variables: + # have to use ginkgo@master because our spack version does not have ginkgo@1.8.0: yet (which seems to be needed) + # similarly, we need a newer magma than available to compile with 'rocm@6:' so we turn it off + SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=14 precision=double amdgpu_target=${AMDGPU_TARGET} +rocm+mpi~magma+ginkgo+kokkos ^ginkgo@master+rocm amdgpu_target=${AMDGPU_TARGET} ^kokkos+rocm amdgpu_target=${AMDGPU_TARGET}" + before_script: + - module load rocmcc/6.2.0-magic + extends: [.sundials_job_on_tioga] The ``parallel:`` and ``matrix:`` keywords could be used to enable creating multiple jobs with different variable values for each instance of the job, e.g., one job using @@ -196,17 +196,17 @@ section of the job, e.g., .. code-block:: YAML - tioga_rocmcc_620_tpls: - parallel: - matrix: - - COMPILER_SPEC: rocmcc@6.2.0 - AMDGPU_TARGET: [gfx90a] - variables: - ON_TIOGA: "OFF" # disable this job - SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=14 precision=double amdgpu_target=${AMDGPU_TARGET} +rocm+mpi~magma+ginkgo+kokkos ^ginkgo@master+rocm amdgpu_target=${AMDGPU_TARGET} ^kokkos+rocm amdgpu_target=${AMDGPU_TARGET}" - before_script: - - module load rocmcc/6.2.0-magic - extends: [.sundials_job_on_tioga] + tioga_rocmcc_620_tpls: + parallel: + matrix: + - COMPILER_SPEC: rocmcc@6.2.0 + AMDGPU_TARGET: [gfx90a] + variables: + ON_TIOGA: "OFF" # disable this job + SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=14 precision=double amdgpu_target=${AMDGPU_TARGET} +rocm+mpi~magma+ginkgo+kokkos ^ginkgo@master+rocm amdgpu_target=${AMDGPU_TARGET} ^kokkos+rocm amdgpu_target=${AMDGPU_TARGET}" + before_script: + - module load rocmcc/6.2.0-magic + extends: [.sundials_job_on_tioga] These variables can also be set when manually or scheduling a pipeline in the GitLab UI.