From 854a3b39535c2d64919abb1536a4ab4e1e17e5df Mon Sep 17 00:00:00 2001 From: scap3yvt <149599669+scap3yvt@users.noreply.github.com> Date: Tue, 14 Nov 2023 11:00:42 -0500 Subject: [PATCH 1/4] updated python version for doc --- docs/setup.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/setup.md b/docs/setup.md index ed15f014d..0ce038e01 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -2,7 +2,7 @@ ## Prerequisites -- Python3 with a preference for [conda](https://conda.io), and python version `3.8` (higher versions *might* work, but they are **untested**). +- Python3 with a preference for [conda](https://conda.io), and python version `3.9` (higher versions *might* work, but they are **untested**). - Knowledge of [managing Python environments](https://docs.python.org/3/tutorial/venv.html). The instructions below assume knowledge of the [conda management system](https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html). Alternatively, you can run GaNDLF via [Docker](https://www.docker.com/). This needs different prerequisites. See the [Docker Installation](#docker-installation) section below for more information. @@ -25,7 +25,7 @@ Alternatively, you can run GaNDLF via [Docker](https://www.docker.com/). This ne GaNDLF's primary computational foundation is built on PyTorch, and as such it supports all hardware types that PyTorch supports. Please install PyTorch for your hardware type before installing GaNDLF. See the [PyTorch installation instructions](https://pytorch.org/get-started/previous-versions/#v1131) for more details. An example installation using CUDA, ROCm, and CPU-only is shown below: ```bash -(base) $> conda create -n venv_gandlf python=3.8 -y +(base) $> conda create -n venv_gandlf python=3.9 -y (base) $> conda activate venv_gandlf (venv_gandlf) $> ### subsequent commands go here ### PyTorch installation - https://pytorch.org/get-started/previous-versions/#v1131 From d140616efe0baba5e019171b28a6139c8f22d600 Mon Sep 17 00:00:00 2001 From: scap3yvt <149599669+scap3yvt@users.noreply.github.com> Date: Tue, 14 Nov 2023 11:02:37 -0500 Subject: [PATCH 2/4] 3.8 -> 3.9 --- Dockerfile-ROCm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-ROCm b/Dockerfile-ROCm index ae2a55711..9bbdaaa2b 100644 --- a/Dockerfile-ROCm +++ b/Dockerfile-ROCm @@ -5,10 +5,10 @@ LABEL version=1.0 # Quick start instructions on using Docker with ROCm: https://github.com/RadeonOpenCompute/ROCm-docker/blob/master/quick-start.md -# The base image contains ROCm, python 3.8 and pytorch already, no need to install those +# The base image contains ROCm, python 3.9 and pytorch already, no need to install those RUN apt-get update && apt-get install -y software-properties-common RUN add-apt-repository ppa:deadsnakes/ppa -RUN apt-get update && apt-get install -y python3.9 python3-pip libjpeg8-dev zlib1g-dev python3-dev libpython3.8-dev libffi-dev libgl1 +RUN apt-get update && apt-get install -y python3.9 python3-pip libjpeg8-dev zlib1g-dev python3-dev libpython3.9-dev libffi-dev libgl1 RUN python3.9 -m pip install --upgrade pip RUN python3.9 -m pip install torch==1.13.1+rocm5.2 torchvision==0.14.1+rocm5.2 torchaudio==0.13.1 --extra-index-url https://download.pytorch.org/whl/rocm5.2 RUN python3.9 -m pip install --upgrade pip && python3.9 -m pip install openvino-dev==2023.0.1 opencv-python-headless mlcube_docker From bef3a80026e0568e8f119b2afc23db3089c6567b Mon Sep 17 00:00:00 2001 From: scap3yvt <149599669+scap3yvt@users.noreply.github.com> Date: Tue, 14 Nov 2023 11:02:53 -0500 Subject: [PATCH 3/4] 3.8 -> 3.9 --- Dockerfile-CUDA11.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-CUDA11.6 b/Dockerfile-CUDA11.6 index 9de0b659a..db052592e 100644 --- a/Dockerfile-CUDA11.6 +++ b/Dockerfile-CUDA11.6 @@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive # Explicitly install python3.9 (this uses 11.1 for now, as PyTorch LTS 1.8.2 is built against it) RUN apt-get update && apt-get install -y software-properties-common RUN add-apt-repository ppa:deadsnakes/ppa -RUN apt-get update && apt-get install -y python3.9 python3-pip libjpeg8-dev zlib1g-dev python3-dev libpython3.8-dev libffi-dev libgl1 +RUN apt-get update && apt-get install -y python3.9 python3-pip libjpeg8-dev zlib1g-dev python3-dev libpython3.9-dev libffi-dev libgl1 RUN python3.9 -m pip install --upgrade pip RUN python3.9 -m pip install torch==1.13.1+cu116 torchvision==0.14.1+cu116 torchaudio==0.13.1 --extra-index-url https://download.pytorch.org/whl/cu116 RUN python3.9 -m pip install openvino-dev==2023.0.1 opencv-python-headless mlcube_docker From 5c0b24a6bc2a9640a29a487636fbd2c5fc6392c6 Mon Sep 17 00:00:00 2001 From: scap3yvt <149599669+scap3yvt@users.noreply.github.com> Date: Tue, 14 Nov 2023 11:03:15 -0500 Subject: [PATCH 4/4] 3.8 -> 3.9 --- Dockerfile-CPU | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-CPU b/Dockerfile-CPU index 758e26b62..0120f2af1 100644 --- a/Dockerfile-CPU +++ b/Dockerfile-CPU @@ -6,7 +6,7 @@ LABEL version=1.0 # Install fresh Python and dependencies for build-from-source RUN apt-get update && apt-get install -y software-properties-common RUN add-apt-repository ppa:deadsnakes/ppa -RUN apt-get update && apt-get install -y python3.9 python3-pip libjpeg8-dev zlib1g-dev python3-dev libpython3.8-dev libffi-dev libgl1 +RUN apt-get update && apt-get install -y python3.9 python3-pip libjpeg8-dev zlib1g-dev python3-dev libpython3.9-dev libffi-dev libgl1 RUN python3.9 -m pip install --upgrade pip # EXPLICITLY install cpu versions of torch/torchvision (not all versions have +cpu modes on PyPI...) RUN python3.9 -m pip install torch==1.13.1+cpu torchvision==0.14.1+cpu torchaudio==0.13.1 --extra-index-url https://download.pytorch.org/whl/cpu