fix windows build (#34)

dsg-polymtl · Oct 21, 2024 · 7d571b1 · 7d571b1
1 parent f46ba8f
commit 7d571b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/core/functions/scalar/llm_complete.cpp b/src/core/functions/scalar/llm_complete.cpp
@@ -1,5 +1,3 @@
-#include <algorithm>
-#include <cmath>
 #include <flockmtl/common.hpp>
 #include <flockmtl/core/functions/scalar.hpp>
 #include <flockmtl/core/model_manager/model_manager.hpp>
@@ -86,8 +84,8 @@ inline std::vector<std::string> ConstructPrompts3(std::vector<nlohmann::json> &u
         auto template_tokens = Tiktoken::GetNumTokens(llm_complete_prompt_template);
         auto max_tokens_for_rows = model_max_tokens - template_tokens;
         auto max_chunk_size = max_tokens_for_rows / row_tokens;
-#undef min
-        auto chunk_size = std::min(max_chunk_size, static_cast<int>(unique_rows.size()));
+        auto chunk_size = max_chunk_size > static_cast<int>(unique_rows.size()) ? static_cast<int>(unique_rows.size())
+                                                                                : max_chunk_size;
         auto num_chunks = static_cast<int>(std::ceil(static_cast<double>(unique_rows.size()) / chunk_size));
 
         for (int i = 0; i < num_chunks; ++i) {

diff --git a/src/core/functions/scalar/llm_complete_json.cpp b/src/core/functions/scalar/llm_complete_json.cpp
@@ -1,5 +1,3 @@
-#include <algorithm>
-#include <cmath>
 #include <flockmtl/common.hpp>
 #include <flockmtl/core/functions/scalar.hpp>
 #include <flockmtl/core/model_manager/model_manager.hpp>
@@ -86,8 +84,8 @@ inline std::vector<std::string> ConstructPrompts(std::vector<nlohmann::json> &un
         auto template_tokens = Tiktoken::GetNumTokens(llm_complete_json_prompt_template);
         auto max_tokens_for_rows = model_max_tokens - template_tokens;
         auto max_chunk_size = max_tokens_for_rows / row_tokens;
-#undef min
-        auto chunk_size = std::min(max_chunk_size, static_cast<int>(unique_rows.size()));
+        auto chunk_size = max_chunk_size > static_cast<int>(unique_rows.size()) ? static_cast<int>(unique_rows.size())
+                                                                                : max_chunk_size;
         auto num_chunks = static_cast<int>(std::ceil(static_cast<double>(unique_rows.size()) / chunk_size));
 
         for (int i = 0; i < num_chunks; ++i) {

diff --git a/src/core/functions/scalar/llm_filter.cpp b/src/core/functions/scalar/llm_filter.cpp
@@ -1,5 +1,3 @@
-#include <algorithm>
-#include <cmath>
 #include <flockmtl/common.hpp>
 #include <flockmtl/core/functions/scalar.hpp>
 #include <flockmtl/core/model_manager/model_manager.hpp>
@@ -85,8 +83,8 @@ inline std::vector<std::string> ConstructPrompts2(std::vector<nlohmann::json> &u
         auto template_tokens = Tiktoken::GetNumTokens(llm_filter_prompt_template);
         auto max_tokens_for_rows = model_max_tokens - template_tokens;
         auto max_chunk_size = max_tokens_for_rows / row_tokens;
-#undef min
-        auto chunk_size = std::min(max_chunk_size, static_cast<int>(unique_rows.size()));
+        auto chunk_size = max_chunk_size > static_cast<int>(unique_rows.size()) ? static_cast<int>(unique_rows.size())
+                                                                                : max_chunk_size;
         auto num_chunks = static_cast<int>(std::ceil(static_cast<double>(unique_rows.size()) / chunk_size));
 
         for (int i = 0; i < num_chunks; ++i) {