From e70c9546ae1499902253a193dfbe2e7e02fb4cc5 Mon Sep 17 00:00:00 2001 From: Xiaofu Huang Date: Fri, 19 Jul 2024 13:24:17 +0800 Subject: [PATCH] fix: Ensure ACA commands terminate immediately upon failure --- configs/Phi-3-mini-4k-instruct/infra/provision/finetuning.bicep | 2 +- configs/Phi-3-mini-4k-instruct/infra/provision/inference.bicep | 2 +- configs/llama-v2-7b/infra/provision/finetuning.bicep | 2 +- configs/llama-v2-7b/infra/provision/inference.bicep | 2 +- configs/llama-v3-8b/infra/provision/finetuning.bicep | 2 +- configs/llama-v3-8b/infra/provision/inference.bicep | 2 +- configs/mistral-7b-v02/infra/provision/finetuning.bicep | 2 +- configs/mistral-7b-v02/infra/provision/inference.bicep | 2 +- configs/mistral-7b/infra/provision/finetuning.bicep | 2 +- configs/mistral-7b/infra/provision/inference.bicep | 2 +- configs/phi-1_5/infra/provision/finetuning.bicep | 2 +- configs/phi-1_5/infra/provision/inference.bicep | 2 +- configs/phi-2/infra/provision/finetuning.bicep | 2 +- configs/phi-2/infra/provision/inference.bicep | 2 +- configs/zephyr-7b-beta/infra/provision/finetuning.bicep | 2 +- configs/zephyr-7b-beta/infra/provision/inference.bicep | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configs/Phi-3-mini-4k-instruct/infra/provision/finetuning.bicep b/configs/Phi-3-mini-4k-instruct/infra/provision/finetuning.bicep index 02b237a..3d1f818 100644 --- a/configs/Phi-3-mini-4k-instruct/infra/provision/finetuning.bicep +++ b/configs/Phi-3-mini-4k-instruct/infra/provision/finetuning.bicep @@ -11,7 +11,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaJobName string = 'aiacajob${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/Phi-3-mini-4k-instruct/infra/provision/inference.bicep b/configs/Phi-3-mini-4k-instruct/infra/provision/inference.bicep index 14007a7..2125bdb 100644 --- a/configs/Phi-3-mini-4k-instruct/infra/provision/inference.bicep +++ b/configs/Phi-3-mini-4k-instruct/infra/provision/inference.bicep @@ -10,7 +10,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaAppName string = 'aiacaapp${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/llama-v2-7b/infra/provision/finetuning.bicep b/configs/llama-v2-7b/infra/provision/finetuning.bicep index 02b237a..3d1f818 100644 --- a/configs/llama-v2-7b/infra/provision/finetuning.bicep +++ b/configs/llama-v2-7b/infra/provision/finetuning.bicep @@ -11,7 +11,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaJobName string = 'aiacajob${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/llama-v2-7b/infra/provision/inference.bicep b/configs/llama-v2-7b/infra/provision/inference.bicep index 14007a7..2125bdb 100644 --- a/configs/llama-v2-7b/infra/provision/inference.bicep +++ b/configs/llama-v2-7b/infra/provision/inference.bicep @@ -10,7 +10,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaAppName string = 'aiacaapp${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/llama-v3-8b/infra/provision/finetuning.bicep b/configs/llama-v3-8b/infra/provision/finetuning.bicep index 02b237a..3d1f818 100644 --- a/configs/llama-v3-8b/infra/provision/finetuning.bicep +++ b/configs/llama-v3-8b/infra/provision/finetuning.bicep @@ -11,7 +11,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaJobName string = 'aiacajob${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/llama-v3-8b/infra/provision/inference.bicep b/configs/llama-v3-8b/infra/provision/inference.bicep index 14007a7..2125bdb 100644 --- a/configs/llama-v3-8b/infra/provision/inference.bicep +++ b/configs/llama-v3-8b/infra/provision/inference.bicep @@ -10,7 +10,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaAppName string = 'aiacaapp${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/mistral-7b-v02/infra/provision/finetuning.bicep b/configs/mistral-7b-v02/infra/provision/finetuning.bicep index d43d66f..12cbdf9 100644 --- a/configs/mistral-7b-v02/infra/provision/finetuning.bicep +++ b/configs/mistral-7b-v02/infra/provision/finetuning.bicep @@ -11,7 +11,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaJobName string = 'aiacajob${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/mistral-7b-v02/infra/provision/inference.bicep b/configs/mistral-7b-v02/infra/provision/inference.bicep index 14007a7..2125bdb 100644 --- a/configs/mistral-7b-v02/infra/provision/inference.bicep +++ b/configs/mistral-7b-v02/infra/provision/inference.bicep @@ -10,7 +10,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaAppName string = 'aiacaapp${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/mistral-7b/infra/provision/finetuning.bicep b/configs/mistral-7b/infra/provision/finetuning.bicep index d43d66f..12cbdf9 100644 --- a/configs/mistral-7b/infra/provision/finetuning.bicep +++ b/configs/mistral-7b/infra/provision/finetuning.bicep @@ -11,7 +11,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaJobName string = 'aiacajob${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/mistral-7b/infra/provision/inference.bicep b/configs/mistral-7b/infra/provision/inference.bicep index 14007a7..2125bdb 100644 --- a/configs/mistral-7b/infra/provision/inference.bicep +++ b/configs/mistral-7b/infra/provision/inference.bicep @@ -10,7 +10,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaAppName string = 'aiacaapp${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/phi-1_5/infra/provision/finetuning.bicep b/configs/phi-1_5/infra/provision/finetuning.bicep index 02b237a..3d1f818 100644 --- a/configs/phi-1_5/infra/provision/finetuning.bicep +++ b/configs/phi-1_5/infra/provision/finetuning.bicep @@ -11,7 +11,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaJobName string = 'aiacajob${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/phi-1_5/infra/provision/inference.bicep b/configs/phi-1_5/infra/provision/inference.bicep index 14007a7..2125bdb 100644 --- a/configs/phi-1_5/infra/provision/inference.bicep +++ b/configs/phi-1_5/infra/provision/inference.bicep @@ -10,7 +10,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaAppName string = 'aiacaapp${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/phi-2/infra/provision/finetuning.bicep b/configs/phi-2/infra/provision/finetuning.bicep index 02b237a..3d1f818 100644 --- a/configs/phi-2/infra/provision/finetuning.bicep +++ b/configs/phi-2/infra/provision/finetuning.bicep @@ -11,7 +11,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaJobName string = 'aiacajob${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/phi-2/infra/provision/inference.bicep b/configs/phi-2/infra/provision/inference.bicep index 14007a7..2125bdb 100644 --- a/configs/phi-2/infra/provision/inference.bicep +++ b/configs/phi-2/infra/provision/inference.bicep @@ -10,7 +10,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaAppName string = 'aiacaapp${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/zephyr-7b-beta/infra/provision/finetuning.bicep b/configs/zephyr-7b-beta/infra/provision/finetuning.bicep index 02b237a..3d1f818 100644 --- a/configs/zephyr-7b-beta/infra/provision/finetuning.bicep +++ b/configs/zephyr-7b-beta/infra/provision/finetuning.bicep @@ -11,7 +11,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaJobName string = 'aiacajob${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: { diff --git a/configs/zephyr-7b-beta/infra/provision/inference.bicep b/configs/zephyr-7b-beta/infra/provision/inference.bicep index 14007a7..2125bdb 100644 --- a/configs/zephyr-7b-beta/infra/provision/inference.bicep +++ b/configs/zephyr-7b-beta/infra/provision/inference.bicep @@ -10,7 +10,7 @@ param acaEnvironmentStorageName string = 'aienvstorage${resourceSuffix}' param acaAppName string = 'aiacaapp${resourceSuffix}' param acaLogAnalyticsName string = 'ailog${resourceSuffix}' -var defaultCommand = join(defaultCommands, '; ') +var defaultCommand = join(defaultCommands, '&& ') resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { sku: {