up new v4

Scheaven

2021-06-03 168af40fe9a3cc81c6ee16b3e81f154780c36bdb

 lib/detecter_tools/darknet/region_layer.c

@@ -28,7 +28,8 @@
    l.outputs = h*w*n*(classes + coords + 1);

    l.inputs = l.outputs;

    l.max_boxes = max_boxes;

    l.truths = max_boxes*(5);

    l.truth_size = 4 + 2;
    l.truths = max_boxes*l.truth_size;
    l.delta = (float*)xcalloc(batch * l.outputs, sizeof(float));

    l.output = (float*)xcalloc(batch * l.outputs, sizeof(float));

    int i;

@@ -226,9 +227,9 @@
        if(l.softmax_tree){

            int onlyclass_id = 0;

            for(t = 0; t < l.max_boxes; ++t){

                box truth = float_to_box(state.truth + t*5 + b*l.truths);

                box truth = float_to_box(state.truth + t*l.truth_size + b*l.truths);
                if(!truth.x) break; // continue;

                int class_id = state.truth[t*5 + b*l.truths + 4];

                int class_id = state.truth[t*l.truth_size + b*l.truths + 4];
                float maxp = 0;

                int maxi = 0;

                if(truth.x > 100000 && truth.y > 100000){

@@ -258,13 +259,13 @@
                    float best_iou = 0;

                    int best_class_id = -1;

                    for(t = 0; t < l.max_boxes; ++t){

                        box truth = float_to_box(state.truth + t*5 + b*l.truths);

                        int class_id = state.truth[t * 5 + b*l.truths + 4];

                        box truth = float_to_box(state.truth + t*l.truth_size + b*l.truths);
                        int class_id = state.truth[t * l.truth_size + b*l.truths + 4];
                        if (class_id >= l.classes) continue; // if label contains class_id more than number of classes in the cfg-file

                        if(!truth.x) break; // continue;

                        float iou = box_iou(pred, truth);

                        if (iou > best_iou) {

                            best_class_id = state.truth[t*5 + b*l.truths + 4];

                            best_class_id = state.truth[t*l.truth_size + b*l.truths + 4];
                            best_iou = iou;

                        }

                    }

@@ -297,8 +298,8 @@
            }

        }

        for(t = 0; t < l.max_boxes; ++t){

            box truth = float_to_box(state.truth + t*5 + b*l.truths);

            int class_id = state.truth[t * 5 + b*l.truths + 4];

            box truth = float_to_box(state.truth + t*l.truth_size + b*l.truths);
            int class_id = state.truth[t * l.truth_size + b*l.truths + 4];
            if (class_id >= l.classes) {

                printf("\n Warning: in txt-labels class_id=%d >= classes=%d in cfg-file. In txt-labels class_id should be [from 0 to %d] \n", class_id, l.classes, l.classes-1);

                getchar();