Skip to content

Commit

Permalink
chore: bumpenvs for jupyter upgrades [MD-242] (#9660)
Browse files Browse the repository at this point in the history
  • Loading branch information
azhou-determined authored Jul 16, 2024
1 parent 6d1f778 commit 0786e08
Show file tree
Hide file tree
Showing 45 changed files with 178 additions and 178 deletions.
14 changes: 7 additions & 7 deletions .circleci/real_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ commands:
- when:
condition: <<parameters.tf2>>
steps:
- run: docker pull determinedai/pytorch-ngc-dev:0e43056
- run: docker pull determinedai/pytorch-ngc-dev:f20b027

login-docker:
parameters:
Expand Down Expand Up @@ -2365,7 +2365,7 @@ jobs:

test-unit-harness-gpu-tf:
docker:
- image: determinedai/tensorflow-ngc-dev:0e43056
- image: determinedai/tensorflow-ngc-dev:f20b027
resource_class: determined-ai/container-runner-gpu
steps:
- run: mkdir -p ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
Expand All @@ -2392,7 +2392,7 @@ jobs:

test-unit-harness-pytorch2-gpu:
docker:
- image: determinedai/pytorch-ngc-dev:0e43056
- image: determinedai/pytorch-ngc-dev:f20b027
resource_class: determined-ai/container-runner-gpu
steps:
- run: mkdir -p ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
Expand All @@ -2419,7 +2419,7 @@ jobs:

test-unit-harness-pytorch2-cpu:
docker:
- image: determinedai/pytorch-ngc-dev:0e43056
- image: determinedai/pytorch-ngc-dev:f20b027
steps:
- run: mkdir -p ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
- checkout
Expand All @@ -2445,7 +2445,7 @@ jobs:

test-unit-harness-gpu-parallel:
docker:
- image: determinedai/pytorch-ngc-dev:0e43056
- image: determinedai/pytorch-ngc-dev:f20b027
resource_class: determined-ai/container-runner-multi-gpu
steps:
- run: mkdir -p ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
Expand All @@ -2472,7 +2472,7 @@ jobs:

test-unit-harness-gpu-deepspeed:
docker:
- image: determinedai/pytorch-ngc-dev:0e43056
- image: determinedai/pytorch-ngc-dev:f20b027
resource_class: determined-ai/container-runner-gpu
steps:
- run: mkdir -p ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
Expand Down Expand Up @@ -3573,7 +3573,7 @@ jobs:
type: string
default: "1"
environment-image:
default: determinedai/pytorch-ngc-dev:0e43056
default: determinedai/pytorch-ngc-dev:f20b027
type: string
accel-node-taints:
type: string
Expand Down
2 changes: 1 addition & 1 deletion .circleci/scripts/pull_image_daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: pull-docker-daemonset
image: determinedai/pytorch-ngc-dev:0e43056
image: determinedai/pytorch-ngc-dev:f20b027
command: ["/bin/bash"]
args: ["echo", "test"]
resources:
Expand Down
8 changes: 4 additions & 4 deletions docs/model-dev-guide/prepare-container/custom-env.rst
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ Default Images
- - Environment
- File Name
- - CPUs
- ``determinedai/pytorch-ngc-dev:0e43056``
- ``determinedai/pytorch-ngc-dev:f20b027``
- - NVIDIA GPUs
- ``determinedai/pytorch-ngc-dev:0e43056``
- ``determinedai/pytorch-ngc-dev:f20b027``
- - AMD GPUs
- ``determinedai/environments:rocm-5.0-pytorch-1.10-tf-2.7-rocm-0.26.4``

Expand Down Expand Up @@ -155,7 +155,7 @@ Example Dockerfile that installs custom ``conda``-, ``pip``-, and ``apt``-based
.. code:: bash
# Determined Image
FROM determinedai/tensorflow-ngc-dev:0e43056
FROM determinedai/tensorflow-ngc-dev:f20b027
# Custom Configuration
RUN apt-get update && \
Expand Down Expand Up @@ -216,7 +216,7 @@ environments using :ref:`custom images <custom-docker-images>`:
.. code:: bash
# Determined Image
FROM determinedai/pytorch-ngc-dev:0e43056
FROM determinedai/pytorch-ngc-dev:f20b027
# Create a virtual environment
RUN conda create -n myenv python=3.8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Determined supports both TensorFlow 1 and 2. The version of TensorFlow used for
experiment is controlled by the configured container image. Determined provides prebuilt Docker
images that include TensorFlow 2+, 1.15, and 2.8, respectively:

- ``determinedai/tensorflow-ngc-dev:0e43056``
- ``determinedai/tensorflow-ngc-dev:f20b027``
- ``determinedai/environments:cuda-10.2-pytorch-1.7-tf-1.15-gpu-0.21.2``
- ``determinedai/environments:cuda-11.2-tf-2.8-gpu-0.29.1``

Expand Down
4 changes: 2 additions & 2 deletions docs/reference/deploy/helm-config-reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,13 @@

- ``cpuImage``: Sets the default Docker image for all non-GPU tasks. If a Docker image is
specified in the :ref:`experiment config <exp-environment-image>` this default is overriden.
Defaults to: ``determinedai/pytorch-ngc-dev:0e43056``.
Defaults to: ``determinedai/pytorch-ngc-dev:f20b027``.

- ``startupHook``: An optional inline script that will be executed as part of task set up.

- ``gpuImage``: Sets the default Docker image for all GPU tasks. If a Docker image is specified
in the :ref:`experiment config <exp-environment-image>` this default is overriden. Defaults
to: ``determinedai/pytorch-ngc-dev:0e43056``.
to: ``determinedai/pytorch-ngc-dev:f20b027``.

- ``logPolicies``: Sets log policies for trials. For details, visit :ref:`log_policies
<experiment-config-min-validation-period>`.
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/deploy/master-config-reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ configure different container images for NVIDIA GPU tasks using the ``cuda`` key
Determined 0.17.6), CPU tasks using ``cpu`` key, and ROCm (AMD GPU) tasks using the ``rocm`` key.
Default values:

- ``determinedai/pytorch-ngc-dev:0e43056`` for NVIDIA GPUs and for CPUs.
- ``determinedai/pytorch-ngc-dev:f20b027`` for NVIDIA GPUs and for CPUs.
- ``determinedai/environments:rocm-5.0-pytorch-1.10-tf-2.7-rocm-0.26.4`` for ROCm.

For TensorFlow users, we provide an image that must be referenced in the experiment configuration:

- ``determinedai/tensorflow-ngc-dev:0e43056`` for NVIDIA GPUs and for CPUs.
- ``determinedai/tensorflow-ngc-dev:f20b027`` for NVIDIA GPUs and for CPUs.

``environment_variables``
=========================
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/experiment-config-reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1335,12 +1335,12 @@ Optional. The Docker image to use when executing the workload. This image must b
container images for NVIDIA GPU tasks using ``cuda`` key (``gpu`` prior to 0.17.6), CPU tasks using
``cpu`` key, and ROCm (AMD GPU) tasks using ``rocm`` key. Default values:

- ``determinedai/pytorch-ngc-dev:0e43056`` for NVIDIA GPUs and for CPUs.
- ``determinedai/pytorch-ngc-dev:f20b027`` for NVIDIA GPUs and for CPUs.
- ``determinedai/environments:rocm-5.0-pytorch-1.10-tf-2.7-rocm-0.26.4`` for ROCm.

For TensorFlow users, we provide an image that must be referenced in the experiment configuration:

- ``determinedai/tensorflow-ngc-dev:0e43056`` for NVIDIA GPUs and for CPUs.
- ``determinedai/tensorflow-ngc-dev:f20b027`` for NVIDIA GPUs and for CPUs.

When the cluster is configured with :ref:`resource_manager.type: slurm
<cluster-configuration-slurm>` and ``container_run_type: singularity``, images are executed using
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/job-config-reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ The following configuration settings are supported:
different container images for NVIDIA GPU tasks using ``cuda`` key (``gpu`` prior to 0.17.6),
CPU tasks using ``cpu`` key, and ROCm (AMD GPU) tasks using ``rocm`` key. Default values:

- ``determinedai/pytorch-ngc-dev:0e43056`` for NVIDIA GPUs and for CPUs.
- ``determinedai/pytorch-ngc-dev:f20b027`` for NVIDIA GPUs and for CPUs.
- ``determinedai/environments:rocm-5.0-pytorch-1.10-tf-2.7-rocm-0.26.4`` for ROCm.

For TensorFlow users, we provide an image that must be referenced in the experiment
configuration:

- ``determinedai/tensorflow-ngc-dev:0e43056`` for NVIDIA GPUs and for CPUs.
- ``determinedai/tensorflow-ngc-dev:f20b027`` for NVIDIA GPUs and for CPUs.

- ``force_pull_image``: Forcibly pull the image from the Docker registry and bypass the Docker
cache. Defaults to ``false``.
Expand Down
4 changes: 2 additions & 2 deletions docs/setup-cluster/deploy-cluster/slurm/singularity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ by default in this version of Determined are described below.
- - Environment
- File Name
- - CPUs
- ``determinedai/pytorch-ngc-dev:0e43056``
- ``determinedai/pytorch-ngc-dev:f20b027``
- - NVIDIA GPUs
- ``determinedai/pytorch-ngc-dev:0e43056``
- ``determinedai/pytorch-ngc-dev:f20b027``
- - AMD GPUs
- ``determinedai/environments:rocm-5.0-pytorch-1.10-tf-2.7-rocm-622d512``

Expand Down
4 changes: 2 additions & 2 deletions docs/setup-cluster/gcp/install-gcp.rst
Original file line number Diff line number Diff line change
Expand Up @@ -406,5 +406,5 @@ This command line will spin up a cluster of up to 2 A100s in the ``us-central1-c
--compute-agent-instance-type a2-highgpu-1g --gpu-num 1 \
--gpu-type nvidia-tesla-a100 \
--region us-central1 --zone us-central1-c \
--gpu-env-image determinedai/pytorch-ngc-dev:0e43056 \
--cpu-env-image determinedai/pytorch-ngc-dev:0e43056
--gpu-env-image determinedai/pytorch-ngc-dev:f20b027 \
--cpu-env-image determinedai/pytorch-ngc-dev:f20b027
4 changes: 2 additions & 2 deletions docs/setup-cluster/slurm/singularity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ by default in this version of Determined are described below.
- - Environment
- File Name
- - CPUs
- ``determinedai/pytorch-ngc-dev:0e43056``
- ``determinedai/pytorch-ngc-dev:f20b027``
- - NVIDIA GPUs
- ``determinedai/pytorch-ngc-dev:0e43056``
- ``determinedai/pytorch-ngc-dev:f20b027``
- - AMD GPUs
- ``determinedai/environments:rocm-5.0-pytorch-1.10-tf-2.7-rocm-622d512``

Expand Down
2 changes: 1 addition & 1 deletion docs/setup-cluster/slurm/slurm-requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ platform. There may be additional per-user configuration that is required.

.. code:: bash
image=determinedai/pytorch-ngc-dev:0e43056
image=determinedai/pytorch-ngc-dev:f20b027
cd /shared/enroot/images
enroot import docker://$image
enroot create /shared/enroot/images/${image//[\/:]/\+}.sqsh
Expand Down
12 changes: 6 additions & 6 deletions e2e_tests/tests/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
MAX_TRIAL_BUILD_SECS = 90


DEFAULT_TF2_CPU_IMAGE = "determinedai/tensorflow-ngc-dev:0e43056"
DEFAULT_TF2_GPU_IMAGE = "determinedai/tensorflow-ngc-dev:0e43056"
DEFAULT_PT_CPU_IMAGE = "determinedai/pytorch-tensorflow-cpu-dev:0e43056"
DEFAULT_PT_GPU_IMAGE = "determinedai/pytorch-tensorflow-cuda-dev:0e43056"
DEFAULT_PT2_CPU_IMAGE = "determinedai/pytorch-ngc-dev:0e43056"
DEFAULT_PT2_GPU_IMAGE = "determinedai/pytorch-ngc-dev:0e43056"
DEFAULT_TF2_CPU_IMAGE = "determinedai/tensorflow-ngc-dev:f20b027"
DEFAULT_TF2_GPU_IMAGE = "determinedai/tensorflow-ngc-dev:f20b027"
DEFAULT_PT_CPU_IMAGE = "determinedai/pytorch-tensorflow-cpu-dev:f20b027"
DEFAULT_PT_GPU_IMAGE = "determinedai/pytorch-tensorflow-cuda-dev:f20b027"
DEFAULT_PT2_CPU_IMAGE = "determinedai/pytorch-ngc-dev:f20b027"
DEFAULT_PT2_GPU_IMAGE = "determinedai/pytorch-ngc-dev:f20b027"

TF2_CPU_IMAGE = os.environ.get("TF2_CPU_IMAGE") or DEFAULT_TF2_CPU_IMAGE
TF2_GPU_IMAGE = os.environ.get("TF2_GPU_IMAGE") or DEFAULT_TF2_GPU_IMAGE
Expand Down
2 changes: 1 addition & 1 deletion e2e_tests/tests/fixtures/ports-proxy/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ max_restarts: 0

# Hardcode the image because the new image has a bug. TODO fix this when the image bug is fixed.
environment:
image: determinedai/pytorch-tensorflow-cpu-dev:0e43056
image: determinedai/pytorch-tensorflow-cpu-dev:f20b027
proxy_ports:
- proxy_port: 8000
proxy_tcp: false
Expand Down
4 changes: 2 additions & 2 deletions examples/computer_vision/iris_tf_keras/adaptive.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ data:
test_url: http://download.tensorflow.org/data/iris_test.csv
environment:
image:
cpu: determinedai/tensorflow-ngc-dev:0e43056
gpu: determinedai/tensorflow-ngc-dev:0e43056
cpu: determinedai/tensorflow-ngc-dev:f20b027
gpu: determinedai/tensorflow-ngc-dev:f20b027
hyperparameters:
learning_rate:
type: log
Expand Down
4 changes: 2 additions & 2 deletions examples/computer_vision/iris_tf_keras/const.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ data:
test_url: http://download.tensorflow.org/data/iris_test.csv
environment:
image:
cpu: determinedai/tensorflow-ngc-dev:0e43056
gpu: determinedai/tensorflow-ngc-dev:0e43056
cpu: determinedai/tensorflow-ngc-dev:f20b027
gpu: determinedai/tensorflow-ngc-dev:f20b027
hyperparameters:
learning_rate: 1.0e-4
learning_rate_decay: 1.0e-6
Expand Down
4 changes: 2 additions & 2 deletions examples/computer_vision/iris_tf_keras/distributed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ data:
test_url: http://download.tensorflow.org/data/iris_test.csv
environment:
image:
cpu: determinedai/tensorflow-ngc-dev:0e43056
gpu: determinedai/tensorflow-ngc-dev:0e43056
cpu: determinedai/tensorflow-ngc-dev:f20b027
gpu: determinedai/tensorflow-ngc-dev:f20b027
hyperparameters:
learning_rate: 1.0e-4
learning_rate_decay: 1.0e-6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ data:
test_url: http://download.tensorflow.org/data/iris_test.csv
environment:
image:
cpu: determinedai/tensorflow-ngc-dev:0e43056
gpu: determinedai/tensorflow-ngc-dev:0e43056
cpu: determinedai/tensorflow-ngc-dev:f20b027
gpu: determinedai/tensorflow-ngc-dev:f20b027
resources:
slots_per_trial: 8
resource_pool: defq_GPU_cancelable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ data:
test_url: http://download.tensorflow.org/data/iris_test.csv
environment:
image:
cpu: determinedai/tensorflow-ngc-dev:0e43056
gpu: determinedai/tensorflow-ngc-dev:0e43056
cpu: determinedai/tensorflow-ngc-dev:f20b027
gpu: determinedai/tensorflow-ngc-dev:f20b027
resources:
slots_per_trial: 8
resource_pool: defq_GPU_hipri
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: torchvision dsat core_api
max_restarts: 0
environment:
image:
gpu: determinedai/pytorch-ngc-dev:0e43056
gpu: determinedai/pytorch-ngc-dev:f20b027
resources:
slots_per_trial: 2
shm_size: 4294967296 # 4 GiB.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: torchvision dsat deepspeed_trial
max_restarts: 0
environment:
image:
gpu: determinedai/pytorch-ngc-dev:0e43056
gpu: determinedai/pytorch-ngc-dev:f20b027
resources:
slots_per_trial: 2
shm_size: 4294967296 # 4 GiB.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ environment:
# You may need to modify this to match your network configuration.
- NCCL_SOCKET_IFNAME=ens,eth,ib
image:
gpu: determinedai/pytorch-ngc-dev:0e43056
gpu: determinedai/pytorch-ngc-dev:f20b027
resources:
slots_per_trial: 2
searcher:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ environment:
# You may need to modify this to match your network configuration.
- NCCL_SOCKET_IFNAME=ens,eth,ib
image:
gpu: determinedai/pytorch-ngc-dev:0e43056
gpu: determinedai/pytorch-ngc-dev:f20b027
resources:
slots_per_trial: 2
searcher:
Expand Down
20 changes: 10 additions & 10 deletions harness/determined/deploy/aws/templates/efs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@ Mappings:
RegionMap:
ap-northeast-1:
Master: ami-00910ef9457f0df47
Agent: ami-0d5ce4472d6286746
Agent: ami-0afb46883c38208a7
# TODO(DET-4258) Uncomment these when we fully support all P3 regions.
# ap-northeast-2:
# Master: ami-035e3e44dc41db6a2
# Agent: ami-0090f68a647f10126
# Agent: ami-0684df210044c21d5
# ap-southeast-1:
# Master: ami-0fd1ee6c8b656f020
# Agent: ami-048be732b76a4679e
# Agent: ami-0b3d9c646837892ad
# ap-southeast-2:
# Master: ami-0b62ecd3babd1c548
# Agent: ami-05c05ba492caa1c68
# Agent: ami-0db21a1ffe9fb8fd7
eu-central-1:
Master: ami-0abbe417ed83c0b29
Agent: ami-0ebd39eab325463c0
Agent: ami-08ce183d559b307c8
eu-west-1:
Master: ami-0e3f7dd2dc743e48a
Agent: ami-05c7e44456501d01d
Agent: ami-0cfbb4cbdf8e76b4b
# eu-west-2:
# Master: ami-0d78429fb6af30994
# Agent: ami-0d3b65b9d8e18b354
# Agent: ami-0ee850bb0d3dd97f0
us-east-1:
Master: ami-0172070f66a8ebe63
Agent: ami-0b25b64346732d0b5
Agent: ami-039387004119ccf40
us-east-2:
Master: ami-0bafa3699418551cd
Agent: ami-07517c67a90714250
Agent: ami-07966023b5496e611
us-west-2:
Master: ami-0ceeab680f529cc36
Agent: ami-083f8147aeeba1eb2
Agent: ami-002e87c2da1a565c9

Parameters:
VpcCIDR:
Expand Down
Loading

0 comments on commit 0786e08

Please sign in to comment.