Merge remote-tracking branch 'xu-dev/jobmap-implement' into xu-jobmap-integrate

codes/codes-jobmap.h

@@ -25,17 +25,22 @@
 enum codes_jobmap_type {
     /* the "dummy" jobmap is an example implementation. It simply specifies N
      * jobs, with exactly one rank per job, with a trivial mapping */
-    CODES_JOBMAP_DUMMY
+    CODES_JOBMAP_DUMMY,
+    CODES_JOBMAP_DUMPI
 };
 
 struct codes_jobmap_params_dummy {
     int num_jobs;
 };
 
+struct codes_jobmap_params_dumpi {
+    char *alloc_file;
+};
+
+
 /** jobmap interface **/
 
 struct codes_jobmap_ctx;
-
 struct codes_jobmap_id {
     int job;
     int rank; // relative to job

src/Makefile.subdir

@@ -100,6 +100,7 @@ src_libcodes_base_a_SOURCES =  \
 	src/util/codes-jobmap-method-impl.h \
 	src/util/codes-jobmap.c \
 	src/util/jobmap-impl/jobmap-dummy.c \
+	src/util/jobmap-impl/jobmap-list.c\
     src/workload/codes-workload.c \
     src/workload/codes-workload-method.h \
     src/workload/methods/codes-iolang-wrkld.c \

src/util/codes-jobmap.c

@@ -11,6 +11,7 @@
 #include "codes/codes-jobmap.h"
 
 extern struct codes_jobmap_impl jobmap_dummy_impl;
+extern struct codes_jobmap_impl jobmap_list_impl;
 
 struct codes_jobmap_ctx *
 codes_jobmap_configure(enum codes_jobmap_type t, void const * params)
@@ -24,6 +25,9 @@ codes_jobmap_configure(enum codes_jobmap_type t, void const * params)
         case CODES_JOBMAP_DUMMY:
             c->impl = &jobmap_dummy_impl;
             break;
+        case CODES_JOBMAP_DUMPI:
+            c->impl = &jobmap_list_impl;
+            break;
         default:
             free(c);
             fprintf(stderr, "ERROR: unknown jobmap type %d\n", t);

src/util/jobmap-impl/jobmap-list.c

+/*
+ * Copyright (C) 2015 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include "src/util/codes-jobmap-method-impl.h"
+
+#define ERR(str, ...)\
+    do{\
+        fprintf(stderr, "ERROR at %s:%d: " str "\n", __FILE__, __LINE__, ##__VA_ARGS__);\
+        return -1; \
+    }while(0)
+
+struct workload_params {
+    int num_jobs;
+    int *num_rank_job;
+    int **lp_arrays;
+};
+
+static int jobmap_list_configure(void const * params, void ** ctx)
+{
+    struct codes_jobmap_params_dumpi const * p = params;
+    struct workload_params *wp = malloc(sizeof(*wp));
+    assert(wp);
+
+    FILE *alloc_file_name = fopen(p->alloc_file, "r");
+    if(!alloc_file_name)
+    {
+        ERR( "Coudld not open file %s\n ", p->alloc_file);
+    }
+    else{
+        wp->num_jobs = 0;
+        while(!feof(alloc_file_name))
+        {
+            char ch = (char)fgetc(alloc_file_name);
+            if(ch == '\n')
+                wp->num_jobs++;//how many jobs
+        }
+    }
+
+    wp->num_rank_job = malloc(sizeof(wp->num_rank_job)*wp->num_jobs);
+    assert(wp->num_rank_job);
+    for(int i=0; i<wp->num_jobs; i++)
+        wp->num_rank_job[i]=0;
+
+
+    rewind(alloc_file_name);
+    {
+        int job_id = 0;
+        while(!feof(alloc_file_name))
+        {
+            char ch = (char)fgetc(alloc_file_name);
+            if(ch == '\n'){
+                job_id++;//how many jobs
+                continue;
+            }
+            if(ch == ' '){
+                wp->num_rank_job[job_id]++;//how many ranks in each job
+            }
+        }
+
+    }
+
+    wp->lp_arrays = (int **)malloc(sizeof(int *)*wp->num_jobs);
+    for(int i=0; i<wp->num_jobs; i++){
+        wp->lp_arrays[i] = (int *)malloc(sizeof(int)*wp->num_rank_job[i]);
+    }
+
+    rewind(alloc_file_name);
+    for(int i=0; i < wp->num_jobs; i++)
+    {
+        for(int j=0; j < wp->num_rank_job[i]; j++)
+        {
+            fscanf(alloc_file_name, "%d", &wp->lp_arrays[i][j]);
+        }
+    }
+
+    fclose(alloc_file_name);
+    *ctx = wp;
+
+    printf("There are %d Jobs\n", wp->num_jobs);
+    for(int i=0; i < wp->num_jobs; i++)
+    {
+        printf("\nIn Job %d, there are %d ranks, LP list is:\n", i, wp->num_rank_job[i]);
+        for(int j=0; j < wp->num_rank_job[i]; j++)
+        {
+            printf("%d,", wp->lp_arrays[i][j]);
+        }
+        printf("\n==========\n");
+    }
+
+    return 0;
+}
+
+static struct codes_jobmap_id jobmap_list_to_local(int id, void const * ctx)
+{
+    struct codes_jobmap_id rtn;
+    struct workload_params *wp = (struct workload_params*)ctx;
+
+    for(int i=0; i<wp->num_jobs; i++)
+    {
+        for(int j=0; j < wp->num_rank_job[i]; j++)
+        {
+            if(id == wp->lp_arrays[i][j])
+            {
+                rtn.job = i;
+                rtn.rank = j;
+                return rtn;
+            }
+            else{
+                rtn.job = -1;
+                rtn.rank = -1;
+            }
+        }
+    }
+
+    return rtn;
+}
+
+static int jobmap_list_to_global(struct codes_jobmap_id id, void const * ctx)
+{
+
+    struct workload_params *wp = (struct workload_params*)ctx;
+
+    if (id.job < wp->num_jobs)
+        return wp->lp_arrays[id.job][id.rank];
+    else
+        return -1;
+}
+
+int jobmap_list_get_num_jobs(void const * ctx)
+{
+    struct workload_params *wp = (struct workload_params*)ctx;
+    return wp->num_jobs;
+
+}
+
+
+static void jobmap_list_destroy(void * ctx)
+{
+    struct workload_params *wp = (struct workload_params*)ctx;
+    for(int i=0; i<wp->num_jobs; i++){
+        free(wp->lp_arrays[i]);
+    }
+
+    free(wp->lp_arrays);
+
+    free(wp->num_rank_job);
+
+    free(ctx);
+}
+
+
+struct codes_jobmap_impl jobmap_list_impl = {
+    jobmap_list_configure,
+    jobmap_list_destroy,
+    jobmap_list_to_local,
+    jobmap_list_to_global,
+    jobmap_list_get_num_jobs
+};
+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  indent-tabs-mode: nil
+ * End:
+ *
+ * vim: ts=8 sts=4 sw=4 expandtab
+ */

src/workload/codes-workload.c

@@ -135,6 +135,8 @@ void codes_workload_get_next(
             break;
         tmp = tmp->next;
     }
+    if(tmp==NULL)
+        printf("tmp is NULL, rank=%d, app_id = %d", rank, app_id);
     assert(tmp);
     if(tmp->lifo)
     {

src/workload/methods/codes-dumpi-trace-nw-wrkld.c

@@ -713,7 +713,7 @@ void dumpi_trace_nw_workload_get_next(int app_id, int rank, struct codes_workloa
    hash_link = qhash_search(rank_tbl, &cmp);
    if(!hash_link)
    {
-      printf("\n not found for rank id %d ", rank);
+      printf("\n not found for rank id %d , %d", rank, app_id);
       op->op_type = CODES_WK_END;
       return;
    }