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

Reduce arguments in functions in 'free.c'

Browse Source
This commit is contained in:
julienChemillier 2023-05-28 09:07:30 +02:00
parent 4ad116511e
commit d7d5a7ae6e
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cnn/free.c
View File

@ -148,8 +148,9 @@ void free_network(Network* network) {
// ----------------------- Pour le d_network ----------------------- // ----------------------- Pour le d_network -----------------------
void free_d_convolution(Network* network, D_Network* d_network, int pos) { void free_d_convolution(Network* network, int pos) {
Kernel_cnn* k_pos = network->kernel[pos]->cnn; Kernel_cnn* k_pos = network->kernel[pos]->cnn;
D_Network* d_network = network->d_network;
D_Kernel_cnn* d_k_pos = d_network->kernel[pos]->cnn; D_Kernel_cnn* d_k_pos = d_network->kernel[pos]->cnn;
int c = k_pos->columns; int c = k_pos->columns;
int k_size = k_pos->k_size; int k_size = k_pos->k_size;
@ -206,8 +207,9 @@ void free_d_convolution(Network* network, D_Network* d_network, int pos) {
} }
} }
void free_d_dense(Network* network, D_Network* d_network, int pos) { void free_d_dense(Network* network, int pos) {
D_Kernel_nn* d_k_pos = d_network->kernel[pos]->nn; D_Kernel_nn* d_k_pos = d_network->kernel[pos]->nn;
D_Network* d_network = network->d_network;
int dim = network->kernel[pos]->nn->size_input; int dim = network->kernel[pos]->nn->size_input;
for (int i=0; i < dim; i++) { for (int i=0; i < dim; i++) {
gree(d_k_pos->d_weights[i], true); gree(d_k_pos->d_weights[i], true);
@ -229,8 +231,9 @@ void free_d_dense(Network* network, D_Network* d_network, int pos) {
#endif #endif
} }
void free_d_dense_linearisation(Network* network, D_Network* d_network, int pos) { void free_d_dense_linearisation(Network* network, int pos) {
D_Kernel_nn* d_k_pos = d_network->kernel[pos]->nn; D_Kernel_nn* d_k_pos = d_network->kernel[pos]->nn;
D_Network* d_network = network->d_network;
int dim = network->kernel[pos]->nn->size_input; int dim = network->kernel[pos]->nn->size_input;
if (network->finetuning <= NN_AND_LINEARISATION) { if (network->finetuning <= NN_AND_LINEARISATION) {
@ -261,12 +264,12 @@ void free_d_network_creation(Network* network, D_Network* d_network) {
for (int i=0; i < network->max_size-1; i++) { for (int i=0; i < network->max_size-1; i++) {
D_Kernel* d_k_i = d_network->kernel[i]; D_Kernel* d_k_i = d_network->kernel[i];
if (d_k_i->cnn) { // Convolution if (d_k_i->cnn) { // Convolution
free_d_convolution(network, d_network, i); free_d_convolution(network, i);
} else if (d_k_i->nn) { // Dense } else if (d_k_i->nn) { // Dense
if (network->kernel[i]->linearisation == DOESNT_LINEARISE) { // Vecteur -> Vecteur if (network->kernel[i]->linearisation == DOESNT_LINEARISE) { // Vecteur -> Vecteur
free_d_dense(network, d_network, i); free_d_dense(network, i);
} else { // Matrice -> Vecteur } else { // Matrice -> Vecteur
free_d_dense_linearisation(network, d_network, i); free_d_dense_linearisation(network, i);
} }
} }
gree(network->kernel[i], true); gree(network->kernel[i], true);

6
src/cnn/include/free.h
View File

@ -50,17 +50,17 @@ void free_network(Network* network);
/* /*
* Libère l'espace mémoire alloué pour une d_convolution * Libère l'espace mémoire alloué pour une d_convolution
*/ */
void free_d_convolution(Network* network, D_Network* d_network, int pos); void free_d_convolution(Network* network, int pos);
/* /*
* Libère l'espace mémoire alloué pour une d_dense * Libère l'espace mémoire alloué pour une d_dense
*/ */
void free_d_dense(Network* network, D_Network* d_network, int pos); void free_d_dense(Network* network, int pos);
/* /*
* Libère l'espace mémoire alloué pour une d_dense_linearisation * Libère l'espace mémoire alloué pour une d_dense_linearisation
*/ */
void free_d_dense_linearisation(Network* network, D_Network* d_network, int pos); void free_d_dense_linearisation(Network* network, int pos);
/* /*
* Libère entièrement l'espace mémoire alloué dans 'create_d_network' (creation.c) * Libère entièrement l'espace mémoire alloué dans 'create_d_network' (creation.c)