Compare commits

..

No commits in common. "e544da140ee20cc701fb4f304f4b1c8c3e19ea4b" and "0f28ee3f02f739a8a360535cb7feaf68f758a8db" have entirely different histories.

2 changed files with 8 additions and 9 deletions

View File

@ -155,6 +155,7 @@ NeuralNetwork loadModel(const char *path)
model.layers[model.numberOfLayers] = layer; model.layers[model.numberOfLayers] = layer;
model.numberOfLayers++; model.numberOfLayers++;
inputDimension = outputDimension; inputDimension = outputDimension;
outputDimension = readDimension(file); outputDimension = readDimension(file);
} }

View File

@ -14,21 +14,20 @@ static void prepareNeuralNetworkFile(const char *path, const NeuralNetwork nn)
printf("Failed to open file"); printf("Failed to open file");
return; return;
} }
printf("\nLayers in pNNF: %d\n", nn.numberOfLayers);
const char* header = "__info2_neural_network_file_format__"; const char* header = "__info2_neural_network_file_format__";
fwrite(header, sizeof(const char), strlen(header), file); fwrite(header, sizeof(const char), strlen(header), file);
fwrite(&(nn.numberOfLayers), sizeof(unsigned int), 1, file);
for (int i = 0; i < nn.numberOfLayers; i++) { fwrite(&(nn.numberOfLayers), sizeof(unsigned int), 1, file);
fwrite(&(nn.layers[i].weights.cols), sizeof(unsigned int), 1, file);
fwrite(&(nn.layers[i].weights.rows), sizeof(unsigned int), 1, file);
}
for(int i = 0; i < nn.numberOfLayers; i++) { for(int i = 0; i < nn.numberOfLayers; i++) {
//write everything to do with weights //write everything to do with weights
fwrite(&(nn.layers[i].weights.rows), sizeof(unsigned int), 1, file);
fwrite(&(nn.layers[i].weights.cols), sizeof(unsigned int), 1, file);
fwrite(nn.layers[i].weights.buffer, sizeof(MatrixType), nn.layers[i].weights.rows * nn.layers[i].weights.cols, file); fwrite(nn.layers[i].weights.buffer, sizeof(MatrixType), nn.layers[i].weights.rows * nn.layers[i].weights.cols, file);
//write everything to do with biases //write everything to do with biases
fwrite(&(nn.layers[i].biases.rows), sizeof(unsigned int), 1, file);
fwrite(&(nn.layers[i].biases.cols), sizeof(unsigned int), 1, file);
fwrite(nn.layers[i].biases.buffer, sizeof(MatrixType), nn.layers[i].biases.rows * nn.layers[i].biases.cols, file); fwrite(nn.layers[i].biases.buffer, sizeof(MatrixType), nn.layers[i].biases.rows * nn.layers[i].biases.cols, file);
} }
fclose(file); fclose(file);
@ -48,7 +47,6 @@ void test_loadModelReturnsCorrectNumberOfLayers(void)
Layer layers[] = {{.weights=weights1, .biases=biases1}, {.weights=weights2, .biases=biases2}}; Layer layers[] = {{.weights=weights1, .biases=biases1}, {.weights=weights2, .biases=biases2}};
NeuralNetwork expectedNet = {.layers=layers, .numberOfLayers=2}; NeuralNetwork expectedNet = {.layers=layers, .numberOfLayers=2};
printf("\nexpectedNetLayers: %d", expectedNet.numberOfLayers);
NeuralNetwork netUnderTest; NeuralNetwork netUnderTest;
prepareNeuralNetworkFile(path, expectedNet); prepareNeuralNetworkFile(path, expectedNet);