From 810eb85a612304ab3368f85c728aec1232cc47e1 Mon Sep 17 00:00:00 2001 From: Pandu Oliver Kerr Date: Tue, 15 Nov 2022 17:46:08 +1100 Subject: [PATCH 1/2] changed torch versions and simplified Dockerfile --- Dockerfile | 5 +---- requirements.txt | 7 ++++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 30ea45b11..575ec1ef9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,14 +20,11 @@ COPY requirements.txt requirements.txt RUN pip3 install --no-cache-dir -r requirements.txt COPY scripts scripts RUN bash scripts/install_onnx_gpu_for_amd.sh -COPY scripts scripts RUN bash scripts/install_torch_amd.sh COPY dind_setup dind_setup RUN bash dind_setup/setup_dind.sh -COPY scripts scripts -RUN bash scripts/install_onnx_gpu_for_amd.sh COPY . /app ENV PYTHONPATH "${PYTHONPATH}:/app" RUN chmod +x ./run_marqo.sh CMD ["./run_marqo.sh"] -ENTRYPOINT ["./run_marqo.sh"] +ENTRYPOINT ["./run_marqo.sh"] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 251b846d5..8fbbaba21 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,15 +9,16 @@ tox # s2_inference: more_itertools nltk==3.7 -torch==1.12.0 +torch==1.12.1 +torchvision==0.13.1 Pillow==9.3.0 numpy==1.23.4 validators==0.20.0 sentence-transformers==2.2.2 -open_clip_torch +open_clip_torch==2.0.2 clip-marqo==1.0.2 protobuf==3.20.1 onnx==1.12.0 onnxruntime==1.13.1 pandas==1.5.1 -optimum==1.4.1 +optimum==1.4.1 \ No newline at end of file From 5335f0671c8bd50f5bd6c612b7a747f67336deb9 Mon Sep 17 00:00:00 2001 From: Pandu Oliver Kerr Date: Tue, 15 Nov 2022 19:29:17 +1100 Subject: [PATCH 2/2] Added newline to file end --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 575ec1ef9..3e21ffca6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,4 +27,4 @@ COPY . /app ENV PYTHONPATH "${PYTHONPATH}:/app" RUN chmod +x ./run_marqo.sh CMD ["./run_marqo.sh"] -ENTRYPOINT ["./run_marqo.sh"] \ No newline at end of file +ENTRYPOINT ["./run_marqo.sh"]