Skip to content

Commit b948d8f

Browse files
authored
Do not set different cache directories per job (#4460)
* Do not set different cache directories per job This should not be necessary as the disk caches are now safer in how they handle race conditions. Using a unified cache directory should improve performance.
1 parent 4924a49 commit b948d8f

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

scripts/firedrake-run-split-tests

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ num_procs=$1
3131
num_jobs=$2
3232
extra_args=${@:3}
3333

34-
# Set per-job cache directories to avoid race conditions when multiple jobs attempt to compile the same form.
35-
cache_cmd="PYOP2_CACHE_DIR=\$VIRTUAL_ENV/.cache/pyop2/job{#} \
36-
FIREDRAKE_TSFC_KERNEL_CACHE_DIR=\$VIRTUAL_ENV/.cache/tsfc/job{#}"
37-
3834
if [ $num_procs = 1 ]; then
3935
# Cannot use mpiexec -n 1 because this can sometimes hang with
4036
# OpenMPI at MPI_Finalize
@@ -57,7 +53,7 @@ set -x
5753
# * Uses tee to pipe stdout+stderr to both stdout and a log file
5854
# * Writes pytest's exit code to a file called jobN.errcode (for later inspection)
5955
parallel --line-buffer --tag \
60-
"${cache_cmd}; ${pytest_cmd} |& tee ${log_file_prefix}{#}.log; \
56+
"${pytest_cmd} |& tee ${log_file_prefix}{#}.log; \
6157
echo \${PIPESTATUS[0]} > job{#}.errcode" \
6258
::: $(seq ${num_jobs})
6359

0 commit comments

Comments
 (0)