Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scord
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eu
ADMIRE
scord
Commits
2676e81d
Commit
2676e81d
authored
11 months ago
by
Ramon Nou
Browse files
Options
Downloads
Patches
Plain Diff
SLURM 23 changes hostlist_t signature, we need a * now
parent
c26920b1
No related branches found
No related tags found
1 merge request
!126
Resolve "Root issues and stage-out with SPANK"
Pipeline
#4432
failed
11 months ago
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
plugins/slurm/slurmadmcli.c
+1
-1
1 addition, 1 deletion
plugins/slurm/slurmadmcli.c
plugins/slurm/utils.c
+3
-3
3 additions, 3 deletions
plugins/slurm/utils.c
plugins/slurm/utils.h
+2
-2
2 additions, 2 deletions
plugins/slurm/utils.h
with
6 additions
and
6 deletions
plugins/slurm/slurmadmcli.c
+
1
−
1
View file @
2676e81d
...
...
@@ -740,7 +740,7 @@ slurm_spank_user_init(spank_t sp, int ac, char** av) {
slurm_debug
(
"%s: %s: job id: %d"
,
plugin_name
,
__func__
,
jobid
);
/* list of job nodes */
hostlist_t
hostlist
=
get_slurm_hostlist
(
sp
);
hostlist_t
*
hostlist
=
get_slurm_hostlist
(
sp
);
if
(
!
hostlist
)
{
slurm_error
(
"%s: failed to retrieve hostlist"
,
plugin_name
);
return
-
1
;
...
...
This diff is collapsed.
Click to expand it.
plugins/slurm/utils.c
+
3
−
3
View file @
2676e81d
...
...
@@ -32,7 +32,7 @@
extern
const
char
plugin_name
[];
hostlist_t
hostlist_t
*
get_slurm_hostlist
(
spank_t
sp
)
{
/* get list of nodes. /!\ at this point env SLURM_NODELIST is
...
...
@@ -72,7 +72,7 @@ get_slurm_hostlist(spank_t sp) {
slurm_debug
(
"%s: SLURM_NODELIST=%s"
,
plugin_name
,
nodelist
);
hostlist_t
hl
=
NULL
;
hostlist_t
*
hl
=
NULL
;
hl
=
slurm_hostlist_create
(
nodelist
);
if
(
!
hl
)
{
...
...
@@ -84,7 +84,7 @@ get_slurm_hostlist(spank_t sp) {
}
scord_nodelist_t
scord_nodelist_create
(
hostlist_t
hostlist
)
{
scord_nodelist_create
(
hostlist_t
*
hostlist
)
{
ADM_node_t
*
nodes
=
NULL
;
char
*
host
=
NULL
;
...
...
This diff is collapsed.
Click to expand it.
plugins/slurm/utils.h
+
2
−
2
View file @
2676e81d
...
...
@@ -30,7 +30,7 @@
#include
<slurm/spank.h>
#include
<scord/types.h>
hostlist_t
hostlist_t
*
get_slurm_hostlist
(
spank_t
sp
);
typedef
struct
scord_nodelist
{
...
...
@@ -39,7 +39,7 @@ typedef struct scord_nodelist {
}
*
scord_nodelist_t
;
scord_nodelist_t
scord_nodelist_create
(
hostlist_t
hostlist
);
scord_nodelist_create
(
hostlist_t
*
hostlist
);
int
scord_nodelist_get_nodecount
(
scord_nodelist_t
nodelist
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment