From ee6e017a7774dd4575ae559b6bd20484d1bd52b8 Mon Sep 17 00:00:00 2001
From: Jan Wassenberg <janwas@google.com>
Date: Wed, 10 Jul 2024 04:17:46 -0700
Subject: [PATCH] Fix windows build: min conflict, unused VF

PiperOrigin-RevId: 650955138
---
 backprop/backward-inl.h | 1 -
 util/app.h              | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/backprop/backward-inl.h b/backprop/backward-inl.h
index 67b0aa4..fe693ca 100644
--- a/backprop/backward-inl.h
+++ b/backprop/backward-inl.h
@@ -197,7 +197,6 @@ void LayerVJP(const LayerT<TConfig>& weights,
     float* HWY_RESTRICT b_out_mul = b_out + kFFHiddenDim;
     namespace hn = hwy::HWY_NAMESPACE;
     using DF = hn::ScalableTag<float>;
-    using VF = hn::Vec<DF>;
     DF df;
     for (size_t i = 0; i < kFFHiddenDim; i += Lanes(df)) {
       const auto y = Load(df, f_out + i);
diff --git a/util/app.h b/util/app.h
index c1eff00..d8b7405 100644
--- a/util/app.h
+++ b/util/app.h
@@ -21,7 +21,6 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include <algorithm>  // std::clamp
 #include <memory>
 #include <string>
 #include <vector>
@@ -132,7 +131,7 @@ class AppArgs : public ArgsBase<AppArgs> {
   }
 
   static inline size_t GetSupportedThreadCount() {
-    return std::min(hwy::ThreadPool::MaxThreads(), kMaxThreads);
+    return HWY_MIN(hwy::ThreadPool::MaxThreads(), kMaxThreads);
   }
 
   Path log;  // output