Changeset 42

Timestamp:

09/05/14 10:07:41 (11 years ago)

Author:

pkopta

Message:

job array of size 1 patch by E. V.

Location:

branches/slurm-drmaa-1.2.0

Files:

• ChangeLog (modified) (1 diff)
• slurm_drmaa/session.c (modified) (3 diffs)

branches/slurm-drmaa-1.2.0/ChangeLog

@@ +1 @@
+2014-09-05 E V <eliventer@gmail.com>
+        * slurm_drmaa/session.c: job array of size 1 patch
+
 2014-04-22 Michael Gutteridge <michael.gutteridge@gmail.com>
         * slurm_drmaa/job.c, slurm_drmaa/util.c: cpus-per-task patch

branches/slurm-drmaa-1.2.0/slurm_drmaa/session.c

@@ -106 +106 @@
          {
         unsigned i;
-                if( start != end )
-                 {
+                if( start != end ) {
                         n_jobs = (end - start) / incr + 1;
+         } else {
+            n_jobs = 1;
+         }
 
-                        fsd_calloc( job_ids, n_jobs+1, char* );
-                        job_desc.array_inx = fsd_asprintf( "%d-%d:%d", start, end, incr );
-         }
+        fsd_calloc( job_ids, n_jobs+1, char* );
+
+                if ( start != 0 || end != 0 || incr != 0 ) {
+                job_desc.array_inx = fsd_asprintf( "%d-%d:%d", start, end, incr );
+                }
 
                 connection_lock = fsd_mutex_lock( &self->drm_connection_mutex );
@@ -125 +129 @@
                 fsd_log_debug(("job %u submitted", submit_response->job_id));
 
-                if( start != end )
-                {
+                if ( start != 0 || end != 0 || incr != 0 ) {
                         if ( SLURM_SUCCESS == slurm_load_job( &job_info, submit_response->job_id, 0) )
                         {
@@ -145 +148 @@
                         }
                 } else {
-                        fsd_calloc( job_ids, n_jobs+1, char* );
-
                         job_ids[0] = fsd_asprintf( "%d", submit_response->job_id); /* .0*/