@@ -12,7 +12,7 @@ struct gpt_sampler {
12
12
struct llama_sampler * smpl;
13
13
};
14
14
15
- std::string gpt_sampler_params::print_all () const {
15
+ std::string gpt_sampler_params::print () const {
16
16
char result[1024 ];
17
17
18
18
snprintf (result, sizeof (result),
@@ -26,17 +26,12 @@ std::string gpt_sampler_params::print_all() const {
26
26
return std::string (result);
27
27
}
28
28
29
- std::string gpt_sampler_params::print_constraints () const {
30
- std::string result = " CFG -> Penalties " ;
31
- if (mirostat == 0 ) {
32
- for (const auto & cnstr : constraints) {
33
- const auto name = gpt_constraint_type_to_str (cnstr);
34
- if (!name.empty ()) {
35
- result += " -> " + name + " " ;
36
- }
37
- }
38
- } else {
39
- result += " -> mirostat " ;
29
+ std::string gpt_sampler_print (const struct gpt_sampler * gsmpl) {
30
+ std::string result = " \t logits" ;
31
+
32
+ for (int i = 0 ; i < llama_sampler_n_constraints (gsmpl->smpl ); i++) {
33
+ const auto * cnstr = llama_sampler_constraint_get (gsmpl->smpl , i);
34
+ result += " -> " + std::string (cnstr->iface ->name (cnstr)) + " " ;
40
35
}
41
36
42
37
return result;
@@ -70,33 +65,33 @@ struct gpt_sampler * gpt_sampler_init(const struct llama_model * model, const st
70
65
for (const auto & cnstr : params.constraints ) {
71
66
switch (cnstr) {
72
67
case GPT_CONSTRAINT_TYPE_TOP_K:
73
- llama_sampler_add_constraint (result->smpl , llama_constraint_init_top_k (params.top_k , params.min_keep ));
68
+ llama_sampler_constraint_add (result->smpl , llama_constraint_init_top_k (params.top_k , params.min_keep ));
74
69
break ;
75
70
case GPT_CONSTRAINT_TYPE_TOP_P:
76
- llama_sampler_add_constraint (result->smpl , llama_constraint_init_top_p (params.top_p , params.min_keep ));
71
+ llama_sampler_constraint_add (result->smpl , llama_constraint_init_top_p (params.top_p , params.min_keep ));
77
72
break ;
78
73
case GPT_CONSTRAINT_TYPE_MIN_P:
79
- llama_sampler_add_constraint (result->smpl , llama_constraint_init_min_p (params.min_p , params.min_keep ));
74
+ llama_sampler_constraint_add (result->smpl , llama_constraint_init_min_p (params.min_p , params.min_keep ));
80
75
break ;
81
76
case GPT_CONSTRAINT_TYPE_TFS_Z:
82
- llama_sampler_add_constraint (result->smpl , llama_constraint_init_tail_free (params.tfs_z , params.min_keep ));
77
+ llama_sampler_constraint_add (result->smpl , llama_constraint_init_tail_free (params.tfs_z , params.min_keep ));
83
78
break ;
84
79
case GPT_CONSTRAINT_TYPE_TYPICAL_P:
85
- llama_sampler_add_constraint (result->smpl , llama_constraint_init_typical (params.typ_p , params.min_keep ));
80
+ llama_sampler_constraint_add (result->smpl , llama_constraint_init_typical (params.typ_p , params.min_keep ));
86
81
break ;
87
82
case GPT_CONSTRAINT_TYPE_TEMPERATURE:
88
- llama_sampler_add_constraint (result->smpl , llama_constraint_init_temp_ext (params.temp , params.dynatemp_range , params.dynatemp_exponent ));
83
+ llama_sampler_constraint_add (result->smpl , llama_constraint_init_temp_ext (params.temp , params.dynatemp_range , params.dynatemp_exponent ));
89
84
break ;
90
85
default :
91
86
GGML_ASSERT (false && " unknown constraint type" );
92
87
}
93
88
}
94
89
} else if (params.mirostat == 1 ) {
95
- llama_sampler_add_constraint (result->smpl , llama_constraint_init_temp (params.temp ));
96
- llama_sampler_add_constraint (result->smpl , llama_constraint_init_mirostat (model, params.mirostat_tau , params.mirostat_eta ));
90
+ llama_sampler_constraint_add (result->smpl , llama_constraint_init_temp (params.temp ));
91
+ llama_sampler_constraint_add (result->smpl , llama_constraint_init_mirostat (model, params.mirostat_tau , params.mirostat_eta ));
97
92
} else if (params.mirostat == 2 ) {
98
- llama_sampler_add_constraint (result->smpl , llama_constraint_init_temp (params.temp ));
99
- llama_sampler_add_constraint (result->smpl , llama_constraint_init_mirostat_v2 (params.mirostat_tau , params.mirostat_eta ));
93
+ llama_sampler_constraint_add (result->smpl , llama_constraint_init_temp (params.temp ));
94
+ llama_sampler_constraint_add (result->smpl , llama_constraint_init_mirostat_v2 (params.mirostat_tau , params.mirostat_eta ));
100
95
} else {
101
96
GGML_ASSERT (false && " unknown mirostat version" );
102
97
}
0 commit comments