diff --git a/video_prediction_tools/env_setup/install_venv_container.sh b/video_prediction_tools/env_setup/install_venv_container.sh index 3e5c35b9c4d635179fafab47ee65e153b80d2380..e6444cc373b5c02e38aa20ea2aa09446cbd6fdcc 100755 --- a/video_prediction_tools/env_setup/install_venv_container.sh +++ b/video_prediction_tools/env_setup/install_venv_container.sh @@ -41,6 +41,9 @@ if [ ! -f "${VENV_REQ}" ]; then return fi +# get Python-version +PYTHON_VERSION=$(python3 -c 'import sys; version=sys.version_info[:2]; print("{0}.{1}".format(*version))') + # create or change to base directory for virtual environment (i.e. where the virtualenv-module is placed) if ! [[ -d "${VENV_BASE}" ]]; then mkdir "${VENV_BASE}" @@ -67,8 +70,8 @@ echo "Actiavting virtual environment ${VENV_NAME} to install required Python mod ACT_VENV="${VENV_DIR}/bin/activate" source "${VENV_DIR}/bin/activate" # set PYTHONPATH... -export PYTHONPATH=/usr/local/lib/python3.8/dist-packages/:$PYTHONPATH -export PYTHONPATH=${WORKING_DIR}/virtual_envs/${VENV_NAME}/lib/python3.8/site-packages:$PYTHONPATH +export PYTHONPATH=/usr/local/lib/python${PYTHON_VERSION}/dist-packages/:$PYTHONPATH +export PYTHONPATH=${WORKING_DIR}/virtual_envs/${VENV_NAME}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH export PYTHONPATH=${WORKING_DIR}:$PYTHONPATH export PYTHONPATH=${WORKING_DIR}/utils:$PYTHONPATH export PYTHONPATH=${WORKING_DIR}/model_modules:$PYTHONPATH diff --git a/video_prediction_tools/env_setup/requirements_nocontainer.txt b/video_prediction_tools/env_setup/requirements_nocontainer.txt index d72e87b47a762c93457e15ba1e202f76bcd148c0..0bd16aae761e120c9b6b0e5267e304cba6aca97a 100755 --- a/video_prediction_tools/env_setup/requirements_nocontainer.txt +++ b/video_prediction_tools/env_setup/requirements_nocontainer.txt @@ -3,14 +3,12 @@ mpi4py==3.0.1 pandas==0.25.3 xarray==0.16.0 basemap==1.3.0 -imageio==2.15.0 # although this numpy-version is in the container, we set it here to avoid any further installation +imageio==2.15.0 numpy==1.17.3 -scikit-image==0.17.2 -#scikit-image==0.18.1 +scikit-image==0.18.1 opencv-python-headless==4.2.0.34 netcdf4==1.5.8 #metadata==0.2 normalization==0.4 utils==1.0.1 -tensorflow==1.13.1