Fix Windows build (octoml#190)

filesystem path cannot be implicitly converted to string
Lunderberg · May 19, 2023 · 6de9506 · 6de9506
1 parent f65df32
commit 6de9506
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/3rdparty/tokenizers-cpp b/3rdparty/tokenizers-cpp
diff --git a/cpp/cli_main.cc b/cpp/cli_main.cc
@@ -302,7 +302,8 @@ ModelPaths ModelPaths::Find(const std::string& artifact_path, const std::string&
   std::cout << "Use MLC config: " << config_path << std::endl;
   // Step 2. Find parameters
   std::filesystem::path params_json;
-  if (auto path = FindFile({config_path.parent_path()}, {"ndarray-cache"}, {".json"})) {
+  if (auto path = FindFile(
+          {config_path.parent_path().string()}, {"ndarray-cache"}, {".json"})) {
     params_json = path.value();
   } else {
     std::cerr << "Cannot find \"ndarray-cache.json\" for params: " << config_path.parent_path()

diff --git a/cpp/llm_chat.cc b/cpp/llm_chat.cc
@@ -427,11 +427,11 @@ std::unique_ptr<Tokenizer> TokenizerFromPath(const std::string& _path) {
       std::filesystem::path vocab_path = path / "vocab.json";
       std::filesystem::path added_tokens_path = path / "added_tokens.json";
       if (std::filesystem::exists(merges_path) && std::filesystem::exists(vocab_path)) {
-        std::string vocab = LoadBytesFromFile(vocab_path);
-        std::string merges = LoadBytesFromFile(merges_path);
+        std::string vocab = LoadBytesFromFile(vocab_path.string());
+        std::string merges = LoadBytesFromFile(merges_path.string());
         std::string added_tokens = "";
         if (std::filesystem::exists(added_tokens_path)) {
-          added_tokens = LoadBytesFromFile(added_tokens_path);
+          added_tokens = LoadBytesFromFile(added_tokens_path.string());
         }
         return Tokenizer::FromBlobByteLevelBPE(vocab, merges, added_tokens);
       }
@@ -441,10 +441,10 @@ std::unique_ptr<Tokenizer> TokenizerFromPath(const std::string& _path) {
     huggingface = path.parent_path() / "tokenizer.json";
   }
   if (std::filesystem::exists(sentencepiece)) {
-    return Tokenizer::FromBlobSentencePiece(LoadBytesFromFile(sentencepiece));
+    return Tokenizer::FromBlobSentencePiece(LoadBytesFromFile(sentencepiece.string()));
   }
   if (std::filesystem::exists(huggingface)) {
-    return Tokenizer::FromBlobJSON(LoadBytesFromFile(huggingface));
+    return Tokenizer::FromBlobJSON(LoadBytesFromFile(huggingface.string()));
   }
   LOG(FATAL) << "Cannot find any tokenizer under: " << _path;
 }