Merge branch 'alan-turing-institute:develop' into entra-id

alan-turing-institute · Nov 20, 2023 · 2304e03 · 2304e03
2 parents b5f4d32 + edd7a9a
commit 2304e03
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml b/deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml
@@ -592,6 +592,10 @@ runcmd:
   - systemctl enable data.automount
   - systemctl enable output.automount
 
+  # Use tmpfs so tmp is in memory where possible rather than entirely on disk
+  - echo ">=== Configure tmpfs... ===<"
+  - echo "tmpfs /tmp tmpfs rw,nosuid,nodev,noexec" | tee -a /etc/fstab
+
   # List fstab and the volume mount order. Note that blobfuse mounts are not using fstab
   - echo ">=== Checking disk mounts... ===<"
   - grep -v -e '^[[:space:]]*$' /etc/fstab | sed 's|^|  /etc/fstab  |'

diff --git a/deployment/secure_research_environment/setup/Apply_SRE_Network_Configuration.ps1 b/deployment/secure_research_environment/setup/Apply_SRE_Network_Configuration.ps1
@@ -130,7 +130,7 @@ if (-not $config.sre.repositories.network.name) {
 # Set PyPI and CRAN locations on the SRD
 $null = Set-AzContext -SubscriptionId $config.sre.subscriptionName -ErrorAction Stop
 $scriptPath = Join-Path $PSScriptRoot ".." "remote" "network_configuration" "scripts" "update_mirror_settings.sh"
-$repositoryFacingVms = Get-AzVM | Where-Object { ($_.ResourceGroupName -eq $config.sre.srd.rg)
+$repositoryFacingVms = Get-AzVM | Where-Object ($_.ResourceGroupName -eq $config.sre.srd.rg)
 foreach ($VM in $repositoryFacingVms) {
     Add-LogMessage -Level Info "Ensuring that PyPI and CRAN locations are set correctly on $($VM.Name)"
     $params = @{

diff --git a/environment_configs/package_lists/allowlist-full-python-pypi-tier3.list b/environment_configs/package_lists/allowlist-full-python-pypi-tier3.list
@@ -374,16 +374,28 @@ numexpr
 numpy
 numpydoc
 nvidia-cublas-cu11
+nvidia-cublas-cu12
 nvidia-cuda-cupti-cu11
+nvidia-cuda-cupti-cu12
 nvidia-cuda-nvrtc-cu11
+nvidia-cuda-nvrtc-cu12
 nvidia-cuda-runtime-cu11
+nvidia-cuda-runtime-cu12
 nvidia-cudnn-cu11
+nvidia-cudnn-cu12
 nvidia-cufft-cu11
+nvidia-cufft-cu12
 nvidia-curand-cu11
+nvidia-curand-cu12
 nvidia-cusolver-cu11
+nvidia-cusolver-cu12
 nvidia-cusparse-cu11
+nvidia-cusparse-cu12
 nvidia-nccl-cu11
+nvidia-nccl-cu12
+nvidia-nvjitlink-cu12
 nvidia-nvtx-cu11
+nvidia-nvtx-cu12
 oauth2client
 oauthlib
 odo
@@ -460,6 +472,7 @@ py
 py-cpuinfo
 py4j
 pyarrow
+pyarrow-hotfix
 pyasn1
 pyasn1-modules
 pybind11