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

Rename variables

Browse Source
This commit is contained in:
augustin64 2023-03-03 21:59:51 +01:00
parent 796a94207f
commit 9d54b1e4ea
2 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/cnn/make.c
View File

@ -27,14 +27,14 @@ float max_flt(float a, float b) {
* Average Pooling * Average Pooling
*/ */
#ifdef __CUDACC__ #ifdef __CUDACC__
__global__ void make_average_pooling_kernel(float*** input, float*** output, int size, int output_depth, int output_dim) { __global__ void make_average_pooling_kernel(float*** input, float*** output, int size, int output_depth, int output_width) {
// Équivalents respectifs de i, j et k dans la boucle effectuée par le cpu // Équivalents respectifs de i, j et k dans la boucle effectuée par le cpu
int idx = threadIdx.x + blockDim.x*blockIdx.x; // < output_depth int idx = threadIdx.x + blockDim.x*blockIdx.x; // < output_depth
int idy = threadIdx.y + blockDim.y*blockIdx.y; // < output_dim int idy = threadIdx.y + blockDim.y*blockIdx.y; // < output_width
int idz = threadIdx.z + blockDim.z*blockIdx.z; // < output_dim int idz = threadIdx.z + blockDim.z*blockIdx.z; // < output_width
int n = size*size; int n = size*size;
if (idx >= output_depth || idy >= output_dim || idz >= output_dim) { if (idx >= output_depth || idy >= output_width || idz >= output_width) {
return; return;
} }
@ -48,26 +48,26 @@ __global__ void make_average_pooling_kernel(float*** input, float*** output, int
output[idx][idy][idz] = sum/(float)n; output[idx][idy][idz] = sum/(float)n;
} }
void make_average_pooling_device(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_average_pooling_device(float*** input, float*** output, int size, int output_depth, int output_width) {
// Make computation // Make computation
dim3 gridSize(i_div_up(output_depth, BLOCKSIZE_x), i_div_up(output_dim, BLOCKSIZE_y), i_div_up(output_dim, BLOCKSIZE_z)); dim3 gridSize(i_div_up(output_depth, BLOCKSIZE_x), i_div_up(output_width, BLOCKSIZE_y), i_div_up(output_width, BLOCKSIZE_z));
dim3 blockSize(BLOCKSIZE_x, BLOCKSIZE_y, BLOCKSIZE_z); dim3 blockSize(BLOCKSIZE_x, BLOCKSIZE_y, BLOCKSIZE_z);
make_average_pooling_kernel<<<gridSize, blockSize>>>(input, output, size, output_depth, output_dim); make_average_pooling_kernel<<<gridSize, blockSize>>>(input, output, size, output_depth, output_width);
gpuErrchk( cudaPeekAtLastError() ); gpuErrchk( cudaPeekAtLastError() );
gpuErrchk( cudaDeviceSynchronize() ); gpuErrchk( cudaDeviceSynchronize() );
} }
#endif #endif
void make_average_pooling_cpu(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_average_pooling_cpu(float*** input, float*** output, int size, int output_depth, int output_width) {
// input[output_depth][output_dim+size-1][output_dim+size-1] // input[output_depth][output_width+size-1][output_width+size-1]
// output[output_depth][output_dim][output_dim] // output[output_depth][output_width][output_width]
float sum; float sum;
int n = size*size; int n = size*size;
for (int i=0; i < output_depth; i++) { for (int i=0; i < output_depth; i++) {
for (int j=0; j < output_dim; j++) { for (int j=0; j < output_width; j++) {
for (int k=0; k < output_dim; k++) { for (int k=0; k < output_width; k++) {
sum = 0; sum = 0;
for (int a=0; a < size; a++) { for (int a=0; a < size; a++) {
for (int b=0; b < size; b++) { for (int b=0; b < size; b++) {
@ -83,11 +83,11 @@ void make_average_pooling_cpu(float*** input, float*** output, int size, int out
#ifdef __CUDACC__ #ifdef __CUDACC__
extern "C" extern "C"
#endif #endif
void make_average_pooling(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_average_pooling(float*** input, float*** output, int size, int output_depth, int output_width) {
#ifndef __CUDACC__ #ifndef __CUDACC__
make_average_pooling_cpu(input, output, size, output_depth, output_dim); make_average_pooling_cpu(input, output, size, output_depth, output_width);
#else #else
make_average_pooling_device(input, output, size, output_depth, output_dim); make_average_pooling_device(input, output, size, output_depth, output_width);
#endif #endif
} }
@ -99,13 +99,13 @@ void make_average_pooling(float*** input, float*** output, int size, int output_
* Max Pooling * Max Pooling
*/ */
#ifdef __CUDACC__ #ifdef __CUDACC__
__global__ void make_max_pooling_kernel(float*** input, float*** output, int size, int output_depth, int output_dim) { __global__ void make_max_pooling_kernel(float*** input, float*** output, int size, int output_depth, int output_width) {
// Équivalents respectifs de i, j et k dans la boucle effectuée par le cpu // Équivalents respectifs de i, j et k dans la boucle effectuée par le cpu
int idx = threadIdx.x + blockDim.x*blockIdx.x; // < output_depth int idx = threadIdx.x + blockDim.x*blockIdx.x; // < output_depth
int idy = threadIdx.y + blockDim.y*blockIdx.y; // < output_dim int idy = threadIdx.y + blockDim.y*blockIdx.y; // < output_width
int idz = threadIdx.z + blockDim.z*blockIdx.z; // < output_dim int idz = threadIdx.z + blockDim.z*blockIdx.z; // < output_width
if (idx >= output_depth || idy >= output_dim || idz >= output_dim) { if (idx >= output_depth || idy >= output_width || idz >= output_width) {
return; return;
} }
@ -121,24 +121,24 @@ __global__ void make_max_pooling_kernel(float*** input, float*** output, int siz
output[idx][idy][idz] = m; output[idx][idy][idz] = m;
} }
void make_max_pooling_device(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_max_pooling_device(float*** input, float*** output, int size, int output_depth, int output_width) {
// Make computation // Make computation
dim3 gridSize(i_div_up(output_depth, BLOCKSIZE_x), i_div_up(output_dim, BLOCKSIZE_y), i_div_up(output_dim, BLOCKSIZE_z)); dim3 gridSize(i_div_up(output_depth, BLOCKSIZE_x), i_div_up(output_width, BLOCKSIZE_y), i_div_up(output_width, BLOCKSIZE_z));
dim3 blockSize(BLOCKSIZE_x, BLOCKSIZE_y, BLOCKSIZE_z); dim3 blockSize(BLOCKSIZE_x, BLOCKSIZE_y, BLOCKSIZE_z);
make_max_pooling_kernel<<<gridSize, blockSize>>>(input, output, size, output_depth, output_dim); make_max_pooling_kernel<<<gridSize, blockSize>>>(input, output, size, output_depth, output_width);
gpuErrchk( cudaPeekAtLastError() ); gpuErrchk( cudaPeekAtLastError() );
gpuErrchk( cudaDeviceSynchronize() ); gpuErrchk( cudaDeviceSynchronize() );
} }
#endif #endif
void make_max_pooling_cpu(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_max_pooling_cpu(float*** input, float*** output, int size, int output_depth, int output_width) {
// input[output_depth][output_dim+size-1][output_dim+size-1] // input[output_depth][output_width+size-1][output_width+size-1]
// output[output_depth][output_dim][output_dim] // output[output_depth][output_width][output_width]
float m; float m;
for (int i=0; i < output_depth; i++) { for (int i=0; i < output_depth; i++) {
for (int j=0; j < output_dim; j++) { for (int j=0; j < output_width; j++) {
for (int k=0; k < output_dim; k++) { for (int k=0; k < output_width; k++) {
m = FLT_MIN; m = FLT_MIN;
for (int a=0; a < size; a++) { for (int a=0; a < size; a++) {
for (int b=0; b < size; b++) { for (int b=0; b < size; b++) {
@ -154,11 +154,11 @@ void make_max_pooling_cpu(float*** input, float*** output, int size, int output_
#ifdef __CUDACC__ #ifdef __CUDACC__
extern "C" extern "C"
#endif #endif
void make_max_pooling(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_max_pooling(float*** input, float*** output, int size, int output_depth, int output_width) {
#ifndef __CUDACC__ #ifndef __CUDACC__
make_max_pooling_cpu(input, output, size, output_depth, output_dim); make_max_pooling_cpu(input, output, size, output_depth, output_width);
#else #else
make_max_pooling_device(input, output, size, output_depth, output_dim); make_max_pooling_device(input, output, size, output_depth, output_width);
#endif #endif
} }

60
src/cnn/make.cu
View File

@ -27,14 +27,14 @@ float max_flt(float a, float b) {
* Average Pooling * Average Pooling
*/ */
#ifdef __CUDACC__ #ifdef __CUDACC__
__global__ void make_average_pooling_kernel(float*** input, float*** output, int size, int output_depth, int output_dim) { __global__ void make_average_pooling_kernel(float*** input, float*** output, int size, int output_depth, int output_width) {
// Équivalents respectifs de i, j et k dans la boucle effectuée par le cpu // Équivalents respectifs de i, j et k dans la boucle effectuée par le cpu
int idx = threadIdx.x + blockDim.x*blockIdx.x; // < output_depth int idx = threadIdx.x + blockDim.x*blockIdx.x; // < output_depth
int idy = threadIdx.y + blockDim.y*blockIdx.y; // < output_dim int idy = threadIdx.y + blockDim.y*blockIdx.y; // < output_width
int idz = threadIdx.z + blockDim.z*blockIdx.z; // < output_dim int idz = threadIdx.z + blockDim.z*blockIdx.z; // < output_width
int n = size*size; int n = size*size;
if (idx >= output_depth || idy >= output_dim || idz >= output_dim) { if (idx >= output_depth || idy >= output_width || idz >= output_width) {
return; return;
} }
@ -48,26 +48,26 @@ __global__ void make_average_pooling_kernel(float*** input, float*** output, int
output[idx][idy][idz] = sum/(float)n; output[idx][idy][idz] = sum/(float)n;
} }
void make_average_pooling_device(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_average_pooling_device(float*** input, float*** output, int size, int output_depth, int output_width) {
// Make computation // Make computation
dim3 gridSize(i_div_up(output_depth, BLOCKSIZE_x), i_div_up(output_dim, BLOCKSIZE_y), i_div_up(output_dim, BLOCKSIZE_z)); dim3 gridSize(i_div_up(output_depth, BLOCKSIZE_x), i_div_up(output_width, BLOCKSIZE_y), i_div_up(output_width, BLOCKSIZE_z));
dim3 blockSize(BLOCKSIZE_x, BLOCKSIZE_y, BLOCKSIZE_z); dim3 blockSize(BLOCKSIZE_x, BLOCKSIZE_y, BLOCKSIZE_z);
make_average_pooling_kernel<<<gridSize, blockSize>>>(input, output, size, output_depth, output_dim); make_average_pooling_kernel<<<gridSize, blockSize>>>(input, output, size, output_depth, output_width);
gpuErrchk( cudaPeekAtLastError() ); gpuErrchk( cudaPeekAtLastError() );
gpuErrchk( cudaDeviceSynchronize() ); gpuErrchk( cudaDeviceSynchronize() );
} }
#endif #endif
void make_average_pooling_cpu(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_average_pooling_cpu(float*** input, float*** output, int size, int output_depth, int output_width) {
// input[output_depth][output_dim+size-1][output_dim+size-1] // input[output_depth][output_width+size-1][output_width+size-1]
// output[output_depth][output_dim][output_dim] // output[output_depth][output_width][output_width]
float sum; float sum;
int n = size*size; int n = size*size;
for (int i=0; i < output_depth; i++) { for (int i=0; i < output_depth; i++) {
for (int j=0; j < output_dim; j++) { for (int j=0; j < output_width; j++) {
for (int k=0; k < output_dim; k++) { for (int k=0; k < output_width; k++) {
sum = 0; sum = 0;
for (int a=0; a < size; a++) { for (int a=0; a < size; a++) {
for (int b=0; b < size; b++) { for (int b=0; b < size; b++) {
@ -83,11 +83,11 @@ void make_average_pooling_cpu(float*** input, float*** output, int size, int out
#ifdef __CUDACC__ #ifdef __CUDACC__
extern "C" extern "C"
#endif #endif
void make_average_pooling(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_average_pooling(float*** input, float*** output, int size, int output_depth, int output_width) {
#ifndef __CUDACC__ #ifndef __CUDACC__
make_average_pooling_cpu(input, output, size, output_depth, output_dim); make_average_pooling_cpu(input, output, size, output_depth, output_width);
#else #else
make_average_pooling_device(input, output, size, output_depth, output_dim); make_average_pooling_device(input, output, size, output_depth, output_width);
#endif #endif
} }
@ -99,13 +99,13 @@ void make_average_pooling(float*** input, float*** output, int size, int output_
* Max Pooling * Max Pooling
*/ */
#ifdef __CUDACC__ #ifdef __CUDACC__
__global__ void make_max_pooling_kernel(float*** input, float*** output, int size, int output_depth, int output_dim) { __global__ void make_max_pooling_kernel(float*** input, float*** output, int size, int output_depth, int output_width) {
// Équivalents respectifs de i, j et k dans la boucle effectuée par le cpu // Équivalents respectifs de i, j et k dans la boucle effectuée par le cpu
int idx = threadIdx.x + blockDim.x*blockIdx.x; // < output_depth int idx = threadIdx.x + blockDim.x*blockIdx.x; // < output_depth
int idy = threadIdx.y + blockDim.y*blockIdx.y; // < output_dim int idy = threadIdx.y + blockDim.y*blockIdx.y; // < output_width
int idz = threadIdx.z + blockDim.z*blockIdx.z; // < output_dim int idz = threadIdx.z + blockDim.z*blockIdx.z; // < output_width
if (idx >= output_depth || idy >= output_dim || idz >= output_dim) { if (idx >= output_depth || idy >= output_width || idz >= output_width) {
return; return;
} }
@ -121,24 +121,24 @@ __global__ void make_max_pooling_kernel(float*** input, float*** output, int siz
output[idx][idy][idz] = m; output[idx][idy][idz] = m;
} }
void make_max_pooling_device(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_max_pooling_device(float*** input, float*** output, int size, int output_depth, int output_width) {
// Make computation // Make computation
dim3 gridSize(i_div_up(output_depth, BLOCKSIZE_x), i_div_up(output_dim, BLOCKSIZE_y), i_div_up(output_dim, BLOCKSIZE_z)); dim3 gridSize(i_div_up(output_depth, BLOCKSIZE_x), i_div_up(output_width, BLOCKSIZE_y), i_div_up(output_width, BLOCKSIZE_z));
dim3 blockSize(BLOCKSIZE_x, BLOCKSIZE_y, BLOCKSIZE_z); dim3 blockSize(BLOCKSIZE_x, BLOCKSIZE_y, BLOCKSIZE_z);
make_max_pooling_kernel<<<gridSize, blockSize>>>(input, output, size, output_depth, output_dim); make_max_pooling_kernel<<<gridSize, blockSize>>>(input, output, size, output_depth, output_width);
gpuErrchk( cudaPeekAtLastError() ); gpuErrchk( cudaPeekAtLastError() );
gpuErrchk( cudaDeviceSynchronize() ); gpuErrchk( cudaDeviceSynchronize() );
} }
#endif #endif
void make_max_pooling_cpu(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_max_pooling_cpu(float*** input, float*** output, int size, int output_depth, int output_width) {
// input[output_depth][output_dim+size-1][output_dim+size-1] // input[output_depth][output_width+size-1][output_width+size-1]
// output[output_depth][output_dim][output_dim] // output[output_depth][output_width][output_width]
float m; float m;
for (int i=0; i < output_depth; i++) { for (int i=0; i < output_depth; i++) {
for (int j=0; j < output_dim; j++) { for (int j=0; j < output_width; j++) {
for (int k=0; k < output_dim; k++) { for (int k=0; k < output_width; k++) {
m = FLT_MIN; m = FLT_MIN;
for (int a=0; a < size; a++) { for (int a=0; a < size; a++) {
for (int b=0; b < size; b++) { for (int b=0; b < size; b++) {
@ -154,11 +154,11 @@ void make_max_pooling_cpu(float*** input, float*** output, int size, int output_
#ifdef __CUDACC__ #ifdef __CUDACC__
extern "C" extern "C"
#endif #endif
void make_max_pooling(float*** input, float*** output, int size, int output_depth, int output_dim) { void make_max_pooling(float*** input, float*** output, int size, int output_depth, int output_width) {
#ifndef __CUDACC__ #ifndef __CUDACC__
make_max_pooling_cpu(input, output, size, output_depth, output_dim); make_max_pooling_cpu(input, output, size, output_depth, output_width);
#else #else
make_max_pooling_device(input, output, size, output_depth, output_dim); make_max_pooling_device(input, output, size, output_depth, output_width);
#endif #endif
} }