happyz
/
gemma.cpp
mirror of https://github.com/google/gemma.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Windows build - macro conflict with param name 

PiperOrigin-RevId: 657518587
This commit is contained in:
Jan Wassenberg 2024-07-30 03:21:56 -07:00 committed by Copybara-Service
parent 6ea4232b2e
commit 8b4915f321
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gemma/gemma-inl.h
View File

@ -577,13 +577,13 @@ HWY_NOINLINE void TransformerLayer(
class PrefillState { class PrefillState {
// TODO: move helper functions, also those in app.h, to a threading header // TODO: move helper functions, also those in app.h, to a threading header
using LPS = hwy::LogicalProcessorSet; using LPS = hwy::LogicalProcessorSet;
LPS Intersection(const LPS& big, const LPS& small) { LPS Intersection(const LPS& big_set, const LPS& small_set) {
LPS both; LPS both_set;
// Reduce expected work by iterating over the smaller set. // Reduce expected work by iterating over the smaller set.
small.Foreach([big, &both](size_t idx) { small_set.Foreach([&big_set, &both_set](size_t idx) {
if (big.Get(idx)) both.Set(idx); if (big_set.Get(idx)) both_set.Set(idx);
}); });
return both; return both_set;
} }
std::vector<size_t> CoresInLPS(const LPS& cluster) { std::vector<size_t> CoresInLPS(const LPS& cluster) {