Merged
Conversation
Functionality for c++ http added, but not working yet Adds saving train metrics Adds saving train metrics and responding with PNG
Data loader implementation
* Add loss type selection * Add loss type selection * Remove layer-class loss * Clean up Loss type * Make format
* Fix input selection * Clean up fix input selection
lpetrov02
force-pushed
the
task181_train_with_dataloader
branch
from
ee60415 to
9c984d0
Compare
Makes preparations for metrics logging on python Functionality for c++ http added, but not working yet Adds saving train metrics Adds saving train metrics and responding with PNG Adaptates code for new 4D blob cpprest CI support Add load possibility for zip Add load possibility for png on predict ------- GRA-122: Data loader implementation (#67) Data loader implementation ------- ID-154: Loss type selection (#70) * Add loss type selection * Add loss type selection * Remove layer-class loss * Clean up Loss type * Make format ------- ID-171: Fix input selection (#69) * Fix input selection * Clean up fix input selection ------- Change train and predict for zip file case Starts fixing train Fixes train with dataloader It's not fucking working :( (x3) server train fix Fixes train and predcit
lpetrov02
force-pushed
the
task181_train_with_dataloader
branch
from
9c984d0 to
47b519c
Compare
Contributor
|
Уфф ну надо пофиксить конфликты) Ну там я так понимаю просто принимаешь то что есть, хотя все равно смотри на всякий случай чтоб свое не затереть |
Contributor
Author
|
Я решил конфликты, надо проверить, что я там ничего лишнего не убрал |
Artem-Goldenberg
requested changes
Dec 19, 2023
Contributor
Artem-Goldenberg
left a comment
Artem-Goldenberg
left a comment
There was a problem hiding this comment.
Да, убери тут вот это и можно вливать
server/core/Shape.cpp
Outdated
| vector<size_t> Shape::getDims() const { | ||
| vector<size_t> dims; | ||
| for (int i = 0; i < 4; i++) { | ||
| for (int i = 4 - dimsCount; i < 4; i++) { |
Contributor
There was a problem hiding this comment.
вот это надо оставить как было, это мы специально поменяли
server/core/Operation.h
Outdated
Comment on lines
+17
to
+21
| std::string name = ""; | ||
|
|
||
| virtual std::string getName() const { | ||
| return name; | ||
| } |
Contributor
There was a problem hiding this comment.
вот это вроде договорились что тоже не надо
server/api/server.cpp
Outdated
Comment on lines
+168
to
+188
| void extract_from_zip(std::string path, std::string root) { | ||
| zip_t* z; | ||
| int err; | ||
| z = zip_open(path.c_str(), 0, &err); | ||
| if (z == nullptr) { | ||
| throw std::runtime_error("File doesn't exist"); | ||
| } | ||
| zip_stat_t info; | ||
| for (int i = 0; i < zip_get_num_files(z); ++i) { | ||
| if (zip_stat_index(z, i, 0, &info) == 0) { | ||
| ofstream fout(root + "/" + info.name, ios::binary); | ||
| zip_file* file = zip_fopen_index(z, i, 0); | ||
| std::vector<char> file_data(info.size); | ||
| zip_fread(file, file_data.data(), info.size); | ||
| fout.write(file_data.data(), info.size); | ||
| fout.close(); | ||
| } | ||
| } | ||
| std::filesystem::remove(path); | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
Это тоже можешь пока убрать, оно в моем пре есть
Contributor
|
Кстати еще остался баг с тем, что удаляешь слой, а во входах он не удаляется |
Contributor
Author
|
Починил этот баг, утром посмотрю комментарии выше |
Contributor
|
Все хорошо, можно вливать |
Artem-Goldenberg
approved these changes
Dec 20, 2023
# Conflicts: # py_server/mlcraft/dataset.py # py_server/mlcraft/server.py # server/api/server.cpp # server/core/Layer.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Выбор входов не отображался из-за изменения формата строки, сыпались ошибки, и окно параметров не открывалось.