From f278e51b8c13fa46d3f5e763452d9e70e24df955 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Wed, 8 May 2024 12:32:50 +0800 Subject: [PATCH] Add version requirement for filelock and nni (#7744) Add version requirement for filelock and nni ### Types of changes - [x] Non-breaking change (fix or new feature that would not break existing functionality). - [ ] Breaking change (fix or new feature that would cause existing functionality to change). - [ ] New tests added to cover the changes. - [ ] Integration tests passed locally by running `./runtests.sh -f -u --net --coverage`. - [ ] Quick tests passed locally by running `./runtests.sh --quick --unittests --disttests`. - [ ] In-line docstrings updated. - [ ] Documentation updated, tested `make html` command in the `docs/` folder. --------- Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- Dockerfile | 12 ++++-------- requirements-dev.txt | 5 ++--- 2 files changed, 6 insertions(+), 11 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 \ diff --git a/requirements-dev.txt b/requirements-dev.txt index b207b56b19..e8792c86f3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -46,15 +46,14 @@ 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 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 huggingface_hub -opencv-python-headless