From 2f3627b9b443de73cba13cdf508f84ed63bb95b2 Mon Sep 17 00:00:00 2001 From: Karpreet Sethi Date: Fri, 21 Feb 2025 15:06:37 -0600 Subject: [PATCH 1/4] fix: Tighten error regex pattern. Added error regex to the adaptor for capturing render failure for Maya. I have picked some Deadline 10 regex handler for fatal error Maya reports. --- src/deadline/maya_adaptor/MayaAdaptor/adaptor.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/deadline/maya_adaptor/MayaAdaptor/adaptor.py b/src/deadline/maya_adaptor/MayaAdaptor/adaptor.py index a75d5c2..dd2028b 100644 --- a/src/deadline/maya_adaptor/MayaAdaptor/adaptor.py +++ b/src/deadline/maya_adaptor/MayaAdaptor/adaptor.py @@ -201,8 +201,22 @@ def _get_regex_callbacks(self) -> list[RegexCallback]: re.compile("\\[PROGRESS\\] ([0-9]+) percent"), re.compile("([0-9]+)% done"), # arnold re.compile("R90000\\s+([0-9]+)%"), # renderman + re.compile("V-Ray: +([0-9]+)%"), #vray + re.compile("V-Ray: +([0-9]+) %"), #vray ] - error_regexes = [re.compile(".*Exception:.*|.*Error:.*|.*Warning.*|.*SEVERE.*")] + error_regexes = [ + re.compile( r"Frame rendering aborted.", re.IGNORECASE), + re.compile( r"Rendering was internally aborted", re.IGNORECASE), + re.compile( r'Cannot find procedure "rsPreference"', re.IGNORECASE), + re.compile( r"\[mtoa\] Failed batch render", re.IGNORECASE), + re.compile( r"Plug-in, \"mtoa\", was not found on MAYA_PLUG_IN_PATH", re.IGNORECASE), + re.compile( r".*V-Ray error: .*", re.IGNORECASE), + re.compile( r".*The system does not support the required CUDA compute capabilities.*", re.IGNORECASE), + re.compile( r".*Failed to init the CUDA driver API.*", re.IGNORECASE), + re.compile( r".*CUDA_ERROR_UNKNOWN.*", re.IGNORECASE), + re.compile( r"Render failed", re.IGNORECASE), + re.compile( r".*Exception:.*|.*Error:.*|.*Warning.*|.*SEVERE.*"), + ] version_regexes = [re.compile("MayaClient: Maya Version ([0-9]+)")] callback_list.append(RegexCallback(completed_regexes, self._handle_complete)) From 2725d2b2a5942fcc2981c3d8edcab912c3ce7336 Mon Sep 17 00:00:00 2001 From: Karpreet Sethi Date: Fri, 21 Feb 2025 15:54:59 -0600 Subject: [PATCH 2/4] fix: Changed the cameras dropdown wording option from "All Cameras" to "All Renderable Cameras" in the submitter fixed the wording in the submitter from "All Cameras" to "All Renderable Cameras" in the Cameras dropdown under "Job-specific settings" --- src/deadline/maya_submitter/cameras.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deadline/maya_submitter/cameras.py b/src/deadline/maya_submitter/cameras.py index 4c0dbf5..682ffed 100644 --- a/src/deadline/maya_submitter/cameras.py +++ b/src/deadline/maya_submitter/cameras.py @@ -7,7 +7,7 @@ Functionality for interacting with Cameras in a Maya scene. """ -ALL_CAMERAS = "All Cameras" +ALL_CAMERAS = "All Renderable Cameras" def get_renderable_camera_names() -> list[str]: From 33238c6e2aef17a9ad6a100661b6bae815ef33e7 Mon Sep 17 00:00:00 2001 From: Karpreet Sethi Date: Fri, 21 Feb 2025 15:54:59 -0600 Subject: [PATCH 3/4] fix: Changed the cameras dropdown wording option from "All Cameras" to "All Renderable Cameras" in the submitter fixed the wording in the submitter from "All Cameras" to "All Renderable Cameras" in the Cameras dropdown under "Job-specific settings" --- src/deadline/maya_submitter/cameras.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deadline/maya_submitter/cameras.py b/src/deadline/maya_submitter/cameras.py index 4c0dbf5..682ffed 100644 --- a/src/deadline/maya_submitter/cameras.py +++ b/src/deadline/maya_submitter/cameras.py @@ -7,7 +7,7 @@ Functionality for interacting with Cameras in a Maya scene. """ -ALL_CAMERAS = "All Cameras" +ALL_CAMERAS = "All Renderable Cameras" def get_renderable_camera_names() -> list[str]: From 5c9a99df5dd48dead9a17e976ce76f7f03dbbe5b Mon Sep 17 00:00:00 2001 From: Karpreet Sethi Date: Wed, 26 Feb 2025 10:49:47 -0600 Subject: [PATCH 4/4] Revert "Merge branch 'skarpree-submitter-cameras' of https://github.com/skarpree/deadline-cloud-for-maya into skarpree-submitter-cameras" This reverts commit 86a0523f3a412b9e31397e119360224f5d46ec72, reversing changes made to 33238c6e2aef17a9ad6a100661b6bae815ef33e7. Signed-off-by: Karpreet Sethi --- src/deadline/maya_adaptor/MayaAdaptor/adaptor.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/deadline/maya_adaptor/MayaAdaptor/adaptor.py b/src/deadline/maya_adaptor/MayaAdaptor/adaptor.py index dd2028b..a75d5c2 100644 --- a/src/deadline/maya_adaptor/MayaAdaptor/adaptor.py +++ b/src/deadline/maya_adaptor/MayaAdaptor/adaptor.py @@ -201,22 +201,8 @@ def _get_regex_callbacks(self) -> list[RegexCallback]: re.compile("\\[PROGRESS\\] ([0-9]+) percent"), re.compile("([0-9]+)% done"), # arnold re.compile("R90000\\s+([0-9]+)%"), # renderman - re.compile("V-Ray: +([0-9]+)%"), #vray - re.compile("V-Ray: +([0-9]+) %"), #vray ] - error_regexes = [ - re.compile( r"Frame rendering aborted.", re.IGNORECASE), - re.compile( r"Rendering was internally aborted", re.IGNORECASE), - re.compile( r'Cannot find procedure "rsPreference"', re.IGNORECASE), - re.compile( r"\[mtoa\] Failed batch render", re.IGNORECASE), - re.compile( r"Plug-in, \"mtoa\", was not found on MAYA_PLUG_IN_PATH", re.IGNORECASE), - re.compile( r".*V-Ray error: .*", re.IGNORECASE), - re.compile( r".*The system does not support the required CUDA compute capabilities.*", re.IGNORECASE), - re.compile( r".*Failed to init the CUDA driver API.*", re.IGNORECASE), - re.compile( r".*CUDA_ERROR_UNKNOWN.*", re.IGNORECASE), - re.compile( r"Render failed", re.IGNORECASE), - re.compile( r".*Exception:.*|.*Error:.*|.*Warning.*|.*SEVERE.*"), - ] + error_regexes = [re.compile(".*Exception:.*|.*Error:.*|.*Warning.*|.*SEVERE.*")] version_regexes = [re.compile("MayaClient: Maya Version ([0-9]+)")] callback_list.append(RegexCallback(completed_regexes, self._handle_complete))