From 60f8c9a825922151120954806849f166b189a50a Mon Sep 17 00:00:00 2001 From: Xu Zhao Date: Mon, 17 Jun 2024 15:46:42 -0400 Subject: [PATCH 1/3] Upgrade numpy --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3a1fe44421..919de44f03 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ psutil pyyaml # pytorch build script pins numpy version # https://github.com/pytorch/builder/blob/main/wheel/build_wheel.sh -numpy==1.23.5 +numpy==2.0.0rc1 opencv-python submitit pynvml From 37bd8ce4a8f36edc84e3f0b1183b8a2c6c9ae2bd Mon Sep 17 00:00:00 2001 From: Xu Zhao Date: Mon, 17 Jun 2024 13:26:49 -0700 Subject: [PATCH 2/3] Fix doctr --- .../{models => canary_models}/DALLE2_pytorch/__init__.py | 0 .../DALLE2_pytorch/dalle2_pytorch.patch | 0 .../{models => canary_models}/DALLE2_pytorch/install.py | 0 .../{models => canary_models}/DALLE2_pytorch/metadata.yaml | 0 .../{models => canary_models}/DALLE2_pytorch/origin | 0 .../{models => canary_models}/DALLE2_pytorch/requirements.txt | 0 torchbenchmark/models/doctr_det_predictor/requirements.txt | 2 +- torchbenchmark/models/doctr_reco_predictor/requirements.txt | 4 ++-- torchbenchmark/models/timm_efficientdet/requirements.txt | 4 ++-- 9 files changed, 5 insertions(+), 5 deletions(-) rename torchbenchmark/{models => canary_models}/DALLE2_pytorch/__init__.py (100%) rename torchbenchmark/{models => canary_models}/DALLE2_pytorch/dalle2_pytorch.patch (100%) rename torchbenchmark/{models => canary_models}/DALLE2_pytorch/install.py (100%) rename torchbenchmark/{models => canary_models}/DALLE2_pytorch/metadata.yaml (100%) rename torchbenchmark/{models => canary_models}/DALLE2_pytorch/origin (100%) rename torchbenchmark/{models => canary_models}/DALLE2_pytorch/requirements.txt (100%) diff --git a/torchbenchmark/models/DALLE2_pytorch/__init__.py b/torchbenchmark/canary_models/DALLE2_pytorch/__init__.py similarity index 100% rename from torchbenchmark/models/DALLE2_pytorch/__init__.py rename to torchbenchmark/canary_models/DALLE2_pytorch/__init__.py diff --git a/torchbenchmark/models/DALLE2_pytorch/dalle2_pytorch.patch b/torchbenchmark/canary_models/DALLE2_pytorch/dalle2_pytorch.patch similarity index 100% rename from torchbenchmark/models/DALLE2_pytorch/dalle2_pytorch.patch rename to torchbenchmark/canary_models/DALLE2_pytorch/dalle2_pytorch.patch diff --git a/torchbenchmark/models/DALLE2_pytorch/install.py b/torchbenchmark/canary_models/DALLE2_pytorch/install.py similarity index 100% rename from torchbenchmark/models/DALLE2_pytorch/install.py rename to torchbenchmark/canary_models/DALLE2_pytorch/install.py diff --git a/torchbenchmark/models/DALLE2_pytorch/metadata.yaml b/torchbenchmark/canary_models/DALLE2_pytorch/metadata.yaml similarity index 100% rename from torchbenchmark/models/DALLE2_pytorch/metadata.yaml rename to torchbenchmark/canary_models/DALLE2_pytorch/metadata.yaml diff --git a/torchbenchmark/models/DALLE2_pytorch/origin b/torchbenchmark/canary_models/DALLE2_pytorch/origin similarity index 100% rename from torchbenchmark/models/DALLE2_pytorch/origin rename to torchbenchmark/canary_models/DALLE2_pytorch/origin diff --git a/torchbenchmark/models/DALLE2_pytorch/requirements.txt b/torchbenchmark/canary_models/DALLE2_pytorch/requirements.txt similarity index 100% rename from torchbenchmark/models/DALLE2_pytorch/requirements.txt rename to torchbenchmark/canary_models/DALLE2_pytorch/requirements.txt diff --git a/torchbenchmark/models/doctr_det_predictor/requirements.txt b/torchbenchmark/models/doctr_det_predictor/requirements.txt index a291164829..1f61f6a643 100644 --- a/torchbenchmark/models/doctr_det_predictor/requirements.txt +++ b/torchbenchmark/models/doctr_det_predictor/requirements.txt @@ -1 +1 @@ -git+https://github.com/mindee/doctr.git@56c8356 +doctr diff --git a/torchbenchmark/models/doctr_reco_predictor/requirements.txt b/torchbenchmark/models/doctr_reco_predictor/requirements.txt index 2f9c5c918f..797b93705e 100644 --- a/torchbenchmark/models/doctr_reco_predictor/requirements.txt +++ b/torchbenchmark/models/doctr_reco_predictor/requirements.txt @@ -1,2 +1,2 @@ -git+https://github.com/mindee/doctr.git@acb9f64 -rapidfuzz==2.15.1 +doctr +rapidfuzz diff --git a/torchbenchmark/models/timm_efficientdet/requirements.txt b/torchbenchmark/models/timm_efficientdet/requirements.txt index 2b82a288e8..2e3c8a1c8d 100644 --- a/torchbenchmark/models/timm_efficientdet/requirements.txt +++ b/torchbenchmark/models/timm_efficientdet/requirements.txt @@ -1,2 +1,2 @@ -pycocotools==2.0.6 -git+https://github.com/rwightman/efficientdet-pytorch.git@79d26d8 +pycocotools +git+https://github.com/rwightman/efficientdet-pytorch.git@d43c9e34cd62d22b4205831bb735f6dd83b8e881 From 693272909e28ec78e435c4d4bf9048d26b521ae6 Mon Sep 17 00:00:00 2001 From: Xu Zhao Date: Mon, 17 Jun 2024 15:10:15 -0700 Subject: [PATCH 3/3] Fix numpy version --- requirements.txt | 4 +--- torchbenchmark/models/doctr_det_predictor/requirements.txt | 2 +- torchbenchmark/models/doctr_reco_predictor/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 919de44f03..b9d52c5b24 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,9 +15,7 @@ transformers==4.38.1 MonkeyType psutil pyyaml -# pytorch build script pins numpy version -# https://github.com/pytorch/builder/blob/main/wheel/build_wheel.sh -numpy==2.0.0rc1 +numpy opencv-python submitit pynvml diff --git a/torchbenchmark/models/doctr_det_predictor/requirements.txt b/torchbenchmark/models/doctr_det_predictor/requirements.txt index 1f61f6a643..c0780e92a9 100644 --- a/torchbenchmark/models/doctr_det_predictor/requirements.txt +++ b/torchbenchmark/models/doctr_det_predictor/requirements.txt @@ -1 +1 @@ -doctr +python-doctr diff --git a/torchbenchmark/models/doctr_reco_predictor/requirements.txt b/torchbenchmark/models/doctr_reco_predictor/requirements.txt index 797b93705e..76de2bd25e 100644 --- a/torchbenchmark/models/doctr_reco_predictor/requirements.txt +++ b/torchbenchmark/models/doctr_reco_predictor/requirements.txt @@ -1,2 +1,2 @@ -doctr +python-doctr rapidfuzz