Moving few definitions around

stacks/pinot-noir/definitions_stack.yaml

@@ -198,10 +198,9 @@ definitions:
       - fftw ++mpi +openmp
       - hdf5@1.14.3 ++mpi
       - hpcg
-      - netcdf-c
+      - netcdf-c ++mpi
       - osu-micro-benchmarks +graphing
       - parmetis
-      - scorep
       - scotch ++mpi
 
   - gcc_mpi_codes:
@@ -209,8 +208,12 @@ definitions:
       - netcdf-fortran
       - openfoam-org +metis
       - phylobayesmpi
+      - scorep
       - wrf ~pnetcdf build_type=dm+sm
 
+  - oneapi_mpi_codes:
+      - scorep
+
   - nvhpc_mpi_codes:
       - boost ++mpi
 
@@ -240,7 +243,6 @@ definitions:
   - mpi_blas_python_codes:
       - petsc
       - slepc
-      - sirius
 
   - gcc_mpi_blas_python_codes:
       - adios2
@@ -263,6 +265,7 @@ definitions:
       - py-tensorflow
       - py-torch
       - py-torchvision
+      - sirius
       - topaz
 
   # -------------------------------------------------------------------------