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.

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

Lighten logger impact on installation and dynamic import #285

Merged
merged 6 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion env-files/tensorflow/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ ENV PYTHONPATH=""
# Install itwinai
COPY pyproject.toml pyproject.toml
COPY src src
RUN pip install --no-cache-dir .[nvidia] \
RUN pip install --no-cache-dir .[prov4ml-nvidia] \
&& itwinai sanity-check --tensorflow --optional-deps ray

# Additional pip deps
Expand Down
2 changes: 1 addition & 1 deletion env-files/tensorflow/generic_tf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ else
fi

source $ENV_NAME/bin/activate
pip install --no-cache-dir -e ".[dev,nvidia,tf]"
pip install --no-cache-dir -e ".[dev,prov4ml-nvidia,tf]"
2 changes: 1 addition & 1 deletion env-files/torch/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN pip install --no-cache-dir --upgrade pip \
# Install itwinai with torch
COPY pyproject.toml pyproject.toml
COPY src src
RUN pip install --no-cache-dir .[torch,tf,nvidia,dev] --extra-index-url https://download.pytorch.org/whl/cu124
RUN pip install --no-cache-dir .[torch,tf,prov4ml-nvidia,dev] --extra-index-url https://download.pytorch.org/whl/cu124

# Install DeepSpeed, Horovod and Ray
ENV HOROVOD_WITH_PYTORCH=1 \
Expand Down
2 changes: 1 addition & 1 deletion env-files/torch/generic_torch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ fi

# Activate the venv and then install itwinai as editable
source $ENV_NAME/bin/activate
pip install -e ".[torch,tf,dev,nvidia]" \
pip install -e ".[torch,tf,dev,prov4ml-nvidia]" \
--no-cache-dir \
--extra-index-url https://download.pytorch.org/whl/cu121
2 changes: 1 addition & 1 deletion env-files/torch/jupyter/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ RUN pip install --no-cache-dir --upgrade pip \
WORKDIR "$HOME/itwinai"
COPY --chown=${NB_UID} pyproject.toml pyproject.toml
COPY --chown=${NB_UID} src src
RUN pip install --no-cache-dir .[torch,nvidia,dev] --extra-index-url https://download.pytorch.org/whl/cu124
RUN pip install --no-cache-dir .[torch,prov4ml-nvidia,dev] --extra-index-url https://download.pytorch.org/whl/cu124

# Apex: https://github.com/NVIDIA/apex
# (needed for DeepSpeed *_FUSED optinal build options)
Expand Down
2 changes: 1 addition & 1 deletion env-files/torch/slim.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ RUN /usr/bin/python3.10 -m venv /opt/venv \
WORKDIR /app
COPY pyproject.toml pyproject.toml
COPY src src
RUN pip install --no-cache-dir .[torch,nvidia,dev] --extra-index-url https://download.pytorch.org/whl/cu124
RUN pip install --no-cache-dir .[torch,prov4ml-nvidia,dev] --extra-index-url https://download.pytorch.org/whl/cu124

# Install DeepSpeed, Horovod and Ray
RUN CONTAINER_TORCH_VERSION="$(python -c 'import torch;print(torch.__version__)')" \
Expand Down
13 changes: 7 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ dependencies = [
"jsonargparse[signatures]>=4.34.0",
"matplotlib>=3.9.2",
"pip>=24.3.1",
"prov4ml@git+https://github.com/matbun/ProvML@new-main",
"ray[default,train,tune]>=2.39.0",
"prov>=2.0.1",
"tensorboard>=2.16.2",
]

[project.optional-dependencies]
Expand Down Expand Up @@ -79,10 +78,12 @@ hpo = [
"hpbandster>=0.7.0",
"gpy>=1.13.2",
]

macos = ["prov4ml[apple]@git+https://github.com/matbun/ProvML@new-main"]
nvidia = ["prov4ml[nvidia]@git+https://github.com/matbun/ProvML@new-main"]
# amd = ["prov4ml[amd]@git+https://github.com/matbun/ProvML@new-main"]
prov4ml = ["prov4ml@git+https://github.com/matbun/ProvML@new-main"]
prov4ml-macos = ["prov4ml[apple]@git+https://github.com/matbun/ProvML@new-main"]
prov4ml-nvidia = [
"prov4ml[nvidia]@git+https://github.com/matbun/ProvML@new-main",
]
# prov4ml-amd = ["prov4ml[amd]@git+https://github.com/matbun/ProvML@new-main"]

[project.urls]
Homepage = "https://www.intertwin.eu/"
Expand Down
Loading
Loading