Skip to content

Commit 041a82a

Browse files
REFACTOR: Scheduler logic (#6399)
Co-authored-by: pyansys-ci-bot <[email protected]>
1 parent 103e1ed commit 041a82a

File tree

8 files changed

+844
-230
lines changed

8 files changed

+844
-230
lines changed

doc/changelog.d/6398.miscellaneous.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Scheduler logic

doc/changelog.d/6399.miscellaneous.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Scheduler logic

doc/source/Resources/pyaedt_settings.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ log:
4747
# Settings related to Linux systems running LSF scheduler
4848
lsf:
4949
# Command to launch in the LSF Scheduler
50-
custom_lsf_command: null
50+
custom_lsf_command: ''
5151
# Command to launch the task in the LSF Scheduler
5252
lsf_aedt_command: 'ansysedt'
5353
# Number of LSF cores
54-
lsf_num_cores: 2
54+
lsf_num_cores: 4
5555
# Operating system string
5656
lsf_osrel: null
5757
# LSF queue name

src/ansys/aedt/core/generic/scheduler.py

Lines changed: 596 additions & 113 deletions
Large diffs are not rendered by default.

src/ansys/aedt/core/generic/settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
"remote_rpc_session_temp_folder",
110110
"block_figure_plot",
111111
"skip_license_check",
112+
"num_cores",
112113
]
113114
ALLOWED_AEDT_ENV_VAR_SETTINGS = [
114115
"ANSYSEM_FEATURE_F335896_MECHANICAL_STRUCTURAL_SOLN_TYPE_ENABLE",

src/ansys/aedt/core/misc/Job_Settings_Template.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ $begin 'AddEntries'
2121
\ \ \ \ NumCoresPerDistributedTask={{cores_per_task}}\
2222
\ \ \ \ LimitTasksPerNodeEnabled=false\
2323
\ \ \ \ NumMaxTasksPerNode={{max_tasks_per_node}}\
24-
\ \ \ \ NumGpus={{num_gpu}}\
24+
\ \ \ \ NumGpus={{num_gpus}}\
2525
\ \ \ $end \'TasksAndCoresBlock\'\
2626
\ \ \ $begin \'RAMConstrainedBlock\'\
2727
\ \ \ \ IsExclusive=false\
@@ -35,7 +35,7 @@ $begin 'AddEntries'
3535
\ \ \ \ RAMLimit={{ram_limit}}\
3636
\ \ \ \ NumNodes={{num_nodes}}\
3737
\ \ \ \ NumCores={{num_cores}}\
38-
\ \ \ \ NumGpus={{num_gpu}}\
38+
\ \ \ \ NumGpus={{num_gpus}}\
3939
\ \ \ $end \'NodesAndCoresBlock\'\
4040
\ \ \ $begin \'NodeListBlock\'\
4141
\ \ \ \ $begin \'MachineListVec\'\
@@ -64,8 +64,8 @@ $begin 'AddEntries'
6464
\ \ \ OverwriteFiles=false\
6565
\ \ $end \'ArchiveOptions\'\
6666
\ \ $begin \'SharedDirectories\'\
67-
\ \ \ WindowsPaths[0:]\
68-
\ \ \ LinuxPaths[0:]\
67+
\ \ \ WindowsPaths[{{shared_directory_windows}}]\
68+
\ \ \ LinuxPaths[{{shared_directory_linux}}]\
6969
\ \ $end \'SharedDirectories\'\
7070
\ \ $begin \'MultiStepJobSettings\'\
7171
\ \ \ SelectedOption=\'\'\

0 commit comments

Comments
 (0)