ssube · ssube · Mar 6, 2023 · Mar 5, 2023 · Mar 5, 2023 · Mar 6, 2023
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -167,7 +167,7 @@ package-api-twine:
   cache:
     key:
       files:
-        - api/dev-requirements.txt
+        - api/requirements/dev.txt
     paths:
       - .cache/pip
     policy: pull-push

diff --git a/README.md b/README.md
@@ -172,13 +172,26 @@ Update pip itself:
 
 ### Install pip packages
 
-You can install of the necessary packages at once using [the `requirements.txt` file](./api/requirements.txt):
+You can install all of the necessary packages at once using [the `requirements/base.txt` file](./api/requirements/base.txt)
+and the `requirements/` file for your platform:
 
 ```shell
-> pip install -r requirements.txt
+> pip install -r requirements/base.txt -r requirements/amd-linux.txt
+# or
+> pip install -r requirements/base.txt -r requirements/amd-windows.txt
+# or
+> pip install -r requirements/base.txt -r requirements/amd-windows-nightly.txt
+# or
+> pip install -r requirements/base.txt -r requirements/cpu.txt
+# or
+> pip install -r requirements/base.txt -r requirements/nvidia.txt
 ```
 
-_Or_ you can install them manually using pip:
+Only install one of the platform-specific requirements files, otherwise you may end up with the wrong version of
+PyTorch or the ONNX runtime. The ONNX runtime nightly packages used by `amd-windows-nightly.txt` can be substantially
+faster than the latest release, but may not always be stable.
+
+If you prefer, you can install all of the packages manually using pip:
 
 ```shell
 > pip install "numpy>=1.20,<1.24"

diff --git a/api/Containerfile.cpu.buster b/api/Containerfile.cpu.buster
@@ -14,11 +14,9 @@ ENV PATH="/onnx-web/api/onnx_env/bin:$PATH"
 
 RUN pip3 install pip --upgrade
 
-RUN pip3 install torch torchvision --extra-index-url https://download.pytorch.org/whl/cpu --no-cache-dir --ignore-installed
+COPY requirements/ /onnx-web/api/requirements/
 
-COPY requirements.txt /onnx-web/api/requirements.txt
-
-RUN pip3 install -r requirements.txt --no-cache-dir
+RUN pip3 install -r requirements/base.txt -r requirements/cpu.txt --no-cache-dir
 
 COPY onnx_web/ /onnx-web/api/onnx_web/
 

diff --git a/api/Containerfile.cuda.ubuntu b/api/Containerfile.cuda.ubuntu
@@ -16,13 +16,9 @@ ENV PATH="/onnx-web/api/onnx_env/bin:$PATH"
 
 RUN pip3 install pip --upgrade
 
-RUN pip3 install torch torchvision --extra-index-url https://download.pytorch.org/whl/cu117 --no-cache-dir --ignore-installed
+COPY requirements/ /onnx-web/api/requirements/
 
-COPY requirements.txt /onnx-web/api/requirements.txt
-
-RUN pip3 install -r requirements.txt --no-cache-dir
-
-RUN pip3 install onnxruntime-gpu --no-cache-dir
+RUN pip3 install -r requirements/base.txt -r requirements/nvidia.txt --no-cache-dir
 
 COPY onnx_web/ /onnx-web/api/onnx_web/
 

diff --git a/api/Containerfile.directml.buster b/api/Containerfile.directml.buster
@@ -10,15 +10,9 @@ ENV PATH="/onnx-web/api/onnx_env/bin:$PATH"
 
 RUN pip3 install pip --upgrade
 
-RUN pip3 install torch torchvision --extra-index-url https://download.pytorch.org/whl/cpu --no-cache-dir --ignore-installed
+COPY requirements/ /onnx-web/api/requirements/
 
-RUN pip3 install onnxruntime-directml --force-reinstall
-
-RUN pip3 install --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/ ort-nightly-directml --force-reinstall
-
-COPY requirements.txt /onnx-web/api/requirements.txt
-
-RUN pip3 install -r requirements.txt --no-cache-dir
+RUN pip3 install -r requirements/base.txt -r requirements/amd-windows-nightly.txt --no-cache-dir
 
 COPY onnx_web/ /onnx-web/api/onnx_web/
 

diff --git a/api/Containerfile.rocm.ubuntu b/api/Containerfile.rocm.ubuntu
@@ -14,15 +14,9 @@ ENV PATH="/onnx-web/api/onnx_env/bin:$PATH"
 
 RUN pip3 install pip --upgrade
 
-COPY requirements.txt /onnx-web/api/requirements.txt
+COPY requirements/ /onnx-web/api/requirements/
 
-RUN pip3 install -r requirements.txt --no-cache-dir
-
-WORKDIR /ort
-
-RUN wget https://download.onnxruntime.ai/onnxruntime_training-1.14.0.dev20230123001%2Brocm54-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-
-RUN pip3 install /ort/*.whl --ignore-installed
+RUN pip3 install -r requirements/base.txt -r requirements/amd-linux.txt --no-cache-dir
 
 WORKDIR /onnx-web/api
 

diff --git a/api/Makefile b/api/Makefile
@@ -13,7 +13,7 @@ pip: check-venv
 	pip install -r requirements.txt
 
 pip-dev: check-venv
-	pip install -r dev-requirements.txt
+	pip install -r requirements/dev.txt
 
 test:
 	python -m coverage run -m unittest discover -s tests/

diff --git a/api/requirements/amd-linux.txt b/api/requirements/amd-linux.txt
@@ -0,0 +1,4 @@
+--extra-index-url https://download.pytorch.org/whl/rocm5.2
+torch
+torchvision
+onnxruntime
diff --git a/api/requirements/amd-windows-nightly.txt b/api/requirements/amd-windows-nightly.txt
@@ -0,0 +1,5 @@
+--extra-index-url https://download.pytorch.org/whl/cpu
+torch
+torchvision
+--extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/ORT-Nightly/pypi/simple/
+ort-nightly-directml
diff --git a/api/requirements/amd-windows.txt b/api/requirements/amd-windows.txt
@@ -0,0 +1,4 @@
+--extra-index-url https://download.pytorch.org/whl/cpu
+torch
+torchvision
+onnxruntime-directml
diff --git a/api/requirements/base.txt b/api/requirements/base.txt
@@ -0,0 +1,26 @@
+### Specific versions ###
+numpy>=1.20,<1.24
+protobuf<4,>=3.20.2
+
+### AI packages ###
+accelerate
+diffusers
+onnx
+# onnxruntime has many platform-specific packages
+safetensors
+transformers
+
+#### Upscaling and face correction
+basicsr
+codeformer-perceptor
+facexlib
+gfpgan
+realesrgan
+
+### Server packages ###
+boto3
+flask
+flask-cors
+jsonschema
+pyyaml
+setproctitle
diff --git a/api/requirements/cpu.txt b/api/requirements/cpu.txt
@@ -0,0 +1,3 @@
+--extra-index-url https://download.pytorch.org/whl/cpu
+torch
+torchvision
diff --git a/api/dev-requirements.txt → api/requirements/dev.txt b/api/dev-requirements.txt → api/requirements/dev.txt
diff --git a/api/requirements/nvidia.txt b/api/requirements/nvidia.txt
@@ -0,0 +1,4 @@
+--extra-index-url https://download.pytorch.org/whl/cu117
+torch
+torchvision
+onnxruntime-gpu