Skip to content

C
CCS
Commit 4f84993f authored by Brice Videau's avatar Brice Videau
Browse files
Options

Refactoring.

parent 524be9d2
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 258 deletions
src/Makefile.am
View file @ 4f84993f
...@@ -21,7 +21,6 @@ libcconfigspace_la_SOURCES = \ ...@@ -21,7 +21,6 @@ libcconfigspace_la_SOURCES = \
uthash.h \ uthash.h \
datum_hash.h \ datum_hash.h \
hyperparameter_categorical.c \ hyperparameter_categorical.c \
hyperparameter_ordinal.c \
hyperparameter_discrete.c \ hyperparameter_discrete.c \
utarray.h \ utarray.h \
context.c \ context.c \
......
src/hyperparameter_categorical.c
View file @ 4f84993f
...@@ -109,13 +109,14 @@ static _ccs_hyperparameter_ops_t _ccs_hyperparameter_categorical_ops = { ...@@ -109,13 +109,14 @@ static _ccs_hyperparameter_ops_t _ccs_hyperparameter_categorical_ops = {
return -CCS_OUT_OF_MEMORY; \ return -CCS_OUT_OF_MEMORY; \
} }
ccs_result_t static inline ccs_result_t
ccs_create_categorical_hyperparameter(const char *name, _ccs_create_categorical_hyperparameter(ccs_hyperparameter_type_t type,
size_t num_possible_values, const char *name,
ccs_datum_t *possible_values, size_t num_possible_values,
size_t default_value_index, ccs_datum_t *possible_values,
void *user_data, size_t default_value_index,
ccs_hyperparameter_t *hyperparameter_ret) { void *user_data,
ccs_hyperparameter_t *hyperparameter_ret) {
CCS_CHECK_PTR(name); CCS_CHECK_PTR(name);
CCS_CHECK_PTR(hyperparameter_ret); CCS_CHECK_PTR(hyperparameter_ret);
CCS_CHECK_ARY(num_possible_values, possible_values); CCS_CHECK_ARY(num_possible_values, possible_values);
...@@ -151,7 +152,7 @@ ccs_create_categorical_hyperparameter(const char *name, ...@@ -151,7 +152,7 @@ ccs_create_categorical_hyperparameter(const char *name,
_ccs_hyperparameter_categorical_data_t *hyperparam_data = _ccs_hyperparameter_categorical_data_t *hyperparam_data =
(_ccs_hyperparameter_categorical_data_t *)(mem + (_ccs_hyperparameter_categorical_data_t *)(mem +
sizeof(struct _ccs_hyperparameter_s)); sizeof(struct _ccs_hyperparameter_s));
hyperparam_data->common_data.type = CCS_CATEGORICAL; hyperparam_data->common_data.type = type;
hyperparam_data->common_data.name = (char *)(mem + hyperparam_data->common_data.name = (char *)(mem +
sizeof(struct _ccs_hyperparameter_s) + sizeof(struct _ccs_hyperparameter_s) +
sizeof(_ccs_hyperparameter_categorical_data_t) + sizeof(_ccs_hyperparameter_categorical_data_t) +
...@@ -194,11 +195,28 @@ ccs_create_categorical_hyperparameter(const char *name, ...@@ -194,11 +195,28 @@ ccs_create_categorical_hyperparameter(const char *name,
return CCS_SUCCESS; return CCS_SUCCESS;
} }
extern ccs_result_t
ccs_categorical_hyperparameter_get_values(ccs_hyperparameter_t hyperparameter, ccs_result_t
size_t num_possible_values, ccs_create_categorical_hyperparameter(const char *name,
ccs_datum_t *possible_values, size_t num_possible_values,
size_t *num_possible_values_ret) { ccs_datum_t *possible_values,
size_t default_value_index,
void *user_data,
ccs_hyperparameter_t *hyperparameter_ret) {
return _ccs_create_categorical_hyperparameter(CCS_CATEGORICAL,
name,
num_possible_values,
possible_values,
default_value_index,
user_data,
hyperparameter_ret);
}
static inline ccs_result_t
_ccs_categorical_hyperparameter_get_values(ccs_hyperparameter_t hyperparameter,
size_t num_possible_values,
ccs_datum_t *possible_values,
size_t *num_possible_values_ret) {
CCS_CHECK_OBJ(hyperparameter, CCS_HYPERPARAMETER); CCS_CHECK_OBJ(hyperparameter, CCS_HYPERPARAMETER);
CCS_CHECK_ARY(num_possible_values, possible_values); CCS_CHECK_ARY(num_possible_values, possible_values);
if (!possible_values && !num_possible_values_ret) if (!possible_values && !num_possible_values_ret)
...@@ -218,4 +236,64 @@ ccs_categorical_hyperparameter_get_values(ccs_hyperparameter_t hyperparameter, ...@@ -218,4 +236,64 @@ ccs_categorical_hyperparameter_get_values(ccs_hyperparameter_t hyperparameter,
return CCS_SUCCESS; return CCS_SUCCESS;
} }
extern ccs_result_t
ccs_categorical_hyperparameter_get_values(ccs_hyperparameter_t hyperparameter,
size_t num_possible_values,
ccs_datum_t *possible_values,
size_t *num_possible_values_ret) {
return _ccs_categorical_hyperparameter_get_values(hyperparameter,
num_possible_values,
possible_values,
num_possible_values_ret);
}
ccs_result_t
ccs_ordinal_hyperparameter_compare_values(ccs_hyperparameter_t hyperparameter,
ccs_datum_t value1,
ccs_datum_t value2,
ccs_int_t *comp_ret) {
CCS_CHECK_OBJ(hyperparameter, CCS_HYPERPARAMETER);
CCS_CHECK_PTR(comp_ret);
_ccs_hyperparameter_categorical_data_t *d = ((_ccs_hyperparameter_categorical_data_t *)(hyperparameter->data));
_ccs_hash_datum_t *p1, *p2;
HASH_FIND(hh, d->hash, &value1, sizeof(ccs_datum_t), p1);
HASH_FIND(hh, d->hash, &value2, sizeof(ccs_datum_t), p2);
if (likely(p1 && p2)) {
if (p1 < p2)
*comp_ret = -1;
else if (p1 > p2)
*comp_ret = 1;
else
*comp_ret = 0;
return CCS_SUCCESS;
} else {
return -CCS_INVALID_VALUE;
}
}
ccs_result_t
ccs_create_ordinal_hyperparameter(const char *name,
size_t num_possible_values,
ccs_datum_t *possible_values,
size_t default_value_index,
void *user_data,
ccs_hyperparameter_t *hyperparameter_ret) {
return _ccs_create_categorical_hyperparameter(CCS_ORDINAL,
name,
num_possible_values,
possible_values,
default_value_index,
user_data,
hyperparameter_ret);
}
extern ccs_result_t
ccs_ordinal_hyperparameter_get_values(ccs_hyperparameter_t hyperparameter,
size_t num_possible_values,
ccs_datum_t *possible_values,
size_t *num_possible_values_ret) {
return _ccs_categorical_hyperparameter_get_values(hyperparameter,
num_possible_values,
possible_values,
num_possible_values_ret);
}
src/hyperparameter_ordinal.c deleted 100644 → 0
View file @ 524be9d2
#include "cconfigspace_internal.h"
#include "hyperparameter_internal.h"
#include "datum_hash.h"
#include <string.h>
struct _ccs_hyperparameter_ordinal_data_s {
_ccs_hyperparameter_common_data_t common_data;
size_t num_possible_values;
_ccs_hash_datum_t *possible_values;
_ccs_hash_datum_t *hash;
};
typedef struct _ccs_hyperparameter_ordinal_data_s _ccs_hyperparameter_ordinal_data_t;
static ccs_result_t
_ccs_hyperparameter_ordinal_del(ccs_object_t o) {
ccs_hyperparameter_t d = (ccs_hyperparameter_t)o;
_ccs_hyperparameter_ordinal_data_t *data = (_ccs_hyperparameter_ordinal_data_t *)(d->data);
HASH_CLEAR(hh, data->hash);
return CCS_SUCCESS;
}
static ccs_result_t
_ccs_hyperparameter_ordinal_check_values(_ccs_hyperparameter_data_t *data,
size_t num_values,
const ccs_datum_t *values,
ccs_bool_t *results) {
_ccs_hyperparameter_ordinal_data_t *d =
(_ccs_hyperparameter_ordinal_data_t *)data;
for (size_t i = 0; i < num_values; i++) {
_ccs_hash_datum_t *p;
HASH_FIND(hh, d->hash, values + i, sizeof(ccs_datum_t), p);
results[i] = p ? CCS_TRUE : CCS_FALSE;
}
return CCS_SUCCESS;
}
static ccs_result_t
_ccs_hyperparameter_ordinal_samples(_ccs_hyperparameter_data_t *data,
ccs_distribution_t distribution,
ccs_rng_t rng,
size_t num_values,
ccs_datum_t *values) {
_ccs_hyperparameter_ordinal_data_t *d =
(_ccs_hyperparameter_ordinal_data_t *)data;
ccs_result_t err;
ccs_int_t *vs = (ccs_int_t *)values + num_values;
ccs_bool_t oversampling;
err = ccs_distribution_check_oversampling(distribution,
&(d->common_data.interval),
&oversampling);
if (err)
return err;
err = ccs_distribution_samples(distribution, rng,
num_values, (ccs_numeric_t *)vs);
if (err)
return err;
if (!oversampling) {
for(size_t i = 0; i < num_values; i++)
values[i] = d->possible_values[vs[i]].d;
} else {
size_t found = 0;
for(size_t i = 0; i < num_values; i++)
if (vs[i] >= 0 && (size_t)vs[i] < d->num_possible_values)
values[found++] = d->possible_values[vs[i]].d;
vs = NULL;
size_t coeff = 2;
while (found < num_values) {
size_t buff_sz = (num_values - found)*coeff;
vs = (ccs_int_t *)malloc(sizeof(ccs_numeric_t)*buff_sz);
if (!vs)
return -CCS_OUT_OF_MEMORY;
err = ccs_distribution_samples(distribution, rng,
buff_sz, (ccs_numeric_t *)vs);
for(size_t i = 0; i < buff_sz && found < num_values; i++)
if (vs[i] >= 0 && (size_t)vs[i] < d->num_possible_values)
values[found++] = d->possible_values[vs[i]].d;
coeff <<= 1;
free(vs);
if (coeff > 32)
return -CCS_SAMPLING_UNSUCCESSFUL;
}
}
return CCS_SUCCESS;
}
ccs_result_t
_ccs_hyperparameter_ordinal_get_default_distribution(
_ccs_hyperparameter_data_t *data,
ccs_distribution_t *distribution) {
_ccs_hyperparameter_ordinal_data_t *d = (_ccs_hyperparameter_ordinal_data_t *)data;
ccs_interval_t *interval = &(d->common_data.interval);
return ccs_create_uniform_distribution(interval->type,
interval->lower, interval->upper,
CCS_LINEAR, CCSI(0),
distribution);
}
static _ccs_hyperparameter_ops_t _ccs_hyperparameter_ordinal_ops = {
{ &_ccs_hyperparameter_ordinal_del },
&_ccs_hyperparameter_ordinal_check_values,
&_ccs_hyperparameter_ordinal_samples,
&_ccs_hyperparameter_ordinal_get_default_distribution
};
ccs_result_t
ccs_ordinal_hyperparameter_compare_values(ccs_hyperparameter_t hyperparameter,
ccs_datum_t value1,
ccs_datum_t value2,
ccs_int_t *comp_ret) {
CCS_CHECK_OBJ(hyperparameter, CCS_HYPERPARAMETER);
CCS_CHECK_PTR(comp_ret);
_ccs_hyperparameter_ordinal_data_t *d = ((_ccs_hyperparameter_ordinal_data_t *)(hyperparameter->data));
_ccs_hash_datum_t *p1, *p2;
HASH_FIND(hh, d->hash, &value1, sizeof(ccs_datum_t), p1);
HASH_FIND(hh, d->hash, &value2, sizeof(ccs_datum_t), p2);
if (likely(p1 && p2)) {
if (p1 < p2)
*comp_ret = -1;
else if (p1 > p2)
*comp_ret = 1;
else
*comp_ret = 0;
return CCS_SUCCESS;
} else {
return -CCS_INVALID_VALUE;
}
}
#undef uthash_nonfatal_oom
#define uthash_nonfatal_oom(elt) { \
HASH_CLEAR(hh, hyperparam_data->hash); \
free((void*)mem); \
return -CCS_OUT_OF_MEMORY; \
}
ccs_result_t
ccs_create_ordinal_hyperparameter(const char *name,
size_t num_possible_values,
ccs_datum_t *possible_values,
size_t default_value_index,
void *user_data,
ccs_hyperparameter_t *hyperparameter_ret) {
CCS_CHECK_PTR(name);
CCS_CHECK_PTR(hyperparameter_ret);
CCS_CHECK_ARY(num_possible_values, possible_values);
if (!num_possible_values ||
num_possible_values <= default_value_index)
return -CCS_INVALID_VALUE;
size_t size_strs = 0;
for(size_t i = 0; i < num_possible_values; i++)
if (possible_values[i].type == CCS_STRING) {
if (!possible_values[i].value.s)
return -CCS_INVALID_VALUE;
size_strs += strlen(possible_values[i].value.s) + 1;
}
uintptr_t mem = (uintptr_t)calloc(1,
sizeof(struct _ccs_hyperparameter_s) +
sizeof(_ccs_hyperparameter_ordinal_data_t) +
sizeof(_ccs_hash_datum_t) * num_possible_values +
strlen(name) + 1 +
size_strs);
if (!mem)
return -CCS_OUT_OF_MEMORY;
ccs_interval_t interval;
interval.type = CCS_NUM_INTEGER;
interval.lower.i = 0;
interval.upper.i = (ccs_int_t)num_possible_values;
interval.lower_included = CCS_TRUE;
interval.upper_included = CCS_FALSE;
ccs_hyperparameter_t hyperparam = (ccs_hyperparameter_t)mem;
_ccs_object_init(&(hyperparam->obj), CCS_HYPERPARAMETER, (_ccs_object_ops_t *)&_ccs_hyperparameter_ordinal_ops);
_ccs_hyperparameter_ordinal_data_t *hyperparam_data =
(_ccs_hyperparameter_ordinal_data_t *)(mem +
sizeof(struct _ccs_hyperparameter_s));
hyperparam_data->common_data.type = CCS_ORDINAL;
hyperparam_data->common_data.name = (char *)(mem +
sizeof(struct _ccs_hyperparameter_s) +
sizeof(_ccs_hyperparameter_ordinal_data_t) +
sizeof(_ccs_hash_datum_t) * num_possible_values);
strcpy((char *)hyperparam_data->common_data.name, name);
hyperparam_data->common_data.user_data = user_data;
hyperparam_data->common_data.interval = interval;
hyperparam_data->num_possible_values = num_possible_values;
_ccs_hash_datum_t *pvs = (_ccs_hash_datum_t *)(mem +
sizeof(struct _ccs_hyperparameter_s) +
sizeof(_ccs_hyperparameter_ordinal_data_t));
hyperparam_data->possible_values = pvs;
hyperparam_data->hash = NULL;
char *str_pool = (char *)(hyperparam_data->common_data.name) + strlen(name) + 1;
for (size_t i = 0; i < num_possible_values; i++) {
_ccs_hash_datum_t *p = NULL;
HASH_FIND(hh, hyperparam_data->hash, possible_values + i, sizeof(ccs_datum_t), p);
if (p) {
_ccs_hash_datum_t *tmp;
HASH_ITER(hh, hyperparam_data->hash, p, tmp) {
HASH_DELETE(hh, hyperparam_data->hash, p);
}
free((void *)mem);
return -CCS_INVALID_VALUE;
}
if (possible_values[i].type == CCS_STRING) {
pvs[i].d.type = CCS_STRING;
pvs[i].d.value.s = str_pool;
strcpy(str_pool, possible_values[i].value.s);
str_pool += strlen(possible_values[i].value.s) + 1;
} else {
pvs[i].d = possible_values[i];
}
HASH_ADD(hh, hyperparam_data->hash, d, sizeof(ccs_datum_t), pvs + i);
}
hyperparam_data->common_data.default_value = pvs[default_value_index].d;
hyperparam->data = (_ccs_hyperparameter_data_t *)hyperparam_data;
*hyperparameter_ret = hyperparam;
return CCS_SUCCESS;
}
extern ccs_result_t
ccs_ordinal_hyperparameter_get_values(ccs_hyperparameter_t hyperparameter,
size_t num_possible_values,
ccs_datum_t *possible_values,
size_t *num_possible_values_ret) {
CCS_CHECK_OBJ(hyperparameter, CCS_HYPERPARAMETER);
CCS_CHECK_ARY(num_possible_values, possible_values);
if (!possible_values && !num_possible_values_ret)
return -CCS_INVALID_VALUE;
_ccs_hyperparameter_ordinal_data_t *d =
(_ccs_hyperparameter_ordinal_data_t *)hyperparameter->data;
if (possible_values) {
if (num_possible_values < d->num_possible_values)
return -CCS_INVALID_VALUE;
for (size_t i = 0; i < d->num_possible_values; i++)
possible_values[i] = d->possible_values[i].d;
for (size_t i = num_possible_values; i < d->num_possible_values; i++)
possible_values[i] = ccs_none;
}
if (num_possible_values_ret)
*num_possible_values_ret = d->num_possible_values;
return CCS_SUCCESS;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment