Skip to content

Commit

Permalink
chore: bumpenvs for jupyter security update.
Browse files Browse the repository at this point in the history
  • Loading branch information
ioga committed Mar 30, 2024
1 parent b726cf9 commit 579113f
Show file tree
Hide file tree
Showing 33 changed files with 210 additions and 206 deletions.
14 changes: 7 additions & 7 deletions .circleci/real_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ parameters:
# be referenced by --ee testing.
default-pt-gpu-image:
type: string
default: determinedai/environments:cuda-11.3-pytorch-1.12-gpu-03ae7d7
default: determinedai/environments:cuda-11.3-pytorch-1.12-gpu-079eb6d
# Some python, go, and react dependencies are cached by circleci via `save_cache`/`restore_cache`.
# If the dependencies stay the same, but the circleci code that would produce them is changed,
# it may be necessary to invalidate the cache by incrementing this value.
Expand Down Expand Up @@ -201,7 +201,7 @@ commands:
- when:
condition: <<parameters.tf2>>
steps:
- run: docker pull determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-03ae7d7
- run: docker pull determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-079eb6d

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

test-unit-harness-gpu:
docker:
- image: determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1
- image: determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1
resource_class: determined-ai/container-runner-gpu
steps:
- run: mkdir -p ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
Expand All @@ -1828,7 +1828,7 @@ jobs:

test-unit-harness-pytorch2-gpu:
docker:
- image: determinedai/environments:cuda-11.8-pytorch-2.0-gpu-03ae7d7
- image: determinedai/environments:cuda-11.8-pytorch-2.0-gpu-079eb6d
resource_class: determined-ai/container-runner-gpu
steps:
- run: mkdir -p ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
Expand All @@ -1850,7 +1850,7 @@ jobs:

test-unit-harness-pytorch2-cpu:
docker:
- image: determinedai/environments:py-3.10-pytorch-2.0-cpu-03ae7d7
- image: determinedai/environments:py-3.10-pytorch-2.0-cpu-079eb6d
steps:
- run: mkdir -p ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
- checkout
Expand All @@ -1871,7 +1871,7 @@ jobs:

test-unit-harness-gpu-parallel:
docker:
- image: determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1
- image: determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1
resource_class: determined-ai/container-runner-multi-gpu
steps:
- run: mkdir -p ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
Expand Down Expand Up @@ -2489,7 +2489,7 @@ jobs:
type: string
default: "1"
environment-image:
default: determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1
default: determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1
type: string
accel-node-taints:
type: string
Expand Down
4 changes: 2 additions & 2 deletions docs/model-dev-guide/api-guides/apis-howto/_index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ experiment is controlled by the container image that has been configured for tha
Determined provides prebuilt Docker images that include TensorFlow 2.11, 1.15, and 2.8,
respectively:

- ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1`` (default)
- ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1`` (default)
- ``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``

We also provide lightweight CPU-only counterparts:

- ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.29.1``
- ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.30.1``
- ``determinedai/environments:py-3.8-tf-2.8-cpu-0.29.1``

To change the container image used for an experiment, specify :ref:`environment.image
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 @@ -101,9 +101,9 @@ Default Images
+-------------+-------------------------------------------------------------------------------+
| Environment | File Name |
+=============+===============================================================================+
| CPUs | ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.29.1`` |
| CPUs | ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.30.1`` |
+-------------+-------------------------------------------------------------------------------+
| NVIDIA GPUs | ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1`` |
| NVIDIA GPUs | ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1`` |
+-------------+-------------------------------------------------------------------------------+
| AMD GPUs | ``determinedai/environments:rocm-5.0-pytorch-1.10-tf-2.7-rocm-0.26.4`` |
+-------------+-------------------------------------------------------------------------------+
Expand Down Expand Up @@ -132,7 +132,7 @@ Example Dockerfile that installs custom ``conda``-, ``pip``-, and ``apt``-based
.. code:: bash
# Determined Image
FROM determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1
FROM determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1
# Custom Configuration
RUN apt-get update && \
Expand Down Expand Up @@ -195,7 +195,7 @@ environments using :ref:`custom images <custom-docker-images>`:
.. code:: bash
# Determined Image
FROM determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.29.1
FROM determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.30.1
# Create a virtual environment
RUN conda create -n myenv python=3.8
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 @@ -194,11 +194,11 @@

- ``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/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.29.1``.
Defaults to: ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.30.1``.

- ``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/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1``.
to: ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1``.

- ``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,9 +89,9 @@ 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/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1`` for NVIDIA GPUs.
- ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1`` for NVIDIA GPUs.
- ``determinedai/environments:rocm-5.0-pytorch-1.10-tf-2.7-rocm-0.26.4`` for ROCm.
- ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.29.1`` for CPUs.
- ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.30.1`` 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 @@ -1316,8 +1316,8 @@ 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/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1`` for NVIDIA GPUs.
- ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.29.1`` for CPUs.
- ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1`` for NVIDIA GPUs.
- ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.30.1`` for CPUs.
- ``determinedai/environments:rocm-5.0-pytorch-1.10-tf-2.7-rocm-0.26.4`` for ROCm.

When the cluster is configured with :ref:`resource_manager.type: slurm
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,9 +45,9 @@ 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/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1`` for NVIDIA GPUs.
- ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1`` for NVIDIA GPUs.
- ``determinedai/environments:rocm-5.0-pytorch-1.10-tf-2.7-rocm-0.26.4`` for ROCm.
- ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.29.1`` for CPUs.
- ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.30.1`` 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 @@ -26,9 +26,9 @@ by default in this version of Determined are described below.
+-------------+--------------------------------------------------------------------------+
| Environment | File Name |
+=============+==========================================================================+
| CPUs | ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-03ae7d7`` |
| CPUs | ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-079eb6d`` |
+-------------+--------------------------------------------------------------------------+
| NVIDIA GPUs | ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-03ae7d7`` |
| NVIDIA GPUs | ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-079eb6d`` |
+-------------+--------------------------------------------------------------------------+
| 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/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.29.1 \
--cpu-env-image determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.29.1
--gpu-env-image determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-0.30.1 \
--cpu-env-image determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-0.30.1
4 changes: 2 additions & 2 deletions docs/setup-cluster/slurm/singularity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ by default in this version of Determined are described below.
+-------------+--------------------------------------------------------------------------+
| Environment | File Name |
+=============+==========================================================================+
| CPUs | ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-03ae7d7`` |
| CPUs | ``determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-079eb6d`` |
+-------------+--------------------------------------------------------------------------+
| NVIDIA GPUs | ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-03ae7d7`` |
| NVIDIA GPUs | ``determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-079eb6d`` |
+-------------+--------------------------------------------------------------------------+
| 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/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-03ae7d7
image=determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-079eb6d
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/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-03ae7d7"
DEFAULT_TF2_GPU_IMAGE = "determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-03ae7d7"
DEFAULT_PT_CPU_IMAGE = "determinedai/environments:py-3.9-pytorch-1.12-cpu-03ae7d7"
DEFAULT_PT_GPU_IMAGE = "determinedai/environments:cuda-11.3-pytorch-1.12-gpu-03ae7d7"
DEFAULT_PT2_CPU_IMAGE = "determinedai/environments:py-3.10-pytorch-2.0-cpu-03ae7d7"
DEFAULT_PT2_GPU_IMAGE = "determinedai/environments:cuda-11.8-pytorch-2.0-gpu-03ae7d7"
DEFAULT_TF2_CPU_IMAGE = "determinedai/environments:py-3.9-pytorch-1.12-tf-2.11-cpu-079eb6d"
DEFAULT_TF2_GPU_IMAGE = "determinedai/environments:cuda-11.3-pytorch-1.12-tf-2.11-gpu-079eb6d"
DEFAULT_PT_CPU_IMAGE = "determinedai/environments:py-3.9-pytorch-1.12-cpu-079eb6d"
DEFAULT_PT_GPU_IMAGE = "determinedai/environments:cuda-11.3-pytorch-1.12-gpu-079eb6d"
DEFAULT_PT2_CPU_IMAGE = "determinedai/environments:py-3.10-pytorch-2.0-cpu-079eb6d"
DEFAULT_PT2_GPU_IMAGE = "determinedai/environments:cuda-11.8-pytorch-2.0-gpu-079eb6d"

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
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-0581f861a00dab473
Agent: ami-0aae1314bf4cd46a8
# TODO(DET-4258) Uncomment these when we fully support all P3 regions.
# ap-northeast-2:
# Master: ami-035e3e44dc41db6a2
# Agent: ami-0ba8919c43d1d8cab
# Agent: ami-01a7dc54f4832d921
# ap-southeast-1:
# Master: ami-0fd1ee6c8b656f020
# Agent: ami-08190d9f352e9157f
# Agent: ami-08c7512a3a706763d
# ap-southeast-2:
# Master: ami-0b62ecd3babd1c548
# Agent: ami-0af8a0dc1582a1f3b
# Agent: ami-08d850301481cfa6f
eu-central-1:
Master: ami-0abbe417ed83c0b29
Agent: ami-09d66f5a074e983ca
Agent: ami-0c3642bfef1e23d05
eu-west-1:
Master: ami-0e3f7dd2dc743e48a
Agent: ami-027d2d1f92b4ba863
Agent: ami-0f9e5e94c7d911407
# eu-west-2:
# Master: ami-0d78429fb6af30994
# Agent: ami-0c1f3c5203afb4a8f
# Agent: ami-001ac62ef6c960d70
us-east-1:
Master: ami-0172070f66a8ebe63
Agent: ami-053c295dd390f2a40
Agent: ami-00681263a44d2b064
us-east-2:
Master: ami-0bafa3699418551cd
Agent: ami-07e0b9bf1ea2852d8
Agent: ami-03b081710dc515cb7
us-west-2:
Master: ami-0ceeab680f529cc36
Agent: ami-0f74a44ed4ce75025
Agent: ami-0f0978d073ce78ae4

Parameters:
VpcCIDR:
Expand Down
20 changes: 10 additions & 10 deletions harness/determined/deploy/aws/templates/fsx.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-0581f861a00dab473
Agent: ami-0aae1314bf4cd46a8
# TODO(DET-4258) Uncomment these when we fully support all P3 regions.
# ap-northeast-2:
# Master: ami-035e3e44dc41db6a2
# Agent: ami-0ba8919c43d1d8cab
# Agent: ami-01a7dc54f4832d921
# ap-southeast-1:
# Master: ami-0fd1ee6c8b656f020
# Agent: ami-08190d9f352e9157f
# Agent: ami-08c7512a3a706763d
# ap-southeast-2:
# Master: ami-0b62ecd3babd1c548
# Agent: ami-0af8a0dc1582a1f3b
# Agent: ami-08d850301481cfa6f
eu-central-1:
Master: ami-0abbe417ed83c0b29
Agent: ami-09d66f5a074e983ca
Agent: ami-0c3642bfef1e23d05
eu-west-1:
Master: ami-0e3f7dd2dc743e48a
Agent: ami-027d2d1f92b4ba863
Agent: ami-0f9e5e94c7d911407
# eu-west-2:
# Master: ami-0d78429fb6af30994
# Agent: ami-0c1f3c5203afb4a8f
# Agent: ami-001ac62ef6c960d70
us-east-1:
Master: ami-0172070f66a8ebe63
Agent: ami-053c295dd390f2a40
Agent: ami-00681263a44d2b064
us-east-2:
Master: ami-0bafa3699418551cd
Agent: ami-07e0b9bf1ea2852d8
Agent: ami-03b081710dc515cb7
us-west-2:
Master: ami-0ceeab680f529cc36
Agent: ami-0f74a44ed4ce75025
Agent: ami-0f0978d073ce78ae4

Parameters:
VpcCIDR:
Expand Down
4 changes: 2 additions & 2 deletions harness/determined/deploy/aws/templates/govcloud.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Mappings:
RegionMap:
us-gov-east-1:
Master: ami-04ef693ebcf519dc3
Agent: ami-0f8b824c4dd2a429d
Agent: ami-047875a86e970378f
us-gov-west-1:
Master: ami-08bd15d820a3c087e
Agent: ami-05ab84798a30661d3
Agent: ami-0aa306aba45ce531c
Parameters:
Keypair:
Type: AWS::EC2::KeyPair::KeyName
Expand Down
20 changes: 10 additions & 10 deletions harness/determined/deploy/aws/templates/lore.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-0581f861a00dab473
Agent: ami-0aae1314bf4cd46a8
# TODO(DET-4258) Uncomment these when we fully support all P3 regions.
# ap-northeast-2:
# Master: ami-035e3e44dc41db6a2
# Agent: ami-0ba8919c43d1d8cab
# Agent: ami-01a7dc54f4832d921
# ap-southeast-1:
# Master: ami-0fd1ee6c8b656f020
# Agent: ami-08190d9f352e9157f
# Agent: ami-08c7512a3a706763d
# ap-southeast-2:
# Master: ami-0b62ecd3babd1c548
# Agent: ami-0af8a0dc1582a1f3b
# Agent: ami-08d850301481cfa6f
eu-central-1:
Master: ami-0abbe417ed83c0b29
Agent: ami-09d66f5a074e983ca
Agent: ami-0c3642bfef1e23d05
eu-west-1:
Master: ami-0e3f7dd2dc743e48a
Agent: ami-027d2d1f92b4ba863
Agent: ami-0f9e5e94c7d911407
# eu-west-2:
# Master: ami-0d78429fb6af30994
# Agent: ami-0c1f3c5203afb4a8f
# Agent: ami-001ac62ef6c960d70
us-east-1:
Master: ami-0172070f66a8ebe63
Agent: ami-053c295dd390f2a40
Agent: ami-00681263a44d2b064
us-east-2:
Master: ami-0bafa3699418551cd
Agent: ami-07e0b9bf1ea2852d8
Agent: ami-03b081710dc515cb7
us-west-2:
Master: ami-0ceeab680f529cc36
Agent: ami-0f74a44ed4ce75025
Agent: ami-0f0978d073ce78ae4

Parameters:
VpcCIDR:
Expand Down
Loading

0 comments on commit 579113f

Please sign in to comment.