Bug fixes. Tested im2col_cpu_custom_transpose - bad way.

AlexeyAB

2018-08-10 a9fef1bd66e6b2c40c344c1bdcd33bb1d209461c

 src/convolutional_layer.c

@@ -593,11 +593,11 @@
    }
}

void binary_align_weights(convolutional_layer *l, size_t lda_align)
void binary_align_weights(convolutional_layer *l)
{
    int m = l->n;
    int k = l->size*l->size*l->c;
    size_t new_lda = k + (lda_align - k%lda_align); // (k / 8 + 1) * 8;
    size_t new_lda = k + (l->lda_align - k % l->lda_align); // (k / 8 + 1) * 8;

    binarize_weights(l->weights, m, k, l->binary_weights);

@@ -680,8 +680,18 @@

    for(i = 0; i < l.batch; ++i){
        //im2col_cpu(state.input, l.c, l.h, l.w, l.size, l.stride, l.pad, b);

        //float *t_input = NULL;
        //if (l.xnor) {
        //    size_t new_ldb = k + (l.lda_align - k%l.lda_align);
        //    size_t t_intput_size = new_ldb * n;
        //    t_input = calloc(t_intput_size, sizeof(float));
        //    im2col_cpu_custom_transpose(state.input, l.c, l.h, l.w, l.size, l.stride, l.pad, t_input, new_ldb);
        //}
        //else
        im2col_cpu_custom(state.input, l.c, l.h, l.w, l.size, l.stride, l.pad, b);


        //gemm(0,0,m,n,k,1,a,k,b,n,1,c,n);
        //gemm_nn_custom(m, n, k, 1, a, k, b, n, c, n);
        if (l.xnor) {
@@ -760,7 +770,16 @@
                    free(align_weights);
                }
                */
                size_t ldb_align = 256; // 256 bit for AVX2

                /*
                if (l.size == 3 && l.stride == 1 && l.pad == 1) {
                    convolution_2d(l.w, l.h, l.size, l.n, l.c, l.pad, l.stride,
                        l.weights, state.input, l.output);
                }
                else {
                */
                    //size_t ldb_align = 256; // 256 bit for AVX2
                    int ldb_align = l.lda_align;
                size_t new_ldb = k + (ldb_align - k%ldb_align);
                char *t_bit_input = NULL;
                size_t t_intput_size = binary_transpose_align_input(k, n, b, &t_bit_input, ldb_align);
@@ -771,8 +790,8 @@

                //free(t_input);
                free(t_bit_input);
                //}

                //free(align_bit_weights);
            }

            // for bit_input: (k * n)