sync: minja #12739
Merged
sync: minja #12739
Conversation
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
|
Removing json.hpp include might be a little premature. :) |
|
Did you forget to undraft this, or is it not ready yet? |
Sorry on busy holidays 😎, CI finally went green (needed a nudge), now ready for review |
CISC
approved these changes
Apr 4, 2025
| @@ -240,7 +252,7 @@ class Value : public std::enable_shared_from_this<Value> { | |||
| auto index = key.get<int>(); | |||
| return array_->at(index < 0 ? array_->size() + index : index); | |||
| } else if (object_) { | |||
| if (!key.is_hashable()) throw std::runtime_error("Unhashable type: " + dump()); | |||
| if (!key.is_hashable()) throw std::runtime_error("Unashable type: " + dump()); | |||
There was a problem hiding this comment.
Suggested change
| if (!key.is_hashable()) throw std::runtime_error("Unashable type: " + dump()); | |
| if (!key.is_hashable()) throw std::runtime_error("Unhashable type: " + dump()); |
I guess this was merged here previously, perhaps you'll upstream it?
There was a problem hiding this comment.
Ah, thanks! Yes I'd rather only do changes in the minja repo and just sync back wholesale here, I'll apply these there shortly.
| @@ -249,7 +261,7 @@ class Value : public std::enable_shared_from_this<Value> { | |||
| } | |||
| void set(const Value& key, const Value& value) { | |||
| if (!object_) throw std::runtime_error("Value is not an object: " + dump()); | |||
| if (!key.is_hashable()) throw std::runtime_error("Unhashable type: " + dump()); | |||
| if (!key.is_hashable()) throw std::runtime_error("Unashable type: " + dump()); | |||
There was a problem hiding this comment.
Suggested change
| if (!key.is_hashable()) throw std::runtime_error("Unashable type: " + dump()); | |
| if (!key.is_hashable()) throw std::runtime_error("Unhashable type: " + dump()); |
Same.
timwu
pushed a commit
to timwu/llama.cpp
that referenced
this pull request
May 5, 2025
* sync: minja google/minja#57 * fix json include
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
(Follow up to #12699 which cherrypicked Ling-lite support + added test)
cc/ @yeahdongcn, @CISC