Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pyfeeds-tests
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
Container Registry
Model registry
Operate
Environments
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
FSL
pyfeeds-tests
Commits
8a81da22
Commit
8a81da22
authored
1 year ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
MNT: Only run single threaded when being invoked by pyfeeds (requires pyfeeds 0.12.4)
parent
bb6c1862
No related branches found
No related tags found
1 merge request
!42
Update runEddy script to work with new multi-threaded version.
Pipeline
#22300
skipped
Stage: fsl-ci-build
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
eddy/runEddy
+10
-3
10 additions, 3 deletions
eddy/runEddy
with
10 additions
and
3 deletions
eddy/runEddy
+
10
−
3
View file @
8a81da22
...
@@ -10,8 +10,10 @@
...
@@ -10,8 +10,10 @@
# output as the final line of output. Thne script returns
# output as the final line of output. Thne script returns
# an exit code of non-0 if something goes wrong.
# an exit code of non-0 if something goes wrong.
#
#
# The eddy_cpu executable is executed twice - once with
# If called from pyfeeds, the eddy_cpu executable is
# --nthr=1, and again with --nthr=8.
# executed twice - once with --nthr=1, and again with
# --nthr=6. If not called from pyfeeds, the eddy_cpu
# executable is executed only once, with --nthr=6.
#
#
# Outputs of each eddy_<variant> executable is saved with
# Outputs of each eddy_<variant> executable is saved with
# prefix ${outdir}/eddyOutput_<variant>. For example, the
# prefix ${outdir}/eddyOutput_<variant>. For example, the
...
@@ -52,7 +54,12 @@ done
...
@@ -52,7 +54,12 @@ done
# the FMRIB cluster
# the FMRIB cluster
cpu_exes
=
""
cpu_exes
=
""
if
[
-x
"
${
exedir
}
/eddy_cpu"
]
;
then
if
[
-x
"
${
exedir
}
/eddy_cpu"
]
;
then
cpu_exes
=
"
${
cpu_exes
}
${
exedir
}
/eddy_cpu_nthr_1"
# Only run single-threaded when running
# through pyfeeds
if
[
"
$PYFEEDS_TESTING
"
=
"1"
]
;
then
cpu_exes
=
"
${
cpu_exes
}
${
exedir
}
/eddy_cpu_nthr_1"
fi
cpu_exes
=
"
${
cpu_exes
}
${
exedir
}
/eddy_cpu_nthr_6"
cpu_exes
=
"
${
cpu_exes
}
${
exedir
}
/eddy_cpu_nthr_6"
fi
fi
...
...
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