Skip to content

Commit 698775a

Browse files
committed
get gpu_matrix_args from RelValArgs.py
1 parent 35d4e32 commit 698775a

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

pr_testing/_helper_functions.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ WORKSPACE=${WORKSPACE} # Needs to be exported in master script
55
CACHED=${WORKSPACE}/CACHED # Where cached PR metadata etc are kept
66
BUILD_DIR=testBuildDir
77
RESULTS_DIR=$WORKSPACE/testsResults
8+
PR_TESTING_DIR=$(dirname $BASH_SOURCE)
89
export PYTHONUNBUFFERED=1
910
export CMSBOT_PYTHON_CMD=$(which python3 >/dev/null 2>&1 && echo python3 || echo python)
1011
# -----
@@ -192,10 +193,6 @@ function get_result_file_name () {
192193
}
193194

194195
function get_gpu_matrix_args() {
195-
GPU_FLAG=""
196-
if runTheMatrix.py --help | grep -q '\-\-gpu' ; then
197-
GPU_FLAG="--gpu required"
198-
fi
199-
OPTS="-w gpu ${GPU_FLAG}"
196+
OPTS=$(PYTHONPATH=${PR_TESTING_DIR}/.. ${CMSBOT_PYTHON_CMD} -c 'from RelValArgs import GPU_RELVALS_FLAGS;print(GPU_RELVALS_FLAGS)')
200197
echo ${OPTS}
201198
}

0 commit comments

Comments
 (0)