From 7c57310d96d1aac1a18f44615959af92b808bf43 Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Thu, 20 Jun 2024 16:17:50 -0500 Subject: [PATCH 1/3] Fix Numpy & h5py bug in 1.7.0 Signed-off-by: Ian Hoang --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1e763d611..12f3a017a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get -y update && \ RUN groupadd --gid 1000 opensearch-benchmark && \ useradd -d /opensearch-benchmark -m -k /dev/null -g 1000 -N -u 1000 -l -s /bin/bash benchmark -RUN python3 -m pip install h5py==3.10.0; if [ -z "$VERSION" ] ; then python3 -m pip install opensearch-benchmark ; else python3 -m pip install opensearch-benchmark==$VERSION ; fi +RUN if [ -z "$VERSION" ] ; then python3 -m pip install opensearch-benchmark ; else python3 -m pip install opensearch-benchmark==$VERSION ; fi WORKDIR /opensearch-benchmark From d79782ed52b830438b774e9630fb6382832152f6 Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Tue, 25 Jun 2024 09:34:58 -0500 Subject: [PATCH 2/3] Pin numpy to be no version greater than 1.26.4 Signed-off-by: Ian Hoang --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 556ef8804..eb609a631 100644 --- a/setup.py +++ b/setup.py @@ -106,7 +106,7 @@ def str_from_file(name): "h5py>=3.10.0", # License: BSD # Required for knnvector workload - "numpy>=1.24.2", + "numpy>=1.24.2,<1.26.4", ] tests_require = [ From 2d8593f28be764c11c7355ea65a2716c7fbdcfaf Mon Sep 17 00:00:00 2001 From: Ian Hoang Date: Tue, 25 Jun 2024 10:15:43 -0500 Subject: [PATCH 3/3] Restrict numpy dependency Signed-off-by: Ian Hoang --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index eb609a631..f9f001094 100644 --- a/setup.py +++ b/setup.py @@ -106,7 +106,7 @@ def str_from_file(name): "h5py>=3.10.0", # License: BSD # Required for knnvector workload - "numpy>=1.24.2,<1.26.4", + "numpy>=1.24.2,<=1.26.4", ] tests_require = [