Revamp of the binding layer.

parsec/data_dist/hash_datadist.c

@@ -43,7 +43,7 @@ parsec_hash_datadist_t *parsec_hash_datadist_create(int np, int myrank)
     o->hash = (parsec_hash_datadist_entry_t **)calloc(DEFAULT_HASH_SIZE,
                                                      sizeof(parsec_hash_datadist_entry_t *));
 
-    assert(vpmap_get_nb_vp() > 0);
+    assert(parsec_vpmap_get_nb_vp() > 0);
 
     return o;
 }

parsec/data_dist/matrix/grid_2Dcyclic.c

@@ -39,15 +39,15 @@ void parsec_grid_2Dcyclic_init(parsec_grid_2Dcyclic_t *grid, int myrank, int P,
     /* VPMAP data distribution */
     /* TODO:: Users should be able to define it through parameters */
     grid->vp_q = default_vp_data_dist();
-    grid->vp_p = vpmap_get_nb_vp()/default_vp_data_dist();
+    grid->vp_p = parsec_vpmap_get_nb_vp()/default_vp_data_dist();
 }
 
 static
 int default_vp_data_dist()
 {
     int p, q, pq;
     /* default: q >= p, worst case p=1 */
-    pq = vpmap_get_nb_vp();
+    pq = parsec_vpmap_get_nb_vp();
     q = (int)ceilf(sqrtf( (float)pq));
 
     assert(q > 0);

parsec/data_dist/matrix/sym_two_dim_rectangle_cyclic.c

@@ -177,7 +177,7 @@ static int32_t sym_twoDBC_vpid_of(parsec_data_collection_t *desc, ...)
     int32_t vpid;
     dc = (parsec_matrix_sym_block_cyclic_t *)desc;
 
-    pq = vpmap_get_nb_vp();
+    pq = parsec_vpmap_get_nb_vp();
     if ( pq == 1 )
         return 0;
 
@@ -214,7 +214,7 @@ static int32_t sym_twoDBC_vpid_of(parsec_data_collection_t *desc, ...)
     assert( (n % dc->grid.cols) == dc->grid.crank );
 
     vpid = (local_n % q) * p + (local_m % p);
-    assert( vpid < vpmap_get_nb_vp() );
+    assert( vpid < parsec_vpmap_get_nb_vp() );
     return vpid;
 }
 

parsec/data_dist/matrix/two_dim_rectangle_cyclic.c

@@ -302,7 +302,7 @@ static int32_t twoDBC_vpid_of(parsec_data_collection_t *desc, ...)
     dc = (parsec_matrix_block_cyclic_t *)desc;
 
     /* If 1 VP, always return 0 */
-    pq = vpmap_get_nb_vp();
+    pq = parsec_vpmap_get_nb_vp();
     if ( pq == 1 )
         return 0;
 
@@ -337,7 +337,7 @@ static int32_t twoDBC_vpid_of(parsec_data_collection_t *desc, ...)
     assert( (n % dc->grid.cols) == dc->grid.crank );
 
     vpid = (local_n % q) * p + (local_m % p);
-    assert( vpid < vpmap_get_nb_vp() );
+    assert( vpid < parsec_vpmap_get_nb_vp() );
     return vpid;
 }
 
@@ -583,7 +583,7 @@ static int32_t twoDBC_kcyclic_vpid_of(parsec_data_collection_t *desc, ...)
     dc = (parsec_matrix_block_cyclic_t *)desc;
 
     /* If no vp, always return 0 */
-    pq = vpmap_get_nb_vp();
+    pq = parsec_vpmap_get_nb_vp();
     if ( pq == 1 )
         return 0;
 
@@ -619,7 +619,7 @@ static int32_t twoDBC_kcyclic_vpid_of(parsec_data_collection_t *desc, ...)
     local_n += n % dc->grid.kcols;
 
     vpid = (local_n % q) * p + (local_m % p);
-    assert( vpid < vpmap_get_nb_vp() );
+    assert( vpid < parsec_vpmap_get_nb_vp() );
     return vpid;
 }
 

parsec/data_dist/matrix/two_dim_tabular.c

@@ -235,7 +235,7 @@ void parsec_matrix_tabular_set_random_table(parsec_matrix_tabular_t *dc,
                                                 + (nbtiles-1)*sizeof(parsec_two_dim_td_table_elem_t) );
     table->nbelem = nbtiles;
 
-    nbvp = vpmap_get_nb_vp();
+    nbvp = parsec_vpmap_get_nb_vp();
 #if defined(__WINDOWS__)
     rand_s(&rankseed);
     rand_s(&vpseed);

parsec/data_dist/matrix/vector_two_dim_cyclic.c

@@ -196,7 +196,7 @@ static int32_t vector_twoDBC_vpid_of(parsec_data_collection_t *desc, ...)
     dc = (parsec_vector_two_dim_cyclic_t *)desc;
 
     /* If 1 VP, always return 0 */
-    pq = vpmap_get_nb_vp();
+    pq = parsec_vpmap_get_nb_vp();
     if ( pq == 1 )
         return 0;
 
@@ -225,7 +225,7 @@ static int32_t vector_twoDBC_vpid_of(parsec_data_collection_t *desc, ...)
 
     vpid = local_m * q + local_n;
 
-    assert( vpid < vpmap_get_nb_vp() );
+    assert( vpid < parsec_vpmap_get_nb_vp() );
     return vpid;
 }
 

parsec/include/parsec/execution_stream.h

@@ -149,10 +149,16 @@ struct parsec_context_s {
     int comm_th_core;  /* if specified on the MCA subsystem it holds the core where the
                         * communication thread is to be bound.
                         */
-    /* Indicates the HWLOC bitmap of all hardware cores that are described by the MCA
-     * thread location variables.
+    /* Indicates the HWLOC bitmap of all hardware cores that are allowed based
+     * on the process binding constraints imposed by the batch scheduler (or
+     * other startup executable such as mpirun).
      */
     hwloc_cpuset_t cpuset_allowed_mask;
+    /* Indicates the HWLOC bitmap of hardware resources that are currently used
+     * by parsec threads. This includes all threads, including the
+     * communication thread.
+     */
+    hwloc_cpuset_t cpuset_used_mask;
     /* Describe the HWLOC bitmap for all cores that are part of cpuset_allowed_mask
      * but were not used to currently bind computational threads.
      */

parsec/interfaces/dtd/insert_function.c

@@ -2661,7 +2661,7 @@ parsec_dtd_create_and_initialize_task(parsec_dtd_taskpool_t *dtd_tp,
         dtd_task_mempool = &((parsec_dtd_task_class_t *)tc)->remote_task_mempool;
     }
     this_task = (parsec_dtd_task_t *)parsec_thread_mempool_allocate(
-            dtd_task_mempool->thread_mempools + parsec_my_execution_stream()->core_id);
+            dtd_task_mempool->thread_mempools + parsec_my_execution_stream()->th_id);
 
     assert(this_task->super.super.super.obj_reference_count == 1);