Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spark version upgarde to 3.3 #3398

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

resources:
instance_type: Standard_E8S_V3
runtime_version: 3.1.0
runtime_version: 3.3.0

count_word:
type: spark
Expand All @@ -44,6 +44,6 @@ jobs:

resources:
instance_type: Standard_E8S_V3
runtime_version: 3.1.0
runtime_version: 3.3.0


Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

resources:
instance_type: Standard_E8S_V3
runtime_version: 3.1.0
runtime_version: 3.3.0

conf:
spark.driver.cores: 2
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:

resources:
instance_type: Standard_E8S_V3
runtime_version: 3.1.0
runtime_version: 3.3.0

conf:
spark.driver.cores: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:

resources:
instance_type: standard_e8s_v3
runtime_version: "3.2"
runtime_version: "3.3"
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:

resources:
instance_type: standard_e8s_v3
runtime_version: "3.2"
runtime_version: "3.3"
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:

resources:
instance_type: standard_e8s_v3
runtime_version: "3.2"
runtime_version: "3.3"
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ args: >-

resources:
instance_type: standard_e4s_v3
runtime_version: "3.2"
runtime_version: "3.3"

Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ identity:

resources:
instance_type: standard_e4s_v3
runtime_version: "3.2"
runtime_version: "3.3"

Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ identity:

resources:
instance_type: standard_e4s_v3
runtime_version: "3.2"
runtime_version: "3.3"

2 changes: 1 addition & 1 deletion cli/jobs/spark/setup-attached-resources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ az storage account create --name $GEN2_STORAGE_NAME --resource-group $RESOURCE_G
az storage fs create -n $GEN2_FILE_SYSTEM --account-name $GEN2_STORAGE_NAME
az synapse workspace create --name $SYNAPSE_WORKSPACE_NAME --resource-group $RESOURCE_GROUP --storage-account $GEN2_STORAGE_NAME --file-system $GEN2_FILE_SYSTEM --sql-admin-login-user $SQL_ADMIN_LOGIN_USER --sql-admin-login-password $RANDOM_STRING --location $LOCATION
az role assignment create --role "Storage Blob Data Owner" --assignee $AML_USER_MANAGED_ID_OID --scope /subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP/providers/Microsoft.Storage/storageAccounts/$GEN2_STORAGE_NAME/blobServices/default/containers/$GEN2_FILE_SYSTEM
az synapse spark pool create --name $SPARK_POOL_NAME --workspace-name $SYNAPSE_WORKSPACE_NAME --resource-group $RESOURCE_GROUP --spark-version 3.2 --node-count 3 --node-size Medium --min-node-count 3 --max-node-count 10 --enable-auto-scale true
az synapse spark pool create --name $SPARK_POOL_NAME --workspace-name $SYNAPSE_WORKSPACE_NAME --resource-group $RESOURCE_GROUP --spark-version 3.3 --node-count 3 --node-size Medium --min-node-count 3 --max-node-count 10 --enable-auto-scale true
az synapse workspace firewall-rule create --name allowAll --workspace-name $SYNAPSE_WORKSPACE_NAME --resource-group $RESOURCE_GROUP --start-ip-address 0.0.0.0 --end-ip-address 255.255.255.255

if [[ "$2" == *"managed-identity"* ]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
" executor_instances=1,\n",
" resources={\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" },\n",
" conf={\"spark.synapse.library.python.env\": contents},\n",
")\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
" executor_instances=1,\n",
" resources={\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" },\n",
" conf={\"spark.synapse.library.python.env\": contents},\n",
")\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
" executor_instances=1,\n",
" resources={\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" },\n",
" conf={\"spark.synapse.library.python.env\": contents},\n",
")\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
}
},
"spark_runtime_version": {
"value": "3.2.0"
"value": "3.3.0"
},
"offlineStoreStorageAccountOption": {
"value": "new"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ materialization_identity:
resource_id: /subscriptions/{sub-id}/resourceGroups/{rg}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{uai-name}

compute_runtime:
spark_runtime_version: '3.2'
spark_runtime_version: '3.3'
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,7 @@
"```json\n",
"\"parameters\": {\n",
" \"spark_runtime_version\": {\n",
" \"value\": \"3.2.0\"\n",
" \"value\": \"3.3.0\"\n",
" }\n",
"}\n",
"```"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@
" \"$schema\": \"http://azureml/sdk-2-0/FeatureStore.json\",\n",
" \"name\": featurestore_name,\n",
" \"location\": featurestore_location,\n",
" \"compute_runtime\": {\"spark_runtime_version\": \"3.2\"},\n",
" \"compute_runtime\": {\"spark_runtime_version\": \"3.3\"},\n",
" \"offline_store\": {\n",
" \"type\": \"azure_data_lake_gen2\",\n",
" \"target\": offline_store_gen2_container_arm_id,\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
observation_data_format: parquet
resources:
instance_type: standard_e4s_v3
runtime_version: "3.2"
runtime_version: "3.3"
outputs:
output_data:
conf:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
observation_data_format: parquet
resources:
instance_type: standard_e4s_v3
runtime_version: "3.2"
runtime_version: "3.3"
outputs:
output_data:
conf:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
" kmeans_clustering = spark_kmeans(file_input=train_data)\n",
" kmeans_clustering.resources = {\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" }\n",
" kmeans_clustering.outputs.output.mode = InputOutputModes.DIRECT\n",
"\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@
"|Property|Description|\n",
"|:-|:-|\n",
"| **instance_type** | A key that defines the compute instance type to be used for the serverless Spark compute. The following instance types are currently supported:<ul><li>`Standard_E4S_V3`</li><li>`Standard_E8S_V3`</li><li>`Standard_E16S_V3`</li><li>`Standard_E32S_V3`</li><li>`Standard_E64S_V3`</li></ul>|\n",
"| **runtime_version** | A key that defines the Spark runtime version. The following Spark runtime versions are currently supported:<ul><li>`3.1.0`</li><li>`3.2.0`</li></ul> |\n",
"| **runtime_version** | A key that defines the Spark runtime version. The following Spark runtime versions are currently supported:<ul><li>`3.3.0`</li><li>`3.4.0`</li></ul> |\n",
"| **driver_cores** | The he number of cores allocated for the Spark driver. |\n",
"| **driver_memory** | The allocated memory for the Spark exedriver, with a size unit suffix `k`, `m`, `g` or `t` (for example, `512m`, `2g`). |\n",
"| **executor_cores** | The number of cores allocated for the Spark executor. |\n",
Expand Down Expand Up @@ -639,7 +639,7 @@
"if USE_PARTITIONING_COMPONENT:\n",
" spark_parameters = dict(\n",
" instance_type=\"Standard_E4S_V3\",\n",
" runtime_version=\"3.2.0\",\n",
" runtime_version=\"3.3.0\",\n",
" driver_cores=1,\n",
" driver_memory=\"2g\",\n",
" executor_cores=2,\n",
Expand Down Expand Up @@ -704,7 +704,7 @@
"\n",
" partition_step.resources = {\n",
" \"instance_type\": spark_parameters.get(\"instance_type\", \"Standard_E4S_V3\"),\n",
" \"runtime_version\": str(spark_parameters.get(\"runtime_version\", \"3.2.0\")),\n",
" \"runtime_version\": str(spark_parameters.get(\"runtime_version\", \"3.3.0\")),\n",
" }\n",
" partition_step.conf = {\n",
" \"spark.driver.cores\": spark_parameters.get(\"driver_cores\", 1),\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
" executor_instances=2,\n",
" resources={\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" },\n",
")\n",
"\n",
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/jobs/spark/setup_spark.sh
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ else
az storage fs create -n $GEN2_FILE_SYSTEM --account-name $GEN2_STORAGE_NAME
az synapse workspace create --name $SYNAPSE_WORKSPACE_NAME --resource-group $RESOURCE_GROUP --storage-account $GEN2_STORAGE_NAME --file-system $GEN2_FILE_SYSTEM --sql-admin-login-user $SQL_ADMIN_LOGIN_USER --sql-admin-login-password $RANDOM_STRING --location $LOCATION
az role assignment create --role "Storage Blob Data Owner" --assignee $AML_USER_MANAGED_ID_OID --scope /subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP/providers/Microsoft.Storage/storageAccounts/$GEN2_STORAGE_NAME/blobServices/default/containers/$GEN2_FILE_SYSTEM
az synapse spark pool create --name $SPARK_POOL_NAME --workspace-name $SYNAPSE_WORKSPACE_NAME --resource-group $RESOURCE_GROUP --spark-version 3.2 --node-count 3 --node-size Medium --min-node-count 3 --max-node-count 10 --enable-auto-scale true
az synapse spark pool create --name $SPARK_POOL_NAME --workspace-name $SYNAPSE_WORKSPACE_NAME --resource-group $RESOURCE_GROUP --spark-version 3.3 --node-count 3 --node-size Medium --min-node-count 3 --max-node-count 10 --enable-auto-scale true
az synapse workspace firewall-rule create --name allowAll --workspace-name $SYNAPSE_WORKSPACE_NAME --resource-group $RESOURCE_GROUP --start-ip-address 0.0.0.0 --end-ip-address 255.255.255.255
#</create_attached_resources>

Expand Down
6 changes: 3 additions & 3 deletions sdk/python/jobs/spark/submit_spark_pipeline_jobs.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
" spark_step.identity = ManagedIdentityConfiguration()\n",
" spark_step.resources = {\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" }\n",
"\n",
"\n",
Expand Down Expand Up @@ -422,7 +422,7 @@
" spark_step.identity = UserIdentityConfiguration()\n",
" spark_step.resources = {\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" }\n",
"\n",
"\n",
Expand Down Expand Up @@ -501,7 +501,7 @@
" spark_step.outputs.wrangled_data.mode = InputOutputModes.DIRECT\n",
" spark_step.resources = {\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" }\n",
"\n",
"\n",
Expand Down
6 changes: 3 additions & 3 deletions sdk/python/jobs/spark/submit_spark_standalone_jobs.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
" executor_instances=2,\n",
" resources={\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" },\n",
" inputs={\n",
" \"titanic_data\": Input(\n",
Expand Down Expand Up @@ -329,7 +329,7 @@
" executor_instances=2,\n",
" resources={\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" },\n",
" inputs={\n",
" \"titanic_data\": Input(\n",
Expand Down Expand Up @@ -391,7 +391,7 @@
" executor_instances=2,\n",
" resources={\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" },\n",
" inputs={\n",
" \"titanic_data\": Input(\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@
" executor_instances=2,\n",
" resources={\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" },\n",
" inputs={\n",
" \"titanic_data\": Input(\n",
Expand Down Expand Up @@ -765,7 +765,7 @@
" executor_instances=2,\n",
" resources={\n",
" \"instance_type\": \"Standard_E8S_V3\",\n",
" \"runtime_version\": \"3.2.0\",\n",
" \"runtime_version\": \"3.3.0\",\n",
" },\n",
" inputs={\n",
" \"titanic_data\": Input(\n",
Expand Down
Loading