From f13d3950b0abe34e9cbe25f6ecc9c6cd8e9de4fb Mon Sep 17 00:00:00 2001 From: jastornig Date: Sat, 23 Sep 2023 20:30:25 +0000 Subject: [PATCH 01/15] (fix) image loader windows --- image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image.c b/image.c index bc8417b..6818cf8 100644 --- a/image.c +++ b/image.c @@ -68,8 +68,8 @@ Image * load_pgm_image(char * image_file_string){ Image** import_images(char* image_file_string, char* label_file_string, int* _number_imported, int count) { printf("Loading Images\n"); // create file pointer for the image and label data - FILE* image_file = fopen(image_file_string, "r"); - FILE* label_file = fopen(label_file_string, "r"); + FILE* image_file = fopen(image_file_string, "rb"); + FILE* label_file = fopen(label_file_string, "rb"); // check if the file could be opened if(image_file == NULL || label_file == NULL) { From b9dba1a92bd05bf1afcb483c8c895343221534de Mon Sep 17 00:00:00 2001 From: Raphael Walcher Date: Sun, 24 Sep 2023 20:51:27 +0200 Subject: [PATCH 02/15] readme --- README.md | 104 ++++++++++++------------------------------------------ 1 file changed, 23 insertions(+), 81 deletions(-) diff --git a/README.md b/README.md index 3fcc78b..f9adb41 100644 --- a/README.md +++ b/README.md @@ -1,92 +1,34 @@ # C-net ඞ - - -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin https://git-ainf.aau.at/jastornig/c-net.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://git-ainf.aau.at/jastornig/c-net/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - ## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. +C-net ඞ is a Python project designed to read and predict numbers from the MNIST dataset using neural networks. ## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. +![Insert GIF or Screenshot here](link_to_visual.gif) ## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. -## Contributing -State if you are open to contributions and what your requirements are for accepting them. +- [x] Implemented an Image Loader for MNIST dataset. +- [x] Created a prediction function for recognizing handwritten digits. +- [x] Developed matrix calculation methods to support neural network operations. +- [x] Added functionality to load and save neural network models. +- [x] Successfully trained the network on MNIST images. +- [x] Achieved an accuracy rate with a confidence level above 90%. +- [ ] Ongoing optimization and code refinement. -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. +## Authors and Acknowledgments +This project was brought to you by the following contributors: +- Stornig, Jakob +- Schleicher, Thomas +- Dworski, Daniel +- Walcher, Raphael -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. +We would like to express our gratitude to the following project, which served as an inspiration and reference: +- [MNIST from Scratch](https://github.com/markkraay/mnist-from-scratch) by markkraay +- [Neural Network Framework in C](https://medium.com/analytics-vidhya/building-neural-network-framework-in-c-using-backpropagation-8ad589a0752d) +- [Simple Neural Network Implementation in C](https://towardsdatascience.com/simple-neural-network-implementation-in-c-663f51447547) +- [3Blue1Brown Neural Network Series](https://www.youtube.com/watch?v=aircAruvnKk&list=PLZHQObOWTQDNU6R1_67000Dx_ZCJB-3pi) +- [Brotcrunsher's YouTube Videos](https://www.youtube.com/watch?v=oCPT87SvkPM&pp=ygUbYnJvdCBjcnVzaGVyIG5ldXJhbCBuZXp3ZXJr), [Video 2](https://www.youtube.com/watch?v=YIqYBxpv53A&pp=ygUbYnJvdCBjcnVzaGVyIG5ldXJhbCBuZXp3ZXJr), [Video 3](https://youtu.be/EAtQCut6Qno) -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. +## Project Status +The project is considered finished, but ongoing optimizations and improvements may still be in progress. From e9881ed2b3b8a8d4e14ee0d63838c538c14a243d Mon Sep 17 00:00:00 2001 From: Jakob Stornig Date: Sun, 24 Sep 2023 20:56:44 +0200 Subject: [PATCH 03/15] !(feat) cli implemented breaking changes. save_network in neuronal_network.c now takes a second parameter file_name --- main.c | 124 +++++++++++++++++++++++++++++++++++++++------ neuronal_network.c | 10 ++-- neuronal_network.h | 2 +- 3 files changed, 116 insertions(+), 20 deletions(-) diff --git a/main.c b/main.c index 9b1a5d5..b2f7302 100644 --- a/main.c +++ b/main.c @@ -2,28 +2,122 @@ #include "image.h" #include "neuronal_network.h" +#include +#include +#include +#include "util.h" -int main() { - Image** images = import_images("../data/train-images.idx3-ubyte", "../data/train-labels.idx1-ubyte", NULL, 60000); -// img_visualize(images[0]); -// img_visualize(images[1]); +void parsingErrorPrintHelp(){ + printf("Syntax: c_net [train | detect]\n"); + printf("commands:\n"); + printf("train\t train the network\n"); + printf("predict\t load a pgm image and predict_demo the number\n"); + exit(1); +} -// matrix_print(images[0]->pixel_values); -// matrix_print(images[1]->pixel_values); +void parsingErrorTrain(){ + printf("invalid syntax\n"); + printf("Syntax: c_net train [path_to_train-images.idx3-ubyte] [path_to_train-labels.idx1-ubyte] [hidden_layer_count] [neurons_per_layer] [epochs] [learning_rate] [path_to_save_network]\n"); + exit(1); +} - Neural_Network* nn = new_network(28*28, 40, 5, 10, 0.08); - randomize_network(nn, 1); -// Neural_Network* nn = load_network("../networks/newest_network.txt"); -// printf("Done loading!\n"); +void parsingErrorDetect(){ + printf("invalid syntax\n"); + printf("Syntax: c_net predict_demo [path_to_network] [image_file]"); +} -// batch_train(nn, images, 20000, 20); +void predict_demo(int argc, char** arguments){ + if(argc != 2) parsingErrorDetect(); + char * network_file = arguments[0]; + char * image_file = arguments[1]; - for (int i = 0; i < 30000; ++i) { - train_network(nn, images[i], images[i]->label); + Neural_Network * nn = load_network(network_file); + Image * image = load_pgm_image(image_file); + Matrix * result = predict_image(nn, image); + int predicted = matrix_argmax(result); + printf("prediction result %d\n", predicted); + matrix_print(result); + matrix_free(result); +} + +void train(int argc, char** arguments) { + if (argc != 7) parsingErrorTrain(); + char *image_file = arguments[0]; + char *label_file = arguments[1]; + int hidden_count = (int) strtol(arguments[2], NULL, 10); + int neurons_per_layer = (int) strtol(arguments[3], NULL, 10); + int epochs = (int) strtol(arguments[4], NULL, 10); + if (errno != 0) { + printf("hidden_count, neurons_per_layer or epochs could not be parsed!\n"); + exit(1); } + double learning_rate = strtod(arguments[5], NULL); + if (errno != 0) { + printf("learning_rate could not be parsed!\n"); + exit(1); + } + char *save_path = arguments[6]; + int imported = 0; + Image **images = import_images(image_file, label_file, &imported, 50000); - save_network(nn); +// for(int i = 0; i < imported; i++){ +// matrix_save(images[i]->pixel_values, "images.txt"); +// } +// exit(1); - printf("%lf\n", measure_network_accuracy(nn, images, 10000)); + Neural_Network *nn = new_network(28 * 28, neurons_per_layer, hidden_count, 10, learning_rate); + randomize_network(nn, 1); + printf("training_network\n"); + for(int epoch = 1; epoch <= epochs; epoch++){ + printf("epoch %d\n", epoch); + for (int i = 0; i < imported; i++) { + if (i % 1000 == 0) { + updateBar(i * 100 / imported); + } + train_network(nn, images[i], images[i]->label); + } + updateBar(100); + printf("\n"); + printf("accuracy %lf\n", measure_network_accuracy(nn, images, 10000)); + } + printf("done training!\n"); + save_network(nn, save_path); +} + +int main(int argc, char** argv) { +// Image** images = import_images("../data/train-images.idx3-ubyte", "../data/train-labels.idx1-ubyte", NULL, 60000); +//// img_visualize(images[0]); +//// img_visualize(images[1]); +// +//// matrix_print(images[0]->pixel_values); +//// matrix_print(images[1]->pixel_values); +// +// Neural_Network* nn = new_network(28*28, 40, 5, 10, 0.08); +// randomize_network(nn, 1); +//// Neural_Network* nn = load_network("../networks/newest_network.txt"); +//// printf("Done loading!\n"); +// +//// batch_train(nn, images, 20000, 20); +// +// for (int i = 0; i < 30000; ++i) { +// train_network(nn, images[i], images[i]->label); +// } +// +// save_network(nn); +// +// printf("%lf\n", measure_network_accuracy(nn, images, 10000)); + if(argc < 2){ + parsingErrorPrintHelp(); + exit(1); + } + if(strcmp(argv[1], "train") == 0){ + train(argc-2, argv+2); + return 0; + } + if(strcmp(argv[1], "predict") == 0){ + predict_demo(argc - 2, argv + 2); + return 0; + } + parsingErrorPrintHelp(); } \ No newline at end of file diff --git a/neuronal_network.c b/neuronal_network.c index 1c58018..8cf8616 100644 --- a/neuronal_network.c +++ b/neuronal_network.c @@ -2,6 +2,7 @@ #include "neuronal_network.h" #include #include +#include "util.h" double sigmoid(double input); Matrix* predict(Neural_Network* network, Matrix* image_data); @@ -45,9 +46,7 @@ void free_network(Neural_Network* network){ free(network); } -void save_network(Neural_Network* network) { - - char* file_name = "../networks/newest_network.txt"; +void save_network(Neural_Network* network, char * file_name) { // create file FILE* save_file = fopen(file_name, "w"); @@ -117,7 +116,9 @@ void print_network(Neural_Network* network) { double measure_network_accuracy(Neural_Network* network, Image** images, int amount) { int num_correct = 0; - for (int i = 0; i < amount; i++) { + printf("evaluating network\n"); + for (int i = 50001; i < amount; i++) { + updateBar(i*100/amount); Matrix* prediction = predict_image(network, images[i]); int guess = matrix_argmax(prediction); @@ -129,6 +130,7 @@ double measure_network_accuracy(Neural_Network* network, Image** images, int amo matrix_free(prediction); } + updateBar(100); return ((double) num_correct) / amount; } diff --git a/neuronal_network.h b/neuronal_network.h index a2db05f..34ccde0 100644 --- a/neuronal_network.h +++ b/neuronal_network.h @@ -21,7 +21,7 @@ Neural_Network* new_network(int input_size, int hidden_size, int hidden_amount, void randomize_network(Neural_Network* network, int scope); void free_network(Neural_Network* network); -void save_network(Neural_Network* network); +void save_network(Neural_Network* network, char * file_name); Neural_Network* load_network(char* file); void print_network(Neural_Network* network); From 2019d56122f6f65ceda123dbe9a443fe2ae5590a Mon Sep 17 00:00:00 2001 From: Raphael Walcher Date: Sun, 24 Sep 2023 20:58:34 +0200 Subject: [PATCH 04/15] picture --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9adb41..c52919b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ C-net ඞ is a Python project designed to read and predict numbers from the MNIST dataset using neural networks. ## Visuals -![Insert GIF or Screenshot here](link_to_visual.gif) +![Insert GIF or Screenshot here](https://camo.githubusercontent.com/b308207b5c5ce0970b13c21609350fab21aa61a2fae56da2a6418d6fdcdbc079/68747470733a2f2f7777772e776f6c6672616d2e636f6d2f6d617468656d61746963612f6e65772d696e2d31302f656e68616e6365642d696d6167652d70726f63657373696e672f48544d4c496d616765732e656e2f68616e647772697474656e2d6469676974732d636c617373696669636174696f6e2f736d616c6c7468756d625f31302e676966) ## Roadmap From eec607f7dd2d4abcafac3af6a0117729ed5819ce Mon Sep 17 00:00:00 2001 From: Raphael Walcher Date: Sun, 24 Sep 2023 21:00:37 +0200 Subject: [PATCH 05/15] picture --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c52919b..3dac6fa 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This project was brought to you by the following contributors: - Dworski, Daniel - Walcher, Raphael -We would like to express our gratitude to the following project, which served as an inspiration and reference: +We would like to express our gratitude to the following sources, which served as an inspiration and reference: - [MNIST from Scratch](https://github.com/markkraay/mnist-from-scratch) by markkraay - [Neural Network Framework in C](https://medium.com/analytics-vidhya/building-neural-network-framework-in-c-using-backpropagation-8ad589a0752d) - [Simple Neural Network Implementation in C](https://towardsdatascience.com/simple-neural-network-implementation-in-c-663f51447547) @@ -32,3 +32,5 @@ We would like to express our gratitude to the following project, which served as ## Project Status The project is considered finished, but ongoing optimizations and improvements may still be in progress. + +![amogus](https://media.tenor.com/7kpsm7kU330AAAAd/sussy-among-us.gif) \ No newline at end of file From 2d7fe49598fee4910248f26f1eb01a8277bd32b4 Mon Sep 17 00:00:00 2001 From: rawalcher Date: Sun, 24 Sep 2023 19:07:24 +0000 Subject: [PATCH 06/15] Update file README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3dac6fa..5db1ec0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # C-net ඞ ## Description -C-net ඞ is a Python project designed to read and predict numbers from the MNIST dataset using neural networks. +C-net ඞ is a C project designed to read and predict numbers from the MNIST dataset using neural networks. ## Visuals ![Insert GIF or Screenshot here](https://camo.githubusercontent.com/b308207b5c5ce0970b13c21609350fab21aa61a2fae56da2a6418d6fdcdbc079/68747470733a2f2f7777772e776f6c6672616d2e636f6d2f6d617468656d61746963612f6e65772d696e2d31302f656e68616e6365642d696d6167652d70726f63657373696e672f48544d4c496d616765732e656e2f68616e647772697474656e2d6469676974732d636c617373696669636174696f6e2f736d616c6c7468756d625f31302e676966) From b9c3e93564e733da6fbd2a2331906b1ea23a273f Mon Sep 17 00:00:00 2001 From: jastornig Date: Sun, 24 Sep 2023 19:20:20 +0000 Subject: [PATCH 07/15] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..e0c4685 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,37 @@ +# This file is a template, and might need editing before it works on your project. +# You can copy and paste this template into a new `.gitlab-ci.yml` file. +# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword. +# +# To contribute improvements to CI/CD templates, please follow the Development guide at: +# https://docs.gitlab.com/ee/development/cicd/templates.html +# This specific template is located at: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/C++.gitlab-ci.yml + +# use the official gcc image, based on debian +# can use versions as well, like gcc:5.2 +# see https://hub.docker.com/_/gcc/ + +image: gcc + +build: + stage: build + # instead of calling g++ directly you can also use some build toolkit like make + # install the necessary build tools when needed + before_script: + - apt update && apt -y install cmake + script: + - cmake . + - cmake --build . + artifacts: + paths: + - c_make + # depending on your build setup it's most likely a good idea to cache outputs to reduce the build time + # cache: + # paths: + # - "*.o" + + +deploy: + stage: deploy + script: echo "Define your deployment script!" + environment: production From 38fafa672ce41bd0b9f04ae1492a622fa3598f83 Mon Sep 17 00:00:00 2001 From: Jakob Stornig Date: Sun, 24 Sep 2023 21:27:59 +0200 Subject: [PATCH 08/15] minor changes for pgm files --- image.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/image.c b/image.c index 6818cf8..3fcbd1e 100644 --- a/image.c +++ b/image.c @@ -14,12 +14,13 @@ void big_endian_to_c_uint(const char * bytes, void * target, int size) { void read_until_space_or_newline(char * buff, int maxCount, FILE * fptr){ int bufferOffset = 0; - char c = -1; + char c; + int counter = 0; do{ c = (char)getc(fptr); buff[bufferOffset++] = c; - }while(!feof(fptr) && c != 0 && c != ' ' && c !='\n'); + }while(!feof(fptr) && c != 0 && c != ' ' && c !='\n' && counter++ < maxCount); buff[bufferOffset-1] = 0; } @@ -29,8 +30,7 @@ Image * load_pgm_image(char * image_file_string){ image->label = -1; - char buffer[100]; - int magic_number = 0; + char buffer[2048]; fgets(buffer, 4, fptr); if(buffer[0] != 'P' || buffer[1] != '5'){ printf("Wrong file Format"); @@ -40,17 +40,16 @@ Image * load_pgm_image(char * image_file_string){ fgets(buffer, 1024, fptr); } - int image_width, image_height, image_length, image_white ; + int image_width, image_height, image_white ; read_until_space_or_newline(buffer, 10, fptr); - image_width = strtol(buffer, NULL, 10); + image_width = (int)strtol(buffer, NULL, 10); read_until_space_or_newline(buffer, 10, fptr); - image_height = strtol(buffer, NULL, 10); + image_height = (int)strtol(buffer, NULL, 10); read_until_space_or_newline(buffer, 10, fptr); - image_white = strtol(buffer, NULL, 10); + image_white = (int)strtol(buffer, NULL, 10); - image_length = image_width * image_height; image->pixel_values = matrix_create(image_height, image_width); for(int i = 0; i < image_height; i++){ From 77b67aa949fc7875839333dfe14121955c455121 Mon Sep 17 00:00:00 2001 From: jastornig Date: Sun, 24 Sep 2023 20:12:14 +0000 Subject: [PATCH 09/15] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0c4685..e7a3182 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,9 @@ # see https://hub.docker.com/_/gcc/ image: gcc +stages: + - build + - release build: stage: build @@ -24,14 +27,25 @@ build: - cmake --build . artifacts: paths: - - c_make - # depending on your build setup it's most likely a good idea to cache outputs to reduce the build time - # cache: - # paths: - # - "*.o" + - c_net + reports: + dotenv: CI_JOB_ID.env + -deploy: - stage: deploy +release: + stage: release + needs: + - build + release: + tag_name: $CI_COMMIT_SHORT_SHA' + description: "latest" + + assets: + links: + - name: c_net + url: '${CI_PROJECT_URL}/-/jobs/${BUILD_JOB_ID}/artifacts/file/c_net' + script: echo "Define your deployment script!" - environment: production + + From a681833712c145887f251d1c4ddb1fde4bdc8f78 Mon Sep 17 00:00:00 2001 From: jastornig Date: Sun, 24 Sep 2023 20:19:40 +0000 Subject: [PATCH 10/15] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7a3182..7e04fb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,8 +23,11 @@ build: before_script: - apt update && apt -y install cmake script: + - echo BUILD_JOB_ID=$CI_JOB_ID >> CI_JOB_ID.env + - echo "Compiling the code..." - cmake . - cmake --build . + artifacts: paths: - c_net @@ -36,7 +39,8 @@ build: release: stage: release needs: - - build + - job: build + release: tag_name: $CI_COMMIT_SHORT_SHA' description: "latest" From e821afdbd5cf9741c5d203eff557198ec9ee42b6 Mon Sep 17 00:00:00 2001 From: jastornig Date: Sun, 24 Sep 2023 20:23:22 +0000 Subject: [PATCH 11/15] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e04fb1..0af1ae5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,6 +37,7 @@ build: release: + image: registry.gitlab.com/gitlab-org/release-cli:latest stage: release needs: - job: build From 1cfdf93f7caf531c2d24231a51731c5c6222d493 Mon Sep 17 00:00:00 2001 From: Jakob Stornig Date: Sun, 24 Sep 2023 22:29:41 +0200 Subject: [PATCH 12/15] (fix) evaluation trained with 50000 images evaluated with 10000 --- main.c | 15 +++++++-------- neuronal_network.c | 3 ++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/main.c b/main.c index b2f7302..1d17aa5 100644 --- a/main.c +++ b/main.c @@ -8,7 +8,7 @@ #include "util.h" void parsingErrorPrintHelp(){ - printf("Syntax: c_net [train | detect]\n"); + printf("Syntax: c_net [train | predict]\n"); printf("commands:\n"); printf("train\t train the network\n"); printf("predict\t load a pgm image and predict_demo the number\n"); @@ -58,19 +58,18 @@ void train(int argc, char** arguments) { } char *save_path = arguments[6]; int imported = 0; - Image **images = import_images(image_file, label_file, &imported, 50000); + Image ** images = import_images(image_file, label_file, &imported, 60000); + Image ** evaluation_images = images+50000; -// for(int i = 0; i < imported; i++){ -// matrix_save(images[i]->pixel_values, "images.txt"); -// } -// exit(1); + int training_image_count = 50000; + int testing_image_count = 10000; Neural_Network *nn = new_network(28 * 28, neurons_per_layer, hidden_count, 10, learning_rate); randomize_network(nn, 1); printf("training_network\n"); for(int epoch = 1; epoch <= epochs; epoch++){ printf("epoch %d\n", epoch); - for (int i = 0; i < imported; i++) { + for (int i = 0; i < training_image_count; i++) { if (i % 1000 == 0) { updateBar(i * 100 / imported); } @@ -78,7 +77,7 @@ void train(int argc, char** arguments) { } updateBar(100); printf("\n"); - printf("accuracy %lf\n", measure_network_accuracy(nn, images, 10000)); + printf("accuracy %lf\n", measure_network_accuracy(nn, evaluation_images, testing_image_count)); } printf("done training!\n"); save_network(nn, save_path); diff --git a/neuronal_network.c b/neuronal_network.c index 8cf8616..756b71d 100644 --- a/neuronal_network.c +++ b/neuronal_network.c @@ -117,7 +117,8 @@ double measure_network_accuracy(Neural_Network* network, Image** images, int amo int num_correct = 0; printf("evaluating network\n"); - for (int i = 50001; i < amount; i++) { + if(amount > 10000) amount = 10000; + for (int i = 0; i < amount; i++) { updateBar(i*100/amount); Matrix* prediction = predict_image(network, images[i]); From 754d170616a8e55b1be531a41e98909d2865ccf9 Mon Sep 17 00:00:00 2001 From: jastornig Date: Sun, 24 Sep 2023 20:36:11 +0000 Subject: [PATCH 13/15] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0af1ae5..39e9622 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ release: assets: links: - - name: c_net + - name: c_net linux download (precompiled) url: '${CI_PROJECT_URL}/-/jobs/${BUILD_JOB_ID}/artifacts/file/c_net' script: echo "Define your deployment script!" From 746f4cf3bd716b5ded967b3a29c3d4e246f76009 Mon Sep 17 00:00:00 2001 From: Jakob Stornig Date: Sun, 24 Sep 2023 22:36:40 +0200 Subject: [PATCH 14/15] deleted unused functions --- matrix.c | 25 ------------------------- matrix.h | 2 -- 2 files changed, 27 deletions(-) diff --git a/matrix.c b/matrix.c index ba7c258..2a9acfc 100644 --- a/matrix.c +++ b/matrix.c @@ -216,21 +216,6 @@ Matrix* scale(Matrix* matrix, double value) { return result_matrix; } -Matrix* addScalar(Matrix* matrix, double value) { - - // create a copy of the original matrix - Matrix* result_matrix = matrix_copy(matrix); - - // iterate over all numbers in the matrix and add the scalar value - for (int i = 0; i < result_matrix->rows; i++) { - for (int j = 0; j < result_matrix->columns; j++) { - result_matrix->numbers[i][j] += value; - } - } - - // return the copy - return result_matrix; -} Matrix* transpose(Matrix* matrix) { @@ -249,16 +234,6 @@ Matrix* transpose(Matrix* matrix) { } -double matrix_sum(Matrix* matrix) { - double sum = 0; - for (int i = 0; i < matrix->rows; i++) { - for (int j = 0; j < matrix->columns; j++) { - sum += matrix->numbers[i][j]; - } - } - return sum; -} - void matrix_save(Matrix* matrix, char* file_string){ // open the file in append mode diff --git a/matrix.h b/matrix.h index 2e0e5a9..4ece217 100644 --- a/matrix.h +++ b/matrix.h @@ -36,6 +36,4 @@ Matrix* subtract(Matrix* matrix1, Matrix* matrix2); Matrix* dot(Matrix* matrix1, Matrix* matrix2); Matrix* apply(double (*function)(double), Matrix* matrix); Matrix* scale(Matrix* matrix, double value); -Matrix* addScalar(Matrix* matrix, double value); Matrix* transpose(Matrix* matrix); -double matrix_sum(Matrix* matrix); \ No newline at end of file From aa58f99045c7a34fd7ee0fe7c25037280f481fc6 Mon Sep 17 00:00:00 2001 From: Jakob Stornig Date: Mon, 25 Sep 2023 11:11:07 +0200 Subject: [PATCH 15/15] minor changes --- image.c | 4 ++++ main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/image.c b/image.c index 3fcbd1e..f52fa2c 100644 --- a/image.c +++ b/image.c @@ -26,6 +26,10 @@ void read_until_space_or_newline(char * buff, int maxCount, FILE * fptr){ Image * load_pgm_image(char * image_file_string){ FILE * fptr = fopen(image_file_string, "r"); + if(!fptr){ + printf("could not open image file. exit\n"); + exit(1); + } Image *image = malloc(sizeof(Image)); image->label = -1; diff --git a/main.c b/main.c index 1d17aa5..f4c966e 100644 --- a/main.c +++ b/main.c @@ -23,7 +23,7 @@ void parsingErrorTrain(){ void parsingErrorDetect(){ printf("invalid syntax\n"); - printf("Syntax: c_net predict_demo [path_to_network] [image_file]"); + printf("Syntax: c_net predict_demo [path_to_network] [image_file]\n"); } void predict_demo(int argc, char** arguments){