Fusion: implement toggle to use Deadline plugin FusionCmd (#5678)

* OP-6971 - changed DL plugin to FusionCmd

Fusion 17 doesn't work in DL 10.3, but FusionCmd does. It might be probably better option as headless variant.

* OP-6971 - added dropdown to Project Settings

* OP-6971 - updated settings for Ayon

* OP-6971 - added default

* OP-6971 - bumped up version

* Update openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

---------

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
This commit is contained in:
Petr Kalis 2023-10-05 16:03:56 +02:00 committed by GitHub
parent e255c20c44
commit 52c65c9b6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 3 deletions

View file

@ -34,6 +34,8 @@ class FusionSubmitDeadline(
targets = ["local"]
# presets
plugin = None
priority = 50
chunk_size = 1
concurrent_tasks = 1
@ -173,7 +175,7 @@ class FusionSubmitDeadline(
"SecondaryPool": instance.data.get("secondaryPool"),
"Group": self.group,
"Plugin": "Fusion",
"Plugin": self.plugin,
"Frames": "{start}-{end}".format(
start=int(instance.data["frameStartHandle"]),
end=int(instance.data["frameEndHandle"])

View file

@ -52,7 +52,8 @@
"priority": 50,
"chunk_size": 10,
"concurrent_tasks": 1,
"group": ""
"group": "",
"plugin": "Fusion"
},
"NukeSubmitDeadline": {
"enabled": true,

View file

@ -289,6 +289,15 @@
"type": "text",
"key": "group",
"label": "Group Name"
},
{
"type": "enum",
"key": "plugin",
"label": "Deadline Plugin",
"enum_items": [
{"Fusion": "Fusion"},
{"FusionCmd": "FusionCmd"}
]
}
]
},

View file

@ -124,6 +124,24 @@ class LimitGroupsSubmodel(BaseSettingsModel):
)
def fusion_deadline_plugin_enum():
"""Return a list of value/label dicts for the enumerator.
Returning a list of dicts is used to allow for a custom label to be
displayed in the UI.
"""
return [
{
"value": "Fusion",
"label": "Fusion"
},
{
"value": "FusionCmd",
"label": "FusionCmd"
}
]
class FusionSubmitDeadlineModel(BaseSettingsModel):
enabled: bool = Field(True, title="Enabled")
optional: bool = Field(False, title="Optional")
@ -132,6 +150,9 @@ class FusionSubmitDeadlineModel(BaseSettingsModel):
chunk_size: int = Field(10, title="Frame per Task")
concurrent_tasks: int = Field(1, title="Number of concurrent tasks")
group: str = Field("", title="Group Name")
plugin: str = Field("Fusion",
enum_resolver=fusion_deadline_plugin_enum,
title="Deadline Plugin")
class NukeSubmitDeadlineModel(BaseSettingsModel):

View file

@ -1 +1 @@
__version__ = "0.1.1"
__version__ = "0.1.2"