From 36b3325f4b07ca804accbe37a1acd4949865be1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lund?= <51115698+jaalu@users.noreply.github.com> Date: Fri, 26 Jul 2024 11:32:38 +0200 Subject: [PATCH 1/3] Set numpy below version 2 --- requirements-dev.txt | 69 ++++++++++++++++++++++++++++++++++++++++++++ requirements.txt | 4 +-- 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 requirements-dev.txt diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..f2e749c --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,69 @@ +aiohttp==3.9.5 +aiosignal==1.3.1 +async-timeout==4.0.3 +attrs==23.2.0 +bert-score==0.3.13 +certifi==2024.7.4 +charset-normalizer==3.3.2 +contourpy==1.2.1 +cycler==0.12.1 +datasets==2.20.0 +dill==0.3.8 +exceptiongroup==1.2.2 +fasttext==0.9.3 +filelock==3.15.4 +fonttools==4.53.1 +frozenlist==1.4.1 +fsspec==2024.5.0 +huggingface-hub==0.24.2 +idna==3.7 +iniconfig==2.0.0 +Jinja2==3.1.4 +kiwisolver==1.4.5 +MarkupSafe==2.1.5 +matplotlib==3.9.1 +mpmath==1.3.0 +multidict==6.0.5 +multiprocess==0.70.16 +networkx==3.3 +numpy==1.26.4 +nvidia-cublas-cu12==12.1.3.1 +nvidia-cuda-cupti-cu12==12.1.105 +nvidia-cuda-nvrtc-cu12==12.1.105 +nvidia-cuda-runtime-cu12==12.1.105 +nvidia-cudnn-cu12==9.1.0.70 +nvidia-cufft-cu12==11.0.2.54 +nvidia-curand-cu12==10.3.2.106 +nvidia-cusolver-cu12==11.4.5.107 +nvidia-cusparse-cu12==12.1.0.106 +nvidia-nccl-cu12==2.20.5 +nvidia-nvjitlink-cu12==12.5.82 +nvidia-nvtx-cu12==12.1.105 +packaging==24.1 +pandas==2.2.2 +pillow==10.4.0 +pluggy==1.5.0 +pyarrow==17.0.0 +pyarrow-hotfix==0.6 +pybind11==2.13.1 +pyparsing==3.1.2 +pytest==8.3.2 +python-dateutil==2.9.0.post0 +pytz==2024.1 +PyYAML==6.0.1 +regex==2024.7.24 +requests==2.32.3 +safetensors==0.4.3 +six==1.16.0 +sympy==1.13.1 +tokenizers==0.19.1 +tomli==2.0.1 +torch==2.4.0 +tqdm==4.66.4 +transformers==4.43.2 +triton==3.0.0 +typing_extensions==4.12.2 +tzdata==2024.1 +urllib3==2.2.2 +xxhash==3.4.1 +yarl==1.9.4 diff --git a/requirements.txt b/requirements.txt index 5b6e183..4868438 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ torch -numpy +numpy<2 transformers datasets fasttext bert_score -networkx +networkx \ No newline at end of file From 55bfcdc5c60beadb921af53cfd3af6e3c4e5829e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lund?= <51115698+jaalu@users.noreply.github.com> Date: Fri, 26 Jul 2024 12:39:36 +0200 Subject: [PATCH 2/3] Revert Numpy restriction, add joblib, sacrebleu and rouge-score to requirements --- requirements-dev.txt | 10 ++++++++++ requirements.txt | 7 +++++-- setup.py | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index f2e749c..fcf59d7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,4 @@ +absl-py==2.1.0 aiohttp==3.9.5 aiosignal==1.3.1 async-timeout==4.0.3 @@ -5,6 +6,8 @@ attrs==23.2.0 bert-score==0.3.13 certifi==2024.7.4 charset-normalizer==3.3.2 +click==8.1.7 +colorama==0.4.6 contourpy==1.2.1 cycler==0.12.1 datasets==2.20.0 @@ -19,13 +22,16 @@ huggingface-hub==0.24.2 idna==3.7 iniconfig==2.0.0 Jinja2==3.1.4 +joblib==1.4.2 kiwisolver==1.4.5 +lxml==5.2.2 MarkupSafe==2.1.5 matplotlib==3.9.1 mpmath==1.3.0 multidict==6.0.5 multiprocess==0.70.16 networkx==3.3 +nltk==3.8.1 numpy==1.26.4 nvidia-cublas-cu12==12.1.3.1 nvidia-cuda-cupti-cu12==12.1.105 @@ -43,6 +49,7 @@ packaging==24.1 pandas==2.2.2 pillow==10.4.0 pluggy==1.5.0 +portalocker==2.10.1 pyarrow==17.0.0 pyarrow-hotfix==0.6 pybind11==2.13.1 @@ -53,9 +60,12 @@ pytz==2024.1 PyYAML==6.0.1 regex==2024.7.24 requests==2.32.3 +rouge-score==0.1.2 +sacrebleu==2.4.2 safetensors==0.4.3 six==1.16.0 sympy==1.13.1 +tabulate==0.9.0 tokenizers==0.19.1 tomli==2.0.1 torch==2.4.0 diff --git a/requirements.txt b/requirements.txt index 4868438..0582bad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,10 @@ torch -numpy<2 +numpy transformers datasets fasttext bert_score -networkx \ No newline at end of file +networkx +joblib +sacrebleu +rouge-score \ No newline at end of file diff --git a/setup.py b/setup.py index 2583d27..4dfc702 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,8 @@ "fasttext", "pandas", "joblib", + "sacrebleu", + "rouge_score" ], tests_require=["pytest"], classifiers=[ From d67ebb269f3cbe455d6f41ebe4e3c046cf78412b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lund?= <51115698+jaalu@users.noreply.github.com> Date: Fri, 26 Jul 2024 12:46:11 +0200 Subject: [PATCH 3/3] Update locked packages to include Numpy 2 --- requirements-dev.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index fcf59d7..5349bc9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,6 +13,7 @@ cycler==0.12.1 datasets==2.20.0 dill==0.3.8 exceptiongroup==1.2.2 +faiss-cpu==1.7.3 fasttext==0.9.3 filelock==3.15.4 fonttools==4.53.1 @@ -32,7 +33,7 @@ multidict==6.0.5 multiprocess==0.70.16 networkx==3.3 nltk==3.8.1 -numpy==1.26.4 +numpy==2.0.1 nvidia-cublas-cu12==12.1.3.1 nvidia-cuda-cupti-cu12==12.1.105 nvidia-cuda-nvrtc-cu12==12.1.105