potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #28860 from asmorkalov:as/no_optional

Browse Source 
Get rid of redundant C++ optional.
This commit is contained in:
Alexander Smorkalov
2026-04-23 10:14:51 +03:00
committed by GitHub
parent aab70b9a63 fa0954db82
commit 323ea1782d
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/tokenizer/core_bpe.cpp
+2 -2
View File
@@ -141,7 +141,7 @@ CoreBPE::CoreBPE(ByteVecRankMap encoder,
std::sort(sortedTokenBytes_.begin(), sortedTokenBytes_.end());
}
std::optional<std::vector<std::uint8_t>>
std::vector<std::uint8_t>
CoreBPE::decodeBytes(const std::vector<std::uint32_t>& tokens) const {
std::vector<std::uint8_t> out;
out.reserve(tokens.size() * 2);
@@ -157,7 +157,7 @@ CoreBPE::decodeBytes(const std::vector<std::uint32_t>& tokens) const {
if (sit != specialDecoder_.end()) {
tokenBytes = &sit->second;
} else {
return std::nullopt;
return std::vector<std::uint8_t>();
}
}
out.insert(out.end(), tokenBytes->begin(), tokenBytes->end());
modules/dnn/src/tokenizer/core_bpe.hpp
+1 -2
View File
@@ -45,7 +45,6 @@
#include <vector>
#include <unordered_map>
#include <unordered_set>
#include <optional>
#include <string>
#include <cstdint>
@@ -148,7 +147,7 @@ public:
* @param tokens Token ids.
* @return Decoded bytes on success, or @c std::nullopt if any id is unknown.
*/
std::optional<std::vector<std::uint8_t>> decodeBytes(const std::vector<std::uint32_t>& tokens) const;
std::vector<std::uint8_t> decodeBytes(const std::vector<std::uint32_t>& tokens) const;
private:
ByteVecRankMap encoder_;
modules/dnn/src/tokenizer/tokenizer.cpp
+3 -4
View File
@@ -47,11 +47,10 @@ struct BpeTokenizerImpl : public Tokenizer::Impl {
std::string decode(const std::vector<int>& tokens) override {
CV_Assert(coreBPE);
std::vector<uint32_t> t32(tokens.begin(), tokens.end());
auto opt_bytes = coreBPE->decodeBytes(t32);
if (!opt_bytes)
const std::vector<std::uint8_t> opt_bytes = coreBPE->decodeBytes(t32);
if (opt_bytes.empty())
CV_Error(cv::Error::StsError, "Invalid decode.");
const auto& bytes = *opt_bytes;
return std::string(reinterpret_cast<const char*>(bytes.data()), bytes.size());
return std::string(reinterpret_cast<const char*>(opt_bytes.data()), opt_bytes.size());
}
};