Miscellaneous cleanup.

* Updates NUMA binding guard in allocator.cc to match the include guard.
* Initializes vectors in flash_attention.cc.
* Excludes SCALAR for HWY_RISCV in compression/types.h.

PiperOrigin-RevId: 922218487

Author: birukw

compression/types.h

@@ -53,6 +53,8 @@ namespace gcpp {
   (HWY_SCALAR | HWY_SSE2 | HWY_SSSE3 | HWY_SSE4 | HWY_AVX10_2)
 #elif HWY_ARCH_WASM
 #define GEMMA_DISABLED_TARGETS HWY_SCALAR
+#elif HWY_ARCH_RISCV
+#define GEMMA_DISABLED_TARGETS HWY_SCALAR
 #endif  // HWY_ARCH_*
 
 #endif  // GEMMA_DISABLED_TARGETS

gemma/flash_attention.cc

@@ -571,7 +571,8 @@ static HWY_INLINE void FlashAttentionTileStepAndApplySoftCap4(
   using VF4 = hn::Vec<DF4>;
   static_assert(kNumQueries >= 1 && kNumQueries <= 4);
   VF4 new_max = hn::Set(df4, kNegInf);
-  VF max_0, max_1, max_2, max_3 = hn::Zero(df);
+  VF max_0 = hn::Zero(df), max_1 = hn::Zero(df), max_2 = hn::Zero(df),
+     max_3 = hn::Zero(df);
   max_0 = hn::Max(x_0_p0, x_0_p1);
   if constexpr (kNumQueries >= 2) {
     max_1 = hn::Max(x_1_p0, x_1_p1);

io/BUILD.bazel

@@ -29,7 +29,8 @@ FILE_DEPS = select({
         # Placeholder for io deps, do not remove
     ],
     ":android": [],
-    # Placeholder for internal build rules, do not remove
+    # Placeholder 1 for internal build rules, do not remove
+    # Placeholder 2 for internal build rules, do not remove
 })
 
 cc_library(

util/allocator.cc

@@ -236,7 +236,7 @@ AlignedPtr<uint8_t[]> Allocator::AllocBytes(size_t bytes) const {
 
   // Binding, or large vector/cache line size: use platform-specific allocator.
 
-#if HWY_OS_LINUX && !defined(__ANDROID_API__)
+#if GEMMA_BIND && HWY_OS_LINUX && !defined(__ANDROID_API__)
   // `move_pages` is documented to require an anonymous/private mapping or
   // `MAP_SHARED`. A normal allocation might not suffice, so we use `mmap`.
   // `Init` verified that the page size is a multiple of `QuantumBytes()`.