From 175e389c3cb2606f502b3e86e3a2037302234a98 Mon Sep 17 00:00:00 2001 From: Paul Chang Date: Tue, 4 Jun 2024 10:09:26 -0700 Subject: [PATCH] revert back to HWY_ASSERT for lane constraints, qualify hn::Add PiperOrigin-RevId: 640193239 --- compression/nuq-inl.h | 2 +- gemma/ops.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compression/nuq-inl.h b/compression/nuq-inl.h index 518ea54..c03ce30 100644 --- a/compression/nuq-inl.h +++ b/compression/nuq-inl.h @@ -207,7 +207,7 @@ class NuqClustering { VI arg = hn::Zero(di); // For each j (start of rightmost cluster): VI vj = k1; - for (size_t j = 1; j < last + N; ++j, vj = Add(vj, k1)) { + for (size_t j = 1; j < last + N; ++j, vj = hn::Add(vj, k1)) { const VF c = ClusterDynProg(df, D, cc, num_clusters, last, j); // Retain the min cost and the j index that caused it. diff --git a/gemma/ops.h b/gemma/ops.h index 9a46553..e102224 100644 --- a/gemma/ops.h +++ b/gemma/ops.h @@ -371,8 +371,8 @@ void GEMM_4x4_Static(const MatT* HWY_RESTRICT A, const MatT* HWY_RESTRICT B, constexpr size_t kRegCols = 4; // in vectors static_assert(kRowsAC % kRegRows == 0); - static_assert(kColsA_RowsB % (N * kRegCols) == 0); static_assert(kColsBC % kRegCols == 0); + HWY_ASSERT(kColsA_RowsB % (N * kRegCols) == 0); constexpr size_t kTilesY = kRowsAC / kRegRows; constexpr size_t kTilesX = kColsBC / kRegCols; constexpr size_t kTiles = kTilesX * kTilesY; @@ -405,8 +405,8 @@ HWY_NOINLINE void MatMul_4x4(const MatT* HWY_RESTRICT A, constexpr size_t kRegCols = 4; // in vectors static_assert(kRowsAC % kRegRows == 0); - static_assert(kColsA_RowsB % (N * kRegCols) == 0); static_assert(kColsBC % kRegCols == 0); + HWY_ASSERT(kColsA_RowsB % (N * kRegCols) == 0); const size_t kTilesY = kRowsAC / kRegRows; const size_t kTilesX = kColsBC / kRegCols; const size_t kTiles = kTilesX * kTilesY;