XTC: cleanup

Author: MaggotHATE

base/llama-addon.cpp

@@ -43,7 +43,6 @@ void llama_sample_xtc_addon(struct llama_context * ctx, llama_token_data_array *
 
     std::random_device rd;
     float chance = (float)(rd()%100)/100;
-    //printf("\nChance = %f; ", chance);
     if (xtc_probability_once && chance > xtc_probability) return;
 
     llama_sample_softmax(nullptr, candidates);
@@ -53,27 +52,21 @@ void llama_sample_xtc_addon(struct llama_context * ctx, llama_token_data_array *
     for (size_t i = 0; i < (candidates->size - 1); ++i) {
         if (candidates->data[i].p >= xtc_threshold) {
                 if (xtc_probability_once || chance <= xtc_probability) {
-                    candidates->data[i].logit = -999.0f; // .p will be recalculated in llama_sample_softmax_impl later based on .logit, so we need to change these
+                    // .logits are used for sorting and calculating .p in llama_sample_softmax_impl
+                    candidates->data[i].logit = -999.0f;
                     ++removed;
-                    if (!xtc_probability_once) {
-                        chance = (float)(rd()%100)/100;
-                        printf(" chance = %f; ", chance);
-                    }
+                    if (!xtc_probability_once) chance = (float)(rd()%100)/100;
                 }
         }
     }
 
-    //printf("\nPresort (size %zu): %f, %f, %f", candidates->size, candidates->data[0].p, candidates->data[1].p, candidates->data[2].p);
-
     // sorting with new logits
     std::sort(candidates->data, candidates->data + candidates->size, [](const llama_token_data & a, const llama_token_data & b) {
         return a.logit > b.logit;
     });
     //resizing now that penalized tokens are at the back
     candidates->size = candidates->size - removed;
 
-    //printf("\nSort    (size %zu): %f, %f, %f\n", candidates->size, candidates->data[0].p, candidates->data[1].p, candidates->data[2].p);
-
     llama_set_time(ctx, t_start_sample_us);
 }