augustin64/tipe
1
1
Fork 0
mirror of https://github.com/augustin64/projet-tipe synced 2025-01-24 07:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/julienChemillier/TIPE

Browse Source
This commit is contained in:
julienChemillier 2022-11-03 11:34:42 +01:00
commit f065224d3c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cnn/convolution.c
View File

@ -38,7 +38,7 @@ void make_convolution_cpu(Kernel_cnn* kernel, float*** input, float*** output, i
} }
} }
} }
output[i][j][k] = f/kernel->k_size; // Average output[i][j][k] = f;
} }
} }
} }
@ -80,7 +80,7 @@ __global__ void make_convolution_kernel(int k_size, int columns, int rows, float
} }
output_offset = (float*)((char*)output + (idx*output_dim+idy)*pitch_output); output_offset = (float*)((char*)output + (idx*output_dim+idy)*pitch_output);
output_offset[idz] = f/(k_size); output_offset[idz] = f;
} }
void make_convolution_device(Kernel_cnn* kernel, float*** input, float*** output, int output_dim) { void make_convolution_device(Kernel_cnn* kernel, float*** input, float*** output, int output_dim) {

4
src/cnn/convolution.cu
View File

@ -36,7 +36,7 @@ void make_convolution_cpu(Kernel_cnn* kernel, float*** input, float*** output, i
} }
} }
} }
output[i][j][k] = f/kernel->k_size; // Average output[i][j][k] = f;
} }
} }
} }
@ -78,7 +78,7 @@ __global__ void make_convolution_kernel(int k_size, int columns, int rows, float
} }
output_offset = (float*)((char*)output + (idx*output_dim+idy)*pitch_output); output_offset = (float*)((char*)output + (idx*output_dim+idy)*pitch_output);
output_offset[idz] = f/(k_size); output_offset[idz] = f;
} }
void make_convolution_device(Kernel_cnn* kernel, float*** input, float*** output, int output_dim) { void make_convolution_device(Kernel_cnn* kernel, float*** input, float*** output, int output_dim) {

2
src/cnn/include/print.h
View File

@ -1,7 +1,7 @@
#ifndef DEF_PRINT_H #ifndef DEF_PRINT_H
#define DEF_PRINT_H #define DEF_PRINT_H
#include "include/struct.h" #include "struct.h"
/* /*
* Affiche le kernel d'une couche de convolution * Affiche le kernel d'une couche de convolution