Fix issue with slang-embed & include ordering (shader-slang#5680)

* Fix issue with slang-embed & include ordering * Update CMakeLists.txt
cheneym2 · Nov 26, 2024 · e6cf93e · e6cf93e
1 parent d282701
commit e6cf93e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/prelude/CMakeLists.txt b/prelude/CMakeLists.txt
@@ -11,7 +11,9 @@ foreach(input ${prelude_headers})
     set(output "${CMAKE_CURRENT_BINARY_DIR}/${input_name}.cpp")
     add_custom_command(
         OUTPUT ${output}
-        COMMAND slang-embed "${input}" ${output}
+        COMMAND
+            slang-embed "${input}" "${CMAKE_CURRENT_LIST_DIR}/../include"
+            ${output}
         DEPENDS ${input} slang-embed
         VERBATIM
     )

diff --git a/prelude/slang-torch-prelude.h b/prelude/slang-torch-prelude.h
@@ -1,10 +1,13 @@
 // Prelude for PyTorch cpp binding.
 
+// clang-format off
+#include <torch/extension.h>
+// clang-format on
+
 #include <ATen/cuda/CUDAContext.h>
 #include <ATen/cuda/CUDAUtils.h>
 #include <stdexcept>
 #include <string>
-#include <torch/extension.h>
 #include <vector>
 
 #ifdef SLANG_LLVM

diff --git a/tools/slang-embed/slang-embed.cpp b/tools/slang-embed/slang-embed.cpp
@@ -63,6 +63,7 @@ struct App
 {
     char const* appName = "slang-embed";
     char const* inputPath = nullptr;
+    char const* includeDir = nullptr;
     char const* outputPath = nullptr;
     Slang::HashSet<Slang::String> includedFiles;
 
@@ -83,6 +84,12 @@ struct App
             argc--;
         }
 
+        if (argc > 0)
+        {
+            includeDir = *argv++;
+            argc--;
+        }
+
         if (argc > 0)
         {
             outputPath = *argv++;
@@ -91,7 +98,7 @@ struct App
 
         if (!inputPath || (argc != 0))
         {
-            fprintf(stderr, "usage: %s inputPath [outputPath]\n", appName);
+            fprintf(stderr, "usage: %s inputPath includeDir [outputPath]\n", appName);
             exit(1);
         }
     }
@@ -137,7 +144,13 @@ struct App
                 auto path =
                     Slang::Path::combine(Slang::Path::getParentDirectory(inputPath), fileName);
                 if (!Slang::File::exists(path))
-                    goto normalProcess;
+                {
+                    // Try looking in the include directory.
+                    path = Slang::Path::combine(includeDir, fileName);
+
+                    if (!Slang::File::exists(path))
+                        goto normalProcess;
+                }
                 processInputFile(outputFile, path.getUnownedSlice());
                 continue;
             }