Skip to content

Commit

Permalink
fix visualstudio build
Browse files Browse the repository at this point in the history
  • Loading branch information
ndenoyelle committed Oct 22, 2019
1 parent 9533b3b commit cbb230a
Show file tree
Hide file tree
Showing 3 changed files with 134 additions and 133 deletions.
205 changes: 106 additions & 99 deletions hwloc/distrib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,92 +5,111 @@
* See COPYING in top-level directory.
****************************************************************************/

#include <time.h>
#include <stdlib.h>
#include "private/autogen/config.h"
#include "hwloc.h"

struct hwloc_distrib_level{
hwloc_obj_type_t type; // level type.
unsigned depth; // level depth.
size_t user_index; // Index of this level as provided by user order.
size_t arity; // Number of children of this level below parent.
size_t coord; // The current level object index [0..arity[.
unsigned user_index; // Index of this level as provided by user order.
unsigned arity; // Number of children of this level below parent.
unsigned coord; // The current level object index [0..arity[.
// Iteration order of this level objects. index[coord] give logical_index below parent.
size_t *index;
unsigned *index;
};

struct hwloc_distrib_iterator{
hwloc_obj_t *roots;
size_t n_roots;
size_t root_coord;
unsigned n_roots;
unsigned root_coord;
struct hwloc_distrib_level ** levels; // n_roots * n_levels
size_t n_levels;
unsigned n_levels;
};

static size_t* range(const size_t n){
size_t* r = malloc(n*sizeof(*r));
static unsigned* range(const unsigned n){
unsigned i,*r = malloc(n*sizeof(*r));

if(r==NULL) return NULL;
for(size_t i=0; i<n; i++){ r[i] = i; }
if(r==NULL)
return NULL;
for(i=0; i<n; i++)
r[i] = i;
return r;
}

static size_t* reversed_range(const size_t n){
size_t* r = malloc(n*sizeof(*r));
static unsigned* reversed_range(const unsigned n){
unsigned i,*r = malloc(n*sizeof(*r));

if(r==NULL) return NULL;
for(size_t i=0; i<n; i++){ r[i] = n-i-1; }
if(r==NULL)
return NULL;
for(i=0; i<n; i++){ r[i] = n-i-1; }
return r;
}

static size_t* shuffled_range(const size_t n){
size_t i, *index, *ret, val;
static unsigned* shuffled_range(const unsigned n){
unsigned i, *index, *ret, val;

if ((index = range(n)) == NULL)
return NULL;

if ((index = range(n)) == NULL) return NULL;
if ((ret = malloc(n*sizeof(*ret))) == NULL) { free(index); return NULL; }
ret = malloc(n*sizeof(*ret));
if (ret == NULL) {
free(index);
return NULL;
}

srand(time(NULL));
for(i=n;i>0;i--){
val = rand()%(i);
ret[i-1] = index[val];
index[val] = index[i-1];
}
free(index);
return ret;
}
free(index);
return ret;
}

static int hwloc_distrib_level_cmp_depth(const void *la, const void* lb){
const struct hwloc_distrib_level *a = (struct hwloc_distrib_level *)la;
const struct hwloc_distrib_level *b = (struct hwloc_distrib_level *)lb;
if(a->depth > b->depth) { return 1; }
if(a->depth < b->depth) { return -1; }
if(a->depth > b->depth)
return 1;
if(a->depth < b->depth)
return -1;
return 0;
}

static int hwloc_distrib_level_cmp_user_index(const void *la, const void* lb){
const struct hwloc_distrib_level *a = (struct hwloc_distrib_level *)la;
const struct hwloc_distrib_level *b = (struct hwloc_distrib_level *)lb;
if(a->user_index > b->user_index) { return 1; }
if(a->user_index < b->user_index) { return -1; }
if(a->user_index > b->user_index)
return 1;
if(a->user_index < b->user_index)
return -1;
return 0;
}

static struct hwloc_distrib_level *
hwloc_distrib_root_levels(hwloc_topology_t topology,
const hwloc_obj_t root,
const hwloc_obj_type_t *types,
const size_t n_types,
const unsigned n_types,
const unsigned long flags)
{
struct hwloc_distrib_level *levels = malloc(n_types * sizeof(*levels));
unsigned i;
unsigned arity;
hwloc_obj_t parent;
struct hwloc_distrib_level *levels;

levels = malloc(n_types * sizeof(*levels));
if(levels == NULL)
return NULL;

for (size_t i=0; i<n_types; i++){
for (i=0; i<n_types; i++){
levels[i].type = types[i];
levels[i].depth = hwloc_get_type_depth(topology, types[i]);
if (levels[i].depth < 0 ){
fprintf(stderr, "Cannot build iterator with objects %s of negative depth.\n",
hwloc_obj_type_string(types[i]));
fprintf(stderr, "Cannot build iterator with objects %s of negative depth.\n", hwloc_obj_type_string(types[i]));
goto failure;
}
levels[i].index = NULL;
Expand All @@ -100,40 +119,27 @@ hwloc_distrib_root_levels(hwloc_topology_t topology,
}

// Sort by depth to compute arities.
qsort(levels,
n_types,
sizeof(*levels),
hwloc_distrib_level_cmp_depth);
qsort(levels, n_types, sizeof(*levels), hwloc_distrib_level_cmp_depth);

// Walk from top to bottom and set arity to the maximum arity below root field.
size_t arity;
hwloc_obj_t parent=root;
for (size_t i=0; i<n_types; i++){
parent=root;
for (i=0; i<n_types; i++){
while (parent) {
arity = hwloc_get_nbobjs_inside_cpuset_by_depth(topology,
parent->cpuset,
levels[i].depth);
arity = hwloc_get_nbobjs_inside_cpuset_by_depth(topology, parent->cpuset, levels[i].depth);
levels[i].arity = arity > levels[i].arity ? arity : levels[i].arity;
parent = hwloc_get_next_obj_inside_cpuset_by_depth(topology,
root->cpuset,
parent->depth, parent);
parent = hwloc_get_next_obj_inside_cpuset_by_depth(topology, root->cpuset, parent->depth, parent);
}

if (levels[i].arity == 0) {
fprintf(stderr, "No object of type %s below level %s.\n",
hwloc_obj_type_string(levels[i].type),
hwloc_obj_type_string(levels[i-1].type));
fprintf(stderr, "No object of type %s below level %s.\n", hwloc_obj_type_string(levels[i].type), hwloc_obj_type_string(levels[i-1].type));
goto failure;
}

parent = hwloc_get_obj_inside_cpuset_by_depth(topology,
root->cpuset,
levels[i].depth,
0);
parent = hwloc_get_obj_inside_cpuset_by_depth(topology, root->cpuset, levels[i].depth, 0);
}

// Allocate levels index.
for (size_t i=0; i<n_types; i++){
for (i=0; i<n_types; i++){
if (flags & HWLOC_DISTRIB_FLAG_SHUFFLE) {
levels[i].index = shuffled_range(levels[i].arity);
}
Expand Down Expand Up @@ -165,25 +171,26 @@ static void hwloc_distrib_destroy_level(struct hwloc_distrib_level *levels){
struct hwloc_distrib_iterator *
hwloc_distrib_build_iterator(hwloc_topology_t topology,
hwloc_obj_t *roots,
const size_t n_roots,
const unsigned n_roots,
const hwloc_obj_type_t *levels,
const size_t n_levels,
const unsigned n_levels,
const unsigned long flags){

struct hwloc_distrib_iterator *it = malloc(sizeof(*it) +
sizeof(*it->levels) * n_roots);
if(it == NULL) return NULL;
unsigned i;
struct hwloc_distrib_iterator *it = malloc(sizeof(*it) + sizeof(*it->levels) * n_roots);
if(it == NULL)
return NULL;

it->roots = roots;
it->n_roots = n_roots;
it->root_coord = 0;
it->n_levels = n_levels;
it->levels = (struct hwloc_distrib_level **)((char*)it + sizeof(*it));

for(size_t i=0; i<n_roots; i++){
for(i=0; i<n_roots; i++){
it->levels[i] = hwloc_distrib_root_levels(topology, roots[i], levels, n_levels, flags);
if(it->levels[i] == NULL){
while(i--){ hwloc_distrib_destroy_level(it->levels[i]); }
while(i--)
hwloc_distrib_destroy_level(it->levels[i]);
goto failure;
}
}
Expand All @@ -200,19 +207,18 @@ hwloc_distrib_iterator_round_robin(hwloc_topology_t topology,
const hwloc_obj_type_t type,
const unsigned long flags){
hwloc_obj_t root = hwloc_get_obj_by_depth(topology, 0, 0);
struct hwloc_distrib_iterator *it = malloc(sizeof(*it) +
sizeof(hwloc_obj_t) +
sizeof(struct hwloc_distrib_level*));
if(it == NULL) return NULL;
struct hwloc_distrib_iterator *it;

it = malloc(sizeof(*it) + sizeof(hwloc_obj_t) + sizeof(struct hwloc_distrib_level*));
if(it == NULL)
return NULL;

it->roots = (hwloc_obj_t*) ((char*)it + sizeof(*it));
*it->roots = root;
it->n_roots = 1;
it->root_coord = 0;
it->n_levels = 1;
it->levels = (struct hwloc_distrib_level **)((char*)it +
sizeof(*it) +
sizeof(hwloc_obj_t));
it->levels = (struct hwloc_distrib_level **)((char*)it + sizeof(*it) + sizeof(hwloc_obj_t));
*it->levels = hwloc_distrib_root_levels(topology, root, &type, 1, flags);

if (*it->levels == NULL){ free(it); return NULL; }
Expand All @@ -224,26 +230,26 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
const hwloc_obj_type_t type,
const unsigned long flags){

size_t i=0, n=0;
unsigned i=0, n=0;
hwloc_obj_t obj, root = hwloc_get_obj_by_depth(topology, 0, 0);
obj = root;
hwloc_obj_type_t *levels;
struct hwloc_distrib_iterator *it;

// Count depths with a non empty cpuset.
obj = root;
while(obj){
if ((obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset)) &&
hwloc_get_type_depth(topology, obj->type) >= 0)
if ((obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset)) && hwloc_get_type_depth(topology, obj->type) >= 0)
n++;
if (obj->type == type)
break;
obj = obj->first_child;
}

obj = root;
hwloc_obj_type_t levels[n];

// fill levels array.
levels = malloc(sizeof(*levels) * n);
obj = root;
while(obj){
if( obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset) &&
hwloc_get_type_depth(topology, obj->type) >= 0){
if( obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset) && hwloc_get_type_depth(topology, obj->type) >= 0){
levels[n-1-i] = obj->type;
i++;
}
Expand All @@ -252,28 +258,37 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
obj = obj->first_child;
}

struct hwloc_distrib_iterator *it = malloc(sizeof(*it) +
sizeof(hwloc_obj_t) +
sizeof(struct hwloc_distrib_level*));
if(it == NULL) return NULL;
it = malloc(sizeof(*it) + sizeof(hwloc_obj_t) + sizeof(struct hwloc_distrib_level*));

if(it == NULL)
goto failure;

it->roots = (hwloc_obj_t*) ((char*)it + sizeof(*it));
*it->roots = root;
it->n_roots = 1;
it->root_coord = 0;
it->n_levels = n;
it->levels = (struct hwloc_distrib_level **)((char*)it +
sizeof(*it) +
sizeof(hwloc_obj_t));
it->levels = (struct hwloc_distrib_level **)((char*)it + sizeof(*it) + sizeof(hwloc_obj_t));

*it->levels = hwloc_distrib_root_levels(topology, root, levels, n, flags);

if (*it->levels == NULL){ free(it); return NULL; }
if (*it->levels == NULL)
goto failure_with_it;

free(levels);
return it;

failure_with_it:
free(it);
failure:
free(levels);
return NULL;
}

void hwloc_distrib_destroy_iterator(struct hwloc_distrib_iterator *it){
for(size_t i=0; i<it->n_roots; i++)
unsigned i;

for(i=0; i<it->n_roots; i++)
hwloc_distrib_destroy_level(it->levels[i]);
free(it);
}
Expand All @@ -288,10 +303,7 @@ hwloc_distrib_iterator_inc(struct hwloc_distrib_iterator *it){
do_root:
// Sort by user_index to increment coordinates.
levels = it->levels[it->root_coord];
qsort(levels,
it->n_levels,
sizeof(*levels),
hwloc_distrib_level_cmp_user_index);
qsort(levels, it->n_levels, sizeof(*levels), hwloc_distrib_level_cmp_user_index);

for (i=it->n_levels-1; i>=0; i--){
if(++levels[i].coord >= levels[i].arity)
Expand All @@ -314,22 +326,17 @@ int
hwloc_distrib_iterator_next(hwloc_topology_t topology,
struct hwloc_distrib_iterator *it,
hwloc_obj_t *next){
unsigned i;
struct hwloc_distrib_level *levels = it->levels[it->root_coord];
hwloc_obj_t obj = it->roots[it->root_coord];
size_t coord;
unsigned coord;

// Sort by depth to walk objects at set coordinates.
qsort(levels,
it->n_levels,
sizeof(*levels),
hwloc_distrib_level_cmp_depth);
qsort(levels, it->n_levels, sizeof(*levels), hwloc_distrib_level_cmp_depth);

for(size_t i=0; i<it->n_levels; i++){
for(i=0; i<it->n_levels; i++){
coord = levels[i].index[levels[i].coord];
obj = hwloc_get_obj_inside_cpuset_by_depth(topology,
obj->cpuset,
levels[i].depth,
coord);
obj = hwloc_get_obj_inside_cpuset_by_depth(topology, obj->cpuset, levels[i].depth, coord);
if( obj == NULL)
return hwloc_distrib_iterator_inc(it) && hwloc_distrib_iterator_next(topology, it, next);

Expand Down
4 changes: 2 additions & 2 deletions include/hwloc/helper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1217,9 +1217,9 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
HWLOC_DECLSPEC struct hwloc_distrib_iterator *
hwloc_distrib_build_iterator(hwloc_topology_t topology,
hwloc_obj_t *roots,
const size_t n_roots,
const unsigned n_roots,
const hwloc_obj_type_t *levels,
const size_t n_levels,
const unsigned n_levels,
const unsigned long flags);

/** \brief Free memory allocated for \p it **/
Expand Down
Loading

0 comments on commit cbb230a

Please sign in to comment.