From 986bcef160f9d4759e627de41cfbfbf7922d99ef Mon Sep 17 00:00:00 2001
From: Glenn Johnson <glenn-johnson@uiowa.edu>
Date: Sun, 6 Jun 2021 18:15:40 -0500
Subject: darshan-runtime: add SGE scheduler (#24160)

* Set job_id for SGE in darshan-runtime package
* Use a multi value variant for scheduler

Only one scheduler can be selected so make the variant multi valued and
set multi=False.
---
 var/spack/repos/builtin/packages/darshan-runtime/package.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/var/spack/repos/builtin/packages/darshan-runtime/package.py b/var/spack/repos/builtin/packages/darshan-runtime/package.py
index 075a3ddc05..5b58169fa2 100644
--- a/var/spack/repos/builtin/packages/darshan-runtime/package.py
+++ b/var/spack/repos/builtin/packages/darshan-runtime/package.py
@@ -37,14 +37,18 @@ class DarshanRuntime(Package):
     depends_on('hdf5', when='+hdf5')
     depends_on('papi', when='+apxc')
 
-    variant('slurm', default=False, description='Use Slurm Job ID')
-    variant('cobalt', default=False, description='Use Coblat Job Id')
-    variant('pbs', default=False, description='Use PBS Job Id')
     variant('mpi', default=True, description='Compile with MPI support')
     variant('hdf5', default=False, description='Compile with HDF5 module')
     variant('apmpi', default=False, description='Compile with AutoPerf MPI module')
     variant('apmpi_sync', default=False, description='Compile with AutoPerf MPI module (with collective synchronization timing)')
     variant('apxc', default=False, description='Compile with AutoPerf XC module')
+    variant(
+        'scheduler',
+        default='NONE',
+        description='queue system scheduler JOB ID',
+        values=('NONE', 'cobalt', 'pbs', 'sge', 'slurm'),
+        multi=False
+    )
 
     conflicts('+hdf5', when='@:3.1.8',
               msg='+hdf5 variant only available starting from version 3.2.0')
@@ -64,6 +68,8 @@ class DarshanRuntime(Package):
             job_id = 'COBALT_JOBID'
         if '+pbs' in spec:
             job_id = 'PBS_JOBID'
+        if '+sge' in spec:
+            job_id = 'JOB_ID'
 
         # TODO: BG-Q and other platform configure options
         options = []
-- 
cgit v1.2.3-70-g09d2