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
38f8b08e
Commit
38f8b08e
authored
3 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
BF: Wrong variable name
parent
59def6e8
No related branches found
No related tags found
1 merge request
!37
Major re-arrangement of eddy tests
Pipeline
#11680
passed
3 years ago
Stage: fsl-ci-build
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
eddy/runEddy
+7
-7
7 additions, 7 deletions
eddy/runEddy
with
7 additions
and
7 deletions
eddy/runEddy
+
7
−
7
View file @
38f8b08e
...
...
@@ -19,7 +19,7 @@
set
-e
# First argument is directory in which to search
# First argument is directory in which to search
# for eddy executables (typically $FSLDIR/bin).
# All remaining arguments are to be passed to
# eddy. Don't pass the --out option, as that is
...
...
@@ -60,7 +60,7 @@ for exe in ${cuda_exes} ${cpu_exes};
do
variant
=
`
basename
${
exe
}
`
variant
=
`
echo
${
variant
}
|
sed
's/eddy_//'
`
if
[[
"
${
exe
}
"
==
*
"cuda"
*
]]
;
then
fsl_sub
=
"fsl_sub -l
${
outdir
}
-q cuda.q"
else
...
...
@@ -72,12 +72,12 @@ do
echo
"Error submitting
${
exe
}
${
eddy_args
}
"
exit
1
fi
if
[[
"
${
exe
}
"
==
*
"cuda"
*
]]
;
then
cuda_jids
=
"
${
cuda_jids
}
${
jid
}
"
else
cpu_jids
=
"
${
cpu_jids
}
${
jid
}
"
fi
fi
done
# If running on a cluster, wait
...
...
@@ -87,7 +87,7 @@ done
# have blocked until completion.
if
[
!
-z
"
${
SGE_ROOT
}
"
]
;
then
# Ensure that slots are being reserved
# Ensure that slots are being reserved
# on the queue for CPU jobs
for
jid
in
${
cpu_jids
}
;
do
qalter
${
jid
}
-R
y
...
...
@@ -111,12 +111,12 @@ if [ ! -z "${SGE_ROOT}" ]; then
fi
# Gather output prefixes for each run,
# and check that the main output file
# and check that the main output file
# was created
outputs
=
""
for
exe
in
${
cuda_exes
}
${
cpu_exes
}
;
do
tmp
=
`
basename
${
cuda_
exe
}
`
tmp
=
`
basename
${
exe
}
`
variant
=
`
echo
${
tmp
}
|
sed
's/eddy_//'
`
prefix
=
"
${
outdir
}
/eddyOutput_
${
variant
}
"
outputs
=
"
${
outputs
}
${
prefix
}
"
...
...
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