Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pycalibration
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Contributor 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
calibration
pycalibration
Commits
37786afb
Commit
37786afb
authored
4 years ago
by
Thomas Kluyver
Browse files
Options
Downloads
Patches
Plain Diff
Run all Python subprocesses with the same Python
parent
910f9d79
No related branches found
No related tags found
1 merge request
!350
Simplify how batch jobs find Python tools
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bin/slurm_calibrate.sh
+1
-1
1 addition, 1 deletion
bin/slurm_calibrate.sh
xfel_calibrate/calibrate.py
+1
-1
1 addition, 1 deletion
xfel_calibrate/calibrate.py
xfel_calibrate/finalize.py
+3
-3
3 additions, 3 deletions
xfel_calibrate/finalize.py
with
5 additions
and
5 deletions
bin/slurm_calibrate.sh
+
1
−
1
View file @
37786afb
...
...
@@ -59,6 +59,6 @@ fi
if
[
"
${
final
}
"
==
"FINAL"
]
then
${
finalize
}
$SLURM_JOB_ID
XFEL_CALIBRATE_PYTHON
=
"
${
python_path
}
"
${
finalize
}
$SLURM_JOB_ID
fi
killall
-9
cal_influx_feeder.sh
||
true
This diff is collapsed.
Click to expand it.
xfel_calibrate/calibrate.py
+
1
−
1
View file @
37786afb
...
...
@@ -508,7 +508,7 @@ def create_finalize_script(fmt_args, temp_path, job_list):
source /etc/profile.d/modules.sh
module load texlive/2019
echo
'
Running finalize script
'
python3
-c
"
from xfel_calibrate.finalize import finalize;
"
${XFEL_CALIBRATE_PYTHON}
"
-c
"
from xfel_calibrate.finalize import finalize;
finalize(joblist={{joblist}},
finaljob=$1,
run_path=
'
{{run_path}}
'
,
...
...
This diff is collapsed.
Click to expand it.
xfel_calibrate/finalize.py
+
3
−
3
View file @
37786afb
...
...
@@ -209,7 +209,7 @@ def make_report(run_path, tmp_path, out_path, project, author, version,
out_path
=
report_path
try
:
check_call
([
"
sphinx
-
quickstart
"
,
check_call
([
sys
.
executable
,
"
-m
"
,
"
sphinx
.
quickstart
"
,
"
--quiet
"
,
"
--project=
'
{}
'"
.
format
(
project
),
"
--author=
'
{}
'"
.
format
(
author
),
...
...
@@ -222,7 +222,7 @@ def make_report(run_path, tmp_path, out_path, project, author, version,
"
--no-batchfile
"
,
run_path
])
except
CalledProcessError
:
raise
Exception
(
"
Failed to run sphinx-quick
build
. Is sphinx installed?
"
raise
Exception
(
"
Failed to run sphinx-quick
start
. Is sphinx installed?
"
"
Generated simple index.rst instead
"
)
# quickbuild went well we need to edit the index.rst and conf.py files
...
...
@@ -299,7 +299,7 @@ def make_report(run_path, tmp_path, out_path, project, author, version,
# finally call the make scripts
chdir
(
run_path
)
try
:
check_call
([
"
make
"
,
"
latexpdf
"
])
check_call
([
"
make
"
,
f
"
SPHINXBUILD=
{
sys
.
executable
}
-m sphinx
"
,
"
latexpdf
"
])
except
CalledProcessError
:
print
(
"
Failed to make pdf documentation
"
)
...
...
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