Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Suvorov DM/accuracy verification #115

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions app/accuracy_app/accuracy_check.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#include <opencv2/opencv.hpp>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: 'opencv2/opencv.hpp' file not found [clang-diagnostic-error]

#include <opencv2/opencv.hpp>
         ^

#include <iostream>
#include <filesystem>

int main() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please create help message for users

std::string directory = "./photos";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Accept directory as cmd line argument


for (const auto& entry : std::filesystem::directory_iterator(directory)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

namespace fs = std::filesystem;

I suggest using this, it is a common widely-used way to simplify std::filesystem related code

if (entry.is_regular_file()) {
cv::Mat image = cv::imread(entry.path().string());

// For example:
if (!image.empty()) {
cv::imshow("Image", image);
cv::waitKey(0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will show the images in a sequential order and block the execution. It is better not to do this. Our future application will not do that, actually.

What you need to do at this stage: read the content of the image, convert to tensor (cv::Mat -> Tensor, use our tensor class) and do nothing with this tensor (for now)

} else {
std::cerr << "Read image error. Image path is: " << entry.path() << std::endl;
}
}
}

return 0;
}
Binary file added app/accuracy_app/photos/car1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/accuracy_app/photos/cat1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/accuracy_app/photos/cat2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/accuracy_app/photos/cat3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/accuracy_app/photos/cat4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/accuracy_app/photos/dog1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/accuracy_app/photos/dog2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/accuracy_app/photos/dog3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/accuracy_app/photos/dog4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/layers/Tensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,17 @@ std::ostream& operator<<(std::ostream& out, const Tensor& t) {
}
return out;
}

template <typename T>
bool elementwiseTensorCmp(const Tensor& t1, const Tensor& t2, double threshold) {
if (t1.get_shape().count() != t2.get_shape().count()) return false;
if (t1.get_type() != t2.get_type()) return false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather throw an error in this case, cause it is just invalid, not meaning that these tensors are not equal


size_t size = t1.get_shape().count();
for (size_t i = 0; i < size; i++) {
if (std::abs(*(t1.as<T>())[i] - *(t2.as<T>())[i]) > threshold) {
return false;
}
}
return true;
}
Loading