pytorch
diff --git a/‎torch/csrc/inductor/aoti_package/model_package_loader.cpp
Lines changed: 14 additions & 22 deletions b/‎torch/csrc/inductor/aoti_package/model_package_loader.cpp
Lines changed: 14 additions & 22 deletions
diff --git a/‎torch/csrc/inductor/aoti_runner/model_container_runner.cpp
Lines changed: 1 addition & 17 deletions b/‎torch/csrc/inductor/aoti_runner/model_container_runner.cpp
Lines changed: 1 addition & 17 deletions
diff --git a/‎torch/csrc/inductor/aoti_runtime/sycl_runtime_wrappers.h
Lines changed: 1 addition & 1 deletion b/‎torch/csrc/inductor/aoti_runtime/sycl_runtime_wrappers.h
Lines changed: 1 addition & 1 deletion
diff --git a/‎torch/csrc/inductor/aoti_torch/shim_common.cpp
Lines changed: 2 additions & 11 deletions b/‎torch/csrc/inductor/aoti_torch/shim_common.cpp
Lines changed: 2 additions & 11 deletions
@@ -1,7 +1,6 @@
 #if !defined(C10_MOBILE) && !defined(ANDROID)
 
 #include <c10/util/error.h>
-#include <c10/util/string_view.h>
 #include <torch/csrc/inductor/aoti_package/model_package_loader.h>
 #include <torch/csrc/inductor/aoti_runner/model_container_runner.h>
 #include <torch/csrc/inductor/aoti_runner/model_container_runner_cpu.h>
@@ -27,12 +26,6 @@ std::string create_temp_dir() {
   return temp_dir;
 #endif
 }
-
-#ifdef _WIN32
-const std::string k_separator = "\\";
-#else
-const std::string k_separator = "/";
-#endif
 } // namespace
 
 namespace torch::inductor {
@@ -242,9 +235,9 @@ AOTIModelPackageLoader::AOTIModelPackageLoader(
   std::string cpp_filename;
   std::string consts_filename;
   std::string found_filenames; // Saving for bookkeeping
-  std::string model_directory =
-      "data" + k_separator + "aotinductor" + k_separator + model_name;
-  std::string const_directory = "data" + k_separator + "constants";
+  auto model_directory =
+      std::filesystem::path("data") / "aotinductor" / model_name;
+  auto const_directory = std::filesystem::path("data") / "constants";
 
   for (uint32_t i = 0; i < zip_archive.m_total_files; i++) {
     uint32_t filename_len =
@@ -259,27 +252,26 @@ AOTIModelPackageLoader::AOTIModelPackageLoader(
             &zip_archive, i, filename_str.data(), filename_len)) {
       throw std::runtime_error("Failed to read filename");
     }
+    std::filesystem::path filename(filename_str.c_str());
 
     found_filenames += filename_str;
     found_filenames += " ";
 
     // Only compile files in the specified model directory
-    if (c10::starts_with(filename_str, model_directory) ||
-        c10::starts_with(filename_str, const_directory)) {
+    bool in_model_directory =
+        (!std::filesystem::relative(filename, model_directory).empty());
+    bool in_const_directory =
+        (!std::filesystem::relative(filename, const_directory).empty());
+    if (in_model_directory || in_const_directory) {
       std::filesystem::path output_path = temp_dir_;
 
-      if (c10::starts_with(filename_str, model_directory)) {
-        output_path /= filename_str;
-      } else { // startsWith(filename_str, const_directory)
+      if (in_model_directory) {
+        output_path /= filename;
+      } else {
         // Extract constants to the same directory as the rest of the files
         // to be consistent with internal implementation
-        size_t lastSlash = filename_str.find_last_of(k_separator);
-        std::string filename = filename_str;
-        if (lastSlash != std::string::npos) {
-          filename = filename_str.substr(lastSlash + 1);
-        }
         output_path /= model_directory;
-        output_path /= filename;
+        output_path /= filename.filename();
       }
       auto output_path_str = output_path.string();
 
@@ -354,7 +346,7 @@ AOTIModelPackageLoader::AOTIModelPackageLoader(
     throw std::runtime_error("Unsupported device found: " + device);
   }
 
-  std::string cubin_dir = temp_dir_ + k_separator + model_directory;
+  std::string cubin_dir = (temp_dir_ / model_directory).string();
   runner_ = registered_aoti_runner[device](
       so_path, num_runners, device, cubin_dir, run_single_threaded);
 }
 
@@ -5,23 +5,7 @@
 #include <torch/csrc/inductor/aoti_torch/oss_proxy_executor.h>
 #include <torch/csrc/inductor/aoti_torch/tensor_converter.h>
 
-#ifndef _WIN32
-#include <sys/stat.h>
-#else
 #include <filesystem>
-namespace fs = std::filesystem;
-#endif
-
-namespace {
-bool file_exists(std::string& path) {
-#ifdef _WIN32
-  return fs::exists(path);
-#else
-  struct stat rc {};
-  return lstat(path.c_str(), &rc) == 0;
-#endif
-}
-} // namespace
 
 namespace torch::inductor {
 
@@ -110,7 +94,7 @@ consider rebuild your model with the latest AOTInductor.");
   size_t lastindex = model_so_path.find_last_of('.');
   std::string json_filename = model_so_path.substr(0, lastindex) + ".json";
 
-  if (file_exists(json_filename)) {
+  if (std::filesystem::exists(json_filename)) {
     proxy_executor_ = std::make_unique<torch::aot_inductor::OSSProxyExecutor>(
         json_filename, device_str == "cpu");
     proxy_executor_handle_ =
 
@@ -78,7 +78,7 @@ static ze_module_handle_t loadModule(std::string& spv_path) {
   auto l0_context =
       sycl::get_native<sycl::backend::ext_oneapi_level_zero>(sycl_context);
 
-  std::ifstream IFS(spv_path.c_str(), std::ios::binary);
+  std::ifstream IFS(spv_path, std::ios::binary);
   std::ostringstream OSS;
   OSS << IFS.rdbuf();
   std::string data(OSS.str());
 
@@ -56,16 +56,6 @@
 
 #endif
 
-#ifndef _WIN32
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <climits>
-
-#else
-namespace fs = std::filesystem;
-#endif
-
 // HACK for failed builds in ARVR, where it cannot find these symbols within
 
 using namespace torch::aot_inductor;
@@ -1131,7 +1121,8 @@ void aoti_torch_print_tensor_handle(AtenTensorHandle self, const char* msg) {
   if (msg) {
     std::cout << "  " << msg;
   }
-  std::cout << "  " << "]:" << '\n';
+  std::cout << "  "
+            << "]:" << '\n';
 
   // Print exact tensor values for small size tensors
   const int64_t numel = t->numel();