Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add version requirement for filelock and nni #7744

Merged
merged 7 commits into from
May 8, 2024
Merged

Add version requirement for filelock and nni #7744

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3808884
add requirement for filelock
KumoLiu May 7, 2024
e074894
add requirement for nni
KumoLiu May 7, 2024
f3c41cc
remove opencv-python-headless requirement
KumoLiu May 7, 2024
510cbd0
update dockerfile
KumoLiu May 7, 2024
b2c2bc5
Merge branch 'dev' into filelock
KumoLiu May 7, 2024
dbabcc8
address comments
KumoLiu May 7, 2024
03db971
Merge branch 'dev' into filelock
KumoLiu May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion docs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ pydicom
h5py
nni; platform_system == "Linux"
optuna
opencv-python-headless
KumoLiu marked this conversation as resolved.
Show resolved Hide resolved
onnx>=1.13.0
onnxruntime; python_version <= '3.10'
zarr
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ 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
Expand Down
Loading