From 2ce82f69bcc68c9025f0fa07ad2dbc699aeab422 Mon Sep 17 00:00:00 2001 From: Pete MacKinnon Date: Fri, 27 Jan 2023 22:10:42 +0000 Subject: [PATCH 1/3] Update protobuf to 3.20.2 --- docker/conda/environments/cuda11.5_dev.yml | 2 +- docker/conda/environments/requirements.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/conda/environments/cuda11.5_dev.yml b/docker/conda/environments/cuda11.5_dev.yml index b57621dade..02c997be5f 100644 --- a/docker/conda/environments/cuda11.5_dev.yml +++ b/docker/conda/environments/cuda11.5_dev.yml @@ -70,7 +70,7 @@ dependencies: - pip - pkg-config # for mrc cmake - pluggy=1.0 - - protobuf=3.20 + - protobuf=3.20.2 - pybind11-stubgen=0.10.5 - pydot - pytest diff --git a/docker/conda/environments/requirements.txt b/docker/conda/environments/requirements.txt index 6970ecdc4f..2edf6056d5 100644 --- a/docker/conda/environments/requirements.txt +++ b/docker/conda/environments/requirements.txt @@ -9,6 +9,7 @@ ipywidgets jupyter-core>=4.11.2,<5.0 jupyterlab nvidia-pyindex +protobuf==3.20.2 pytest-benchmark>=4.0 torch==1.12.0+cu113 tritonclient[all]==2.17.* From e741b3a9412b495820e7201ccb18754978a0c643 Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Sat, 28 Jan 2023 05:31:35 +0000 Subject: [PATCH 2/3] Removing duplicate protobuf in requirements --- docker/conda/environments/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/conda/environments/requirements.txt b/docker/conda/environments/requirements.txt index 2edf6056d5..6970ecdc4f 100644 --- a/docker/conda/environments/requirements.txt +++ b/docker/conda/environments/requirements.txt @@ -9,7 +9,6 @@ ipywidgets jupyter-core>=4.11.2,<5.0 jupyterlab nvidia-pyindex -protobuf==3.20.2 pytest-benchmark>=4.0 torch==1.12.0+cu113 tritonclient[all]==2.17.* From 5394426f11ff37640ee5d620125333b161308b2a Mon Sep 17 00:00:00 2001 From: Pete MacKinnon Date: Mon, 30 Jan 2023 16:45:22 +0000 Subject: [PATCH 3/3] Reinstate protobuf in pip --- docker/conda/environments/requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/conda/environments/requirements.txt b/docker/conda/environments/requirements.txt index 6970ecdc4f..6bce58a5a9 100644 --- a/docker/conda/environments/requirements.txt +++ b/docker/conda/environments/requirements.txt @@ -9,6 +9,8 @@ ipywidgets jupyter-core>=4.11.2,<5.0 jupyterlab nvidia-pyindex +# Duplicated in conda dev to ensure parity with libprotobuf +protobuf==3.20.2 pytest-benchmark>=4.0 torch==1.12.0+cu113 tritonclient[all]==2.17.*