Skip to content

Commit

Permalink
6.8.3 image references (#227)
Browse files Browse the repository at this point in the history
* Create /.google_hpc_firstrun sentinel file

This signals the "firstrun" systemd service to run for first-boot
VM configuration.

* Update image references for Slurm-GCP 6.8.x
  • Loading branch information
bsngardner authored Nov 4, 2024
1 parent 3d2f178 commit 1431b20
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 19 deletions.
9 changes: 9 additions & 0 deletions ansible/roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,12 @@
template:
src: ld.so.conf.d/usr-local.conf.j2
dest: /etc/ld.so.conf.d/usr-local.conf

- name: Mark image for first boot
copy:
content: ""
dest: /.google_hpc_firstrun
force: false
group: root
owner: root
mode: 0660
2 changes: 1 addition & 1 deletion docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ across all instances and allows easy user control with

By default, the [slurm_cluster](../terraform/slurm_cluster/README.md) terraform
module uses the latest Slurm image family (e.g.
`slurm-gcp-6-7-hpc-rocky-linux-8`). As new Slurm image families are released,
`slurm-gcp-6-8-hpc-rocky-linux-8`). As new Slurm image families are released,
coenciding with periodic Slurm releases, the terraform module will be updated to
track the newest image family by setting it as the new default. This update can
be considered a breaking change.
Expand Down
20 changes: 10 additions & 10 deletions docs/images.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,21 @@ For the [TPU](./glossary.md#tpu) nodes docker images are also released.

| Project | Image Family | Arch | Status |
| :------------------: | :---------------------------------- | :----- | :------------- |
| schedmd-slurm-public | slurm-gcp-6-7-debian-11 | x86_64 | Supported |
| schedmd-slurm-public | slurm-gcp-6-7-hpc-rocky-linux-8 | x86_64 | Supported |
| schedmd-slurm-public | slurm-gcp-6-7-ubuntu-2004-lts | x86_64 | Supported |
| schedmd-slurm-public | slurm-gcp-6-7-ubuntu-2204-lts-arm64 | ARM64 | Supported |
| schedmd-slurm-public | slurm-gcp-6-8-debian-11 | x86_64 | Supported |
| schedmd-slurm-public | slurm-gcp-6-8-hpc-rocky-linux-8 | x86_64 | Supported |
| schedmd-slurm-public | slurm-gcp-6-8-ubuntu-2004-lts | x86_64 | Supported |
| schedmd-slurm-public | slurm-gcp-6-8-ubuntu-2204-lts-arm64 | ARM64 | Supported |

### Published Docker Image Family

| Project | Image Family | Status |
| :------------------: | :-------------------------- | :-------- |
| schedmd-slurm-public | tpu:slurm-gcp-6-7-tf-2.12.1 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-7-tf-2.13.0 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-7-tf-2.13.1 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-7-tf-2.14.0 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-7-tf-2.14.1 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-7-tf-2.15.0 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-8-tf-2.12.1 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-8-tf-2.13.0 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-8-tf-2.13.1 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-8-tf-2.14.0 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-8-tf-2.14.1 | Supported |
| schedmd-slurm-public | tpu:slurm-gcp-6-8-tf-2.15.0 | Supported |

## Custom Image

Expand Down
8 changes: 4 additions & 4 deletions docs/tpu.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ state we will also include if it is tested or not.

| Project | Image Family | Arch | TPU Status |
| :------------------: | :---------------------------------- | :----- | :---------- |
| schedmd-slurm-public | slurm-gcp-6-7-debian-11 | x86_64 | Untested |
| schedmd-slurm-public | slurm-gcp-6-7-hpc-rocky-linux-8 | x86_64 | Tested |
| schedmd-slurm-public | slurm-gcp-6-7-ubuntu-2004-lts | x86_64 | Untested |
| schedmd-slurm-public | slurm-gcp-6-7-ubuntu-2204-lts-arm64 | ARM64 | Untested |
| schedmd-slurm-public | slurm-gcp-6-8-debian-11 | x86_64 | Untested |
| schedmd-slurm-public | slurm-gcp-6-8-hpc-rocky-linux-8 | x86_64 | Tested |
| schedmd-slurm-public | slurm-gcp-6-8-ubuntu-2004-lts | x86_64 | Untested |
| schedmd-slurm-public | slurm-gcp-6-8-ubuntu-2204-lts-arm64 | ARM64 | Untested |

## Terraform

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ locals {
source_image_family = (
var.source_image_family != "" && var.source_image_family != null
? var.source_image_family
: "slurm-gcp-6-7-hpc-rocky-linux-8"
: "slurm-gcp-6-8-hpc-rocky-linux-8"
)
source_image_project = (
var.source_image_project != "" && var.source_image_project != null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ No modules.
|------|-------------|------|---------|:--------:|
| <a name="input_accelerator_config"></a> [accelerator\_config](#input\_accelerator\_config) | Nodeset accelerator config, see https://cloud.google.com/tpu/docs/supported-tpu-configurations for details. | <pre>object({<br/> topology = string<br/> version = string<br/> })</pre> | <pre>{<br/> "topology": "",<br/> "version": ""<br/>}</pre> | no |
| <a name="input_data_disks"></a> [data\_disks](#input\_data\_disks) | The data disks to include in the TPU node | `list(string)` | `[]` | no |
| <a name="input_docker_image"></a> [docker\_image](#input\_docker\_image) | The gcp container registry id docker image to use in the TPU vms, it defaults to gcr.io/schedmd-slurm-public/tpu:slurm-gcp-6-7-tf-<var.tf\_version> | `string` | `""` | no |
| <a name="input_docker_image"></a> [docker\_image](#input\_docker\_image) | The gcp container registry id docker image to use in the TPU vms, it defaults to gcr.io/schedmd-slurm-public/tpu:slurm-gcp-6-8-tf-<var.tf\_version> | `string` | `""` | no |
| <a name="input_enable_public_ip"></a> [enable\_public\_ip](#input\_enable\_public\_ip) | Enables IP address to access the Internet. | `bool` | `false` | no |
| <a name="input_network_storage"></a> [network\_storage](#input\_network\_storage) | An array of network attached storage mounts to be configured on nodes. | <pre>list(object({<br/> server_ip = string,<br/> remote_mount = string,<br/> local_mount = string,<br/> fs_type = string,<br/> mount_options = string,<br/> }))</pre> | `[]` | no |
| <a name="input_node_count_dynamic_max"></a> [node\_count\_dynamic\_max](#input\_node\_count\_dynamic\_max) | Maximum number of nodes allowed in this partition to be created dynamically. | `number` | `0` | no |
Expand Down
2 changes: 1 addition & 1 deletion terraform/slurm_cluster/modules/slurm_nodeset_tpu/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ locals {
service_account = var.service_account != null ? var.service_account : local.service_account
preserve_tpu = local.can_preempt ? var.preserve_tpu : false
data_disks = var.data_disks
docker_image = var.docker_image != "" ? var.docker_image : "us-docker.pkg.dev/schedmd-slurm-public/tpu/slurm-gcp-6-7:tf-${var.tf_version}"
docker_image = var.docker_image != "" ? var.docker_image : "us-docker.pkg.dev/schedmd-slurm-public/tpu/slurm-gcp-6-8:tf-${var.tf_version}"
subnetwork = local.snetwork
network_storage = var.network_storage
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ variable "accelerator_config" {
}

variable "docker_image" {
description = "The gcp container registry id docker image to use in the TPU vms, it defaults to gcr.io/schedmd-slurm-public/tpu:slurm-gcp-6-7-tf-<var.tf_version>"
description = "The gcp container registry id docker image to use in the TPU vms, it defaults to gcr.io/schedmd-slurm-public/tpu:slurm-gcp-6-8-tf-<var.tf_version>"
type = string
default = ""
}
Expand Down

0 comments on commit 1431b20

Please sign in to comment.