Added PYMATERIALX_IMPORT_MODULE macro to import a PyMaterialX module

either within the `MaterialX` Python package or as a standalone module. Signed-off-by: Stefan Habel <19556655+StefanHabel@users.noreply.github.com>
AcademySoftwareFoundation · Oct 20, 2023 · ab6860b · ab6860b
1 parent c0d65ed
commit ab6860b
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 9 deletions.
diff --git a/source/PyMaterialX/PyMaterialX.h b/source/PyMaterialX/PyMaterialX.h
@@ -19,4 +19,15 @@
 #include <pybind11/operators.h>
 #include <pybind11/stl.h>
 
+// Define a macro to import a PyMaterialX module, e.g. `PyMaterialXCore`,
+// either within the `MaterialX` Python package, e.g. in `installed/python/`,
+// or as a standalone module, e.g. in `lib/`
+#define PYMATERIALX_IMPORT_MODULE(MODULE_NAME)                               \
+    try {                                                                    \
+        pybind11::module::import("MaterialX." #MODULE_NAME);                 \
+    }                                                                        \
+    catch (const py::error_already_set&) {                                   \
+        pybind11::module::import(#MODULE_NAME);                              \
+    }
+
 #endif
diff --git a/source/PyMaterialX/PyMaterialXFormat/PyModule.cpp b/source/PyMaterialX/PyMaterialXFormat/PyModule.cpp
@@ -59,7 +59,7 @@ PYBIND11_MODULE(PyMaterialXFormat, mod)
 )docstring";
 
     // PyMaterialXFormat depends on types defined in PyMaterialXCore
-    pybind11::module::import("PyMaterialXCore");
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXCore);
 
     bindPyFile(mod);
     bindPyXmlIo(mod);

diff --git a/source/PyMaterialX/PyMaterialXGenGlsl/PyModule.cpp b/source/PyMaterialX/PyMaterialXGenGlsl/PyModule.cpp
@@ -46,7 +46,7 @@ PYBIND11_MODULE(PyMaterialXGenGlsl, mod)
 )docstring";
 
     // PyMaterialXGenGlsl depends on types defined in PyMaterialXGenShader
-    pybind11::module::import("PyMaterialXGenShader");
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXGenShader);
 
     bindPyGlslShaderGenerator(mod);
     bindPyGlslResourceBindingContext(mod);

diff --git a/source/PyMaterialX/PyMaterialXGenMdl/PyModule.cpp b/source/PyMaterialX/PyMaterialXGenMdl/PyModule.cpp
@@ -34,7 +34,7 @@ PYBIND11_MODULE(PyMaterialXGenMdl, mod)
 )docstring";
 
     // PyMaterialXGenMdl depends on types defined in PyMaterialXGenShader
-    pybind11::module::import("PyMaterialXGenShader");
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXGenShader);
 
     bindPyMdlShaderGenerator(mod);
 };
diff --git a/source/PyMaterialX/PyMaterialXGenMsl/PyModule.cpp b/source/PyMaterialX/PyMaterialXGenMsl/PyModule.cpp
@@ -40,7 +40,7 @@ PYBIND11_MODULE(PyMaterialXGenMsl, mod)
 )docstring";
 
     // PyMaterialXGenMsl depends on types defined in PyMaterialXGenShader
-    pybind11::module::import("PyMaterialXGenShader");
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXGenShader);
 
     bindPyMslShaderGenerator(mod);
     bindPyMslResourceBindingContext(mod);

diff --git a/source/PyMaterialX/PyMaterialXGenOsl/PyModule.cpp b/source/PyMaterialX/PyMaterialXGenOsl/PyModule.cpp
@@ -34,7 +34,7 @@ PYBIND11_MODULE(PyMaterialXGenOsl, mod)
 )docstring";
 
     // PyMaterialXGenOsl depends on types defined in PyMaterialXGenShader
-    pybind11::module::import("PyMaterialXGenShader");
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXGenShader);
 
     bindPyOslShaderGenerator(mod);
 }
diff --git a/source/PyMaterialX/PyMaterialXRender/PyModule.cpp b/source/PyMaterialX/PyMaterialXRender/PyModule.cpp
@@ -88,7 +88,7 @@ PYBIND11_MODULE(PyMaterialXRender, mod)
 )docstring";
 
     // PyMaterialXRender depends on types defined in PyMaterialXCore
-    pybind11::module::import("PyMaterialXCore");
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXCore);
 
     bindPyMesh(mod);
     bindPyGeometryHandler(mod);

diff --git a/source/PyMaterialX/PyMaterialXRenderGlsl/PyModule.cpp b/source/PyMaterialX/PyMaterialXRenderGlsl/PyModule.cpp
@@ -34,7 +34,7 @@ PYBIND11_MODULE(PyMaterialXRenderGlsl, mod)
 )docstring";
 
     // PyMaterialXRenderGlsl depends on types defined in PyMaterialXRender
-    pybind11::module::import("PyMaterialXRender");
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXRender);
 
     bindPyGlslProgram(mod);
     bindPyGlslRenderer(mod);

diff --git a/source/PyMaterialX/PyMaterialXRenderMsl/PyModule.mm b/source/PyMaterialX/PyMaterialXRenderMsl/PyModule.mm
@@ -34,7 +34,7 @@
 )docstring";
 
     // PyMaterialXRenderMsl depends on types defined in PyMaterialXRender
-    pybind11::module::import("PyMaterialXRender");
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXRender);
 
     bindPyMslProgram(mod);
     bindPyMslRenderer(mod);

diff --git a/source/PyMaterialX/PyMaterialXRenderOsl/PyModule.cpp b/source/PyMaterialX/PyMaterialXRenderOsl/PyModule.cpp
@@ -27,7 +27,7 @@ PYBIND11_MODULE(PyMaterialXRenderOsl, mod)
 )docstring";
 
     // PyMaterialXRenderOsl depends on types defined in PyMaterialXRender
-    pybind11::module::import("PyMaterialXRender");
+    PYMATERIALX_IMPORT_MODULE(PyMaterialXRender);
 
     bindPyOslRenderer(mod);
 }