diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index 035c71edf..534773e2d 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -48,7 +48,7 @@ jobs: python -m pip install --upgrade pip python -m pip install wheel python -m pip install openvino-dev==2022.1.0 mlcube_docker - pip install torch==1.13.1+cpu torchvision==0.14.1+cpu torchaudio --extra-index-url https://download.pytorch.org/whl/cpu + 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 pip install -e . - name: Run generic unit tests if: steps.changed-files-specific.outputs.only_modified == 'false' # Run on any non-docs change diff --git a/Dockerfile-CPU b/Dockerfile-CPU index eadce16ae..127ffda89 100644 --- a/Dockerfile-CPU +++ b/Dockerfile-CPU @@ -7,7 +7,7 @@ LABEL version=1.0 RUN apt-get update && apt-get install -y python3.8 python3-pip libjpeg8-dev zlib1g-dev python3-dev libpython3.8-dev libffi-dev libgl1 RUN python3.8 -m pip install --upgrade pip # EXPLICITLY install cpu versions of torch/torchvision (not all versions have +cpu modes on PyPI...) -RUN python3.8 -m pip install torch==1.13.1+cpu torchvision==0.14.1+cpu torchaudio --extra-index-url https://download.pytorch.org/whl/cpu +RUN python3.8 -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 RUN python3.8 -m pip install openvino-dev==2022.1.0 opencv-python-headless mlcube_docker # Do some dependency installation separately here to make layer caching more efficient diff --git a/Dockerfile-CUDA11.6 b/Dockerfile-CUDA11.6 index be40fa929..05409bb47 100644 --- a/Dockerfile-CUDA11.6 +++ b/Dockerfile-CUDA11.6 @@ -9,7 +9,7 @@ LABEL version=1.0 # Explicitly install python3.8 (this uses 11.1 for now, as PyTorch LTS 1.8.2 is built against it) RUN apt-get update && apt-get install -y python3.8 python3-pip libjpeg8-dev zlib1g-dev python3-dev libpython3.8-dev libffi-dev libgl1 RUN python3.8 -m pip install --upgrade pip -RUN python3.8 -m pip install torch==1.13.1+cu116 torchvision==0.14.1+cu116 torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 +RUN python3.8 -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.8 -m pip install openvino-dev==2022.1.0 opencv-python-headless mlcube_docker # Do some dependency installation separately here to make layer caching more efficient diff --git a/Dockerfile-ROCm b/Dockerfile-ROCm index 57eee8bf7..9cf8053fc 100644 --- a/Dockerfile-ROCm +++ b/Dockerfile-ROCm @@ -7,7 +7,7 @@ LABEL version=1.0 # The base image contains ROCm, python 3.8 and pytorch already, no need to install those RUN python3 -m pip install --upgrade pip -RUN python3.8 -m pip install torch==1.13.1+rocm5.2 torchvision==0.14.1+rocm5.2 torchaudio --extra-index-url https://download.pytorch.org/whl/rocm5.2 +RUN python3.8 -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 -m pip install --upgrade pip && python3 -m pip install openvino-dev==2022.1.0 opencv-python-headless mlcube_docker RUN apt-get update && apt-get install -y libgl1 diff --git a/docs/setup.md b/docs/setup.md index af6b51d22..fe14e80c4 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -29,9 +29,11 @@ conda create -n venv_gandlf python=3.8 -y conda activate venv_gandlf ### PyTorch installation - https://pytorch.org/get-started/locally ## CUDA 11.6 -# pip install torch==1.13.1+cu116 torchvision==0.14.1+cu116 torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 +# 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 +## ROCm +# 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 ## CPU-only -# python3.8 -m pip install torch==1.13.1+cpu torchvision==0.14.1+cpu torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 +# 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 pip install openvino-dev==2022.1.0 # [OPTIONAL] to generate optimized models for inference pip install mlcube_docker # [OPTIONAL] to deploy GaNDLF models as MLCube-compliant Docker containers pip install -e .