From 3808884ad2a47eb87ec888521e6f3cb441771f2d Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Tue, 7 May 2024 13:45:59 +0800 Subject: [PATCH 1/5] add requirement for filelock Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b207b56b19..db5dce2488 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -52,7 +52,7 @@ git+https://github.com/Project-MONAI/MetricsReloaded@monai-support#egg=MetricsRe onnx>=1.13.0 onnxruntime; python_version <= '3.10' typeguard<3 # https://github.com/microsoft/nni/issues/5457 -filelock!=3.12.0 # https://github.com/microsoft/nni/issues/5523 +filelock<3.12.0 # https://github.com/microsoft/nni/issues/5523 zarr lpips==0.1.4 nvidia-ml-py From e074894b1c706e1ae91b5afdc4ffb9f5ef2cf208 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Tue, 7 May 2024 13:46:19 +0800 Subject: [PATCH 2/5] add requirement for nni Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index db5dce2488..ce28d3ebe2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -46,7 +46,7 @@ pynrrd pre-commit pydicom h5py -nni; platform_system == "Linux" and "arm" not in platform_machine and "aarch" not in platform_machine +nni==2.10.1; platform_system == "Linux" and "arm" not in platform_machine and "aarch" not in platform_machine optuna git+https://github.com/Project-MONAI/MetricsReloaded@monai-support#egg=MetricsReloaded onnx>=1.13.0 From f3c41ccc4b90fb0bc020f65c86422b7942509de6 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Tue, 7 May 2024 18:54:08 +0800 Subject: [PATCH 3/5] remove opencv-python-headless requirement Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- docs/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 5acc437391..39e6b64b47 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -35,7 +35,6 @@ pydicom h5py nni; platform_system == "Linux" optuna -opencv-python-headless onnx>=1.13.0 onnxruntime; python_version <= '3.10' zarr From 510cbd097eded537d53c74a94f87ad3d94878230 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Tue, 7 May 2024 18:54:17 +0800 Subject: [PATCH 4/5] update dockerfile Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- Dockerfile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc97227351..8e255597d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,18 +18,14 @@ LABEL maintainer="monai.contact@gmail.com" # TODO: remark for issue [revise the dockerfile](https://github.com/zarr-developers/numcodecs/issues/431) RUN if [[ $(uname -m) =~ "aarch64" ]]; then \ - cd /opt && \ - git clone --branch v0.12.1 --recursive https://github.com/zarr-developers/numcodecs && \ - pip wheel numcodecs && \ - rm -r /opt/*.whl && \ - rm -rf /opt/numcodecs; \ + export CFLAGS="-O3" && \ + export DISABLE_NUMCODECS_SSE2=true && \ + export DISABLE_NUMCODECS_AVX2=true && \ + pip install numcodecs; \ fi WORKDIR /opt/monai -# remove opencv-python before opencv-python-headless installation -RUN pip uninstall -y opencv && rm /usr/local/lib/python3.10/dist-packages/cv2 -r - # install full deps COPY requirements.txt requirements-min.txt requirements-dev.txt /tmp/ RUN cp /tmp/requirements.txt /tmp/req.bak \ From dbabcc8dcf1fc679e98e372ccf92189fd4c6b462 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Tue, 7 May 2024 22:02:26 +0800 Subject: [PATCH 5/5] address comments Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- docs/requirements.txt | 1 + requirements-dev.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 39e6b64b47..5acc437391 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -35,6 +35,7 @@ pydicom h5py nni; platform_system == "Linux" optuna +opencv-python-headless onnx>=1.13.0 onnxruntime; python_version <= '3.10' zarr diff --git a/requirements-dev.txt b/requirements-dev.txt index ce28d3ebe2..e8792c86f3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -57,4 +57,3 @@ zarr lpips==0.1.4 nvidia-ml-py huggingface_hub -opencv-python-headless