Skip to content

Commit 567bd34

Browse files
committed
Introduce MONAI_PY_EXE env var for run script
With this patch, we can use different python3 binary by exporting MONAI_PY_EXE env variable. By default, it is set to 'python3'
1 parent ff50076 commit 567bd34

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

run

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ init_globals() {
2020
fi
2121

2222
export TOP=$(git rev-parse --show-toplevel || $(dirname "${RUN_SCRIPT_FILE}"))
23+
MONAI_PY_EXE=${MONAI_PY_EXE:-"python3"}
24+
export MONAI_PY_EXE
2325
}
2426

2527
################################################################################
@@ -283,7 +285,7 @@ get_package_info() {
283285

284286
[ -z "${app_path}" ] && c_echo_err R "No application path specified." && return 1
285287

286-
python3 $TOP/monai/deploy/utils/importutil.py get_package_info ${app_path} ${model_path}
288+
${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py get_package_info ${app_path} ${model_path}
287289
}
288290

289291
#==================================================================================
@@ -292,15 +294,15 @@ get_package_info() {
292294

293295
install_python_dev_deps_() {
294296
if [ -n "${VIRTUAL_ENV}" ] || [ -n "${CONDA_PREFIX}" ]; then
295-
run_command python3 -m pip install -q -U setuptools pip wheel
296-
run_command python3 -m pip install -q -r ${TOP}/requirements-dev.txt
297-
run_command python3 -m pip install -q -r ${TOP}/requirements-examples.txt
297+
run_command ${MONAI_PY_EXE} -m pip install -q -U setuptools pip wheel
298+
run_command ${MONAI_PY_EXE} -m pip install -q -r ${TOP}/requirements-dev.txt
299+
run_command ${MONAI_PY_EXE} -m pip install -q -r ${TOP}/requirements-examples.txt
298300

299301
else
300302
c_echo_err R "You must be in a virtual environment to install dependencies."
301303
if [ ! -e "$TOP/.venv/dev/bin/python3" ]; then
302304
c_echo_err W "Installing a virtual environment at " G "$TOP/.venv/dev" W " ..."
303-
run_command python3 -m venv "$TOP/.venv/dev"
305+
run_command ${MONAI_PY_EXE} -m venv "$TOP/.venv/dev"
304306
fi
305307

306308
c_echo_err W "Please activate the virtual environment at " G "$TOP/.venv/dev" W " and execute the setup command again."
@@ -314,10 +316,10 @@ install_python_dev_deps_() {
314316
# This solves an issue with separate package folders for 'monai' and 'monai-app-sdk' like below:
315317
# - 'monai': installed with 'pip install monai'
316318
# - 'monai-app-sdk': installed with 'pip install -e . # installed with development(edit) mode
317-
local monai_package_path=$(python3 $TOP/monai/deploy/utils/importutil.py dist_module_path monai)
318-
local sdk_package_path=$(python3 $TOP/monai/deploy/utils/importutil.py dist_module_path monai-app-sdk)
319+
local monai_package_path=$(${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py dist_module_path monai)
320+
local sdk_package_path=$(${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py dist_module_path monai-app-sdk)
319321
local is_sdk_editable="false"
320-
if python3 $TOP/monai/deploy/utils/importutil.py is_dist_editable monai-app-sdk; then
322+
if ${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py is_dist_editable monai-app-sdk; then
321323
is_sdk_editable="true"
322324
fi
323325

@@ -328,16 +330,16 @@ install_python_dev_deps_() {
328330
if [ "${is_sdk_editable}" == "false" ]; then
329331
c_echo W "Installing monai-app-sdk in edit mode..."
330332
if [ -n "${VIRTUAL_ENV}" ] || [ -n "${CONDA_PREFIX}" ]; then
331-
run_command python3 -m pip install -e .
333+
run_command ${MONAI_PY_EXE} -m pip install -e .
332334
else
333335
c_echo_err R "You must be in a virtual environment to install monai-app-sdk in edit mode."
334336
fi
335337

336-
if python3 $TOP/monai/deploy/utils/importutil.py is_dist_editable monai-app-sdk; then
338+
if ${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py is_dist_editable monai-app-sdk; then
337339
is_sdk_editable="true"
338340
fi
339341

340-
sdk_package_path=$(python3 $TOP/monai/deploy/utils/importutil.py dist_module_path monai-app-sdk)
342+
sdk_package_path=$(${MONAI_PY_EXE} $TOP/monai/deploy/utils/importutil.py dist_module_path monai-app-sdk)
341343
c_echo b "sdk_package_path : " Z "${sdk_package_path}"
342344
c_echo b "is_sdk_editable : " Z "${is_sdk_editable}"
343345
fi

0 commit comments

Comments
 (0)