OSL Network Generator updates

CMakeLists.txt

@@ -51,6 +51,7 @@ option(MATERIALX_BUILD_OCIO "Build OpenColorIO support for shader generators." O
 option(MATERIALX_BUILD_TESTS "Build unit tests." OFF)
 option(MATERIALX_BUILD_BENCHMARK_TESTS "Build benchmark tests." OFF)
 option(MATERIALX_BUILD_OSOS "Build OSL .oso's of standard library shaders for the OSL Network generator" OFF)
+option(MATERIALX_BUILD_NODEGRAPH_OSOS "Build NodeGraphs as OSOs, if disabled then NodeGraphs are not compiled as OSOs " OFF)
 
 option(MATERIALX_BUILD_SHARED_LIBS "Build MaterialX libraries as shared rather than static." OFF)
 option(MATERIALX_BUILD_DATA_LIBRARY "Build generated products from the MaterialX data library." OFF)

libraries/CMakeLists.txt

@@ -35,6 +35,11 @@ if(MATERIALX_BUILD_DATA_LIBRARY)
 
         set(SENTINEL_FILE ${CMAKE_CURRENT_BINARY_DIR}/buildosos.sentinel)
 
+        set(SKIP_BUILDING_NODEGRAPHS "")
+        if (NOT MATERIALX_BUILD_NODEGRAPH_OSOS)
+            set(SKIP_BUILDING_NODEGRAPHS "--skipConvertingNodegraphs")
+        endif()
+
         add_custom_command(
                 OUTPUT ${SENTINEL_FILE}
                 COMMAND touch ${SENTINEL_FILE}
@@ -46,7 +51,7 @@ if(MATERIALX_BUILD_DATA_LIBRARY)
                             --oslCompilerPath ${MATERIALX_OSL_BINARY_OSLC}
                             --oslIncludePath ${MATERIALX_OSL_INCLUDE_PATH}
                             --libraryRelativeOsoPath libraries/targets/genoslnetwork/osos
-                            --removeNdPrefix true
+                            ${SKIP_BUILDING_NODEGRAPHS}
                 DEPENDS ${MATERIALX_DATA_LIBRARY_SOURCE_FILES} MaterialXGenOsl_LibsToOso
         )
 

resources/Materials/TestSuite/_options.mtlx

@@ -63,6 +63,7 @@
 
     <!-- List of document paths for render tests -->
     <input name="renderTestPaths" type="string" value="resources/Materials/Examples/StandardSurface,resources/Materials/TestSuite/stdlib/convolution,resources/Materials/TestSuite/stdlib/color_management,resources/Materials/TestSuite/stdlib/procedural,resources/Materials/TestSuite/pbrlib/surfaceshader,resources/Materials/TestSuite/nprlib,resources/Materials/TestSuite/pbrlib/bsdf" />
+<!--    <input name="renderTestPaths" type="string" value="resources/Materials/Examples,resources/Materials/TestSuite" />-->
 
     <!-- Enable reference quality rendering.
          This option enables higher sample counts and supersampling in render tests,

source/MaterialXFormat/File.cpp

@@ -31,6 +31,8 @@
 #include <cctype>
 #include <cerrno>
 #include <cstring>
+#include <random>
+#include <filesystem>
 
 MATERIALX_NAMESPACE_BEGIN
 
@@ -278,8 +280,12 @@ FilePathVec FilePath::getSubDirectories() const
     return dirs;
 }
 
-void FilePath::createDirectory() const
+void FilePath::createDirectory(bool recursive) const
 {
+    if (recursive && !getParentPath().isDirectory())
+    {
+        getParentPath().createDirectory(recursive);
+    }
 #if defined(_WIN32)
     _mkdir(asString().c_str());
 #else
@@ -377,4 +383,58 @@ FileSearchPath getEnvironmentPath(const string& sep)
     return FileSearchPath(searchPathEnv, sep);
 }
 
+FilePath FilePath::createTemporaryDirectory(const FilePath& parentDir)
+{
+    // Get the parent directory - use system temp if empty
+    FilePath tempParent = parentDir;
+    if (tempParent.isEmpty())
+    {
+        tempParent = getSystemTemporaryDirectory();
+    }
+
+    // Ensure parent directory exists
+    if (!tempParent.exists())
+    {
+        tempParent.createDirectory(true);
+    }
+
+    if (!tempParent.isDirectory())
+    {
+        throw Exception("Parent path is not a directory: " + tempParent.asString());
+    }
+
+    // Generate a unique temporary directory name using std::filesystem
+    std::random_device rd;
+    std::mt19937 gen(rd());
+    std::uniform_int_distribution<> dis(100000, 999999);
+
+    constexpr int maxAttempts = 1000;
+    for (int attempt = 0; attempt < maxAttempts; ++attempt)
+    {
+        string tempDirName = "materialx_tmp_" + std::to_string(dis(gen));
+        FilePath tempDirPath = tempParent / tempDirName;
+
+        if (!tempDirPath.isDirectory())
+        {
+            tempDirPath.createDirectory(true);
+            return tempDirPath;
+        }
+    }
+
+    throw Exception("Failed to create temporary directory after " + std::to_string(maxAttempts) + " attempts");
+}
+
+FilePath FilePath::getSystemTemporaryDirectory()
+{
+    try
+    {
+        std::filesystem::path tempPath = std::filesystem::temp_directory_path();
+        return FilePath(tempPath.string());
+    }
+    catch (const std::filesystem::filesystem_error& ex)
+    {
+        throw Exception("Error getting system temporary directory: " + string(ex.what()));
+    }
+}
+
 MATERIALX_NAMESPACE_END

source/MaterialXFormat/File.h

@@ -195,7 +195,11 @@ class MX_FORMAT_API FilePath
     FilePathVec getSubDirectories() const;
 
     /// Create a directory on the file system at the given path.
-    void createDirectory() const;
+    /// @param recursive If true, creates parent directories as needed.
+    ///    If false (default), only creates the final directory.
+    /// @note Succeeds silently if directory already exists. Does not return
+    ///    error status - use exists() or isDirectory() to verify success.
+    void createDirectory(bool recursive=false) const;
 
     /// Set the current working directory of the file system.
     bool setCurrentPath();
@@ -208,6 +212,18 @@ class MX_FORMAT_API FilePath
     /// Return the directory containing the executable module.
     static FilePath getModulePath();
 
+    /// Create a temporary directory with a unique name.
+    /// @param parentDir The parent directory for the temporary directory.
+    ///    If empty, uses the system's default temporary directory.
+    /// @return A FilePath to the created temporary directory.
+    /// @throws Exception if the temporary directory cannot be created.
+    static FilePath createTemporaryDirectory(const FilePath& parentDir = FilePath());
+
+    /// Return the system's default temporary directory.
+    /// @return A FilePath to the system temporary directory.
+    /// @throws Exception if the system temporary directory cannot be determined.
+    static FilePath getSystemTemporaryDirectory();
+
   private:
     StringVec _vec;
     Type _type;

source/MaterialXFormat/XmlIo.cpp

@@ -355,6 +355,13 @@ void writeToXmlStream(DocumentPtr doc, std::ostream& stream, const XmlWriteOptio
 
 void writeToXmlFile(DocumentPtr doc, const FilePath& filename, const XmlWriteOptions* writeOptions)
 {
+    if (writeOptions && writeOptions->createDirectories)
+    {
+        if (!filename.getParentPath().isDirectory())
+        {
+            filename.getParentPath().createDirectory(true);
+        }
+    }
     std::ofstream ofs(filename.asString());
     writeToXmlStream(doc, ofs, writeOptions);
 }

source/MaterialXFormat/XmlIo.h

@@ -73,6 +73,10 @@ class MX_FORMAT_API XmlWriteOptions
     /// If provided, this function will be used to exclude specific elements
     /// (those returning false) from the write operation.  Defaults to nullptr.
     ElementPredicate elementPredicate;
+
+    /// If true, any necessary directories will be created to write the
+    /// file.
+    bool createDirectories = false;
 };
 
 /// @class ExceptionParseError

source/MaterialXGenOsl/CMakeLists.txt

@@ -14,6 +14,20 @@ mx_add_library(MaterialXGenOsl
     EXPORT_DEFINE
         MATERIALX_GENOSL_EXPORTS)
 
+if (OSL_FOUND)
+    target_link_libraries(${TARGET_NAME}
+            PRIVATE
+            OSL::oslcomp)
+    target_compile_definitions(${TARGET_NAME}
+            PRIVATE
+            USE_OSLCOMP)
+endif()
+
+target_compile_definitions(${TARGET_NAME} PRIVATE
+        MATERIALX_OSL_BINARY_OSLC=\"${MATERIALX_OSL_BINARY_OSLC}\"
+        MATERIALX_OSL_INCLUDE_PATH=\"${MATERIALX_OSL_INCLUDE_PATH}\"
+)
+
 if (MATERIALX_BUILD_OSOS)
     file(GLOB GenNodes_SRC "${CMAKE_CURRENT_SOURCE_DIR}/LibsToOso.cpp")