update images to ubuntu 22.04 & fix integ test (#1532)

## Describe your changes - Update images to ubuntu 22.04. - GPU image may nee to be updated to cuda 12.x. - Fix integ test to unblock pipeline. ## Checklist before requesting a review - [ ] Add unit tests for this change. - [ ] Make sure all tests can pass. - [ ] Update documents if necessary. - [ ] Lint and apply fixes to your code by running `lintrunner -a` - [ ] Is this a user-facing change? If yes, give a description of this change to be included in the release notes. - [ ] Is this PR including examples changes? If yes, please remember to update [example documentation](https://github.com/microsoft/Olive/blob/main/docs/source/examples.md) in a follow-up PR. ## (Optional) Issue link
microsoft · Dec 20, 2024 · 0e328a5 · 0e328a5
1 parent f372b89
commit 0e328a5
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 22 deletions.
diff --git a/docs/source/how-to/configure-workflows/azure-ai/azure-ai.md b/docs/source/how-to/configure-workflows/azure-ai/azure-ai.md
@@ -114,7 +114,7 @@ You can specify your Azure ML Compute as an Olive System and use it as a host to
         "type": "AzureML",
         "aml_compute": "cpu-cluster",
         "aml_docker_config": {
-            "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04",
+            "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04",
             "conda_file_path": "conda.yaml"
         }
     }

diff --git a/docs/source/how-to/configure-workflows/systems.md b/docs/source/how-to/configure-workflows/systems.md
@@ -290,7 +290,7 @@ There are some readymade systems available for AzureML. These systems are pre-co
     ],
     "aml_compute": "gpu-cluster",
     "aml_docker_config": {
-        "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04",
+        "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04",
         "conda_file_path": "conda.yaml"
     }
 }

diff --git a/examples/bert/docker/Dockerfile b/examples/bert/docker/Dockerfile
@@ -5,7 +5,7 @@
 
 # mcr image https://github.com/microsoft/mcr
 # tag list https://mcr.microsoft.com/v2/azureml/openmpi4.1.0-ubuntu20.04/tags/list
-FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04
+FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04
 
 ARG OPENVINO_VERSION=2023.3.0
 

diff --git a/examples/llama2/notebook/llama2/config.json b/examples/llama2/notebook/llama2/config.json
@@ -21,7 +21,7 @@
             "hf_token": true,
             "aml_compute": "<my_aml_compute>",
             "aml_docker_config": {
-                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.6-cudnn8-ubuntu20.04",
+                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.8-cudnn8-ubuntu22.04",
                 "conda_file_path": "conda.yaml"
             }
         },
@@ -30,7 +30,7 @@
             "accelerators": [ { "device": "gpu", "execution_providers": [ "CUDAExecutionProvider" ] } ],
             "aml_compute": "<my_arc_compute>",
             "aml_docker_config": {
-                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.6-cudnn8-ubuntu20.04",
+                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.8-cudnn8-ubuntu22.04",
                 "conda_file_path": "conda.yaml"
             }
         }

diff --git a/examples/llama2/notebook/llama2/notebook.ipynb b/examples/llama2/notebook/llama2/notebook.ipynb
@@ -72,7 +72,7 @@
     "        \"hf_token\": true,\n",
     "        \"aml_compute\": \"<my_aml_compute>\",\n",
     "        \"aml_docker_config\": {\n",
-    "            \"base_image\": \"mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.6-cudnn8-ubuntu20.04\",\n",
+    "            \"base_image\": \"mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.8-cudnn8-ubuntu22.04\",\n",
     "            \"conda_file_path\": \"conda.yaml\"\n",
     "        }\n",
     "    },\n",
@@ -82,7 +82,7 @@
     "        \"hf_token\": true,\n",
     "        \"aml_compute\": \"<my_arc_compute>\",\n",
     "        \"aml_docker_config\": {\n",
-    "            \"base_image\": \"mcr.microsoft.com/azureml/openmpi4.0-cuda11.6-cudnn8-ubuntu20.04\",\n",
+    "            \"base_image\": \"mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.8-cudnn8-ubuntu22.04\",\n",
     "            \"conda_file_path\": \"conda.yaml\"\n",
     "        }\n",
     "    }\n",

diff --git a/examples/open_llama/open_llama_arc.json b/examples/open_llama/open_llama_arc.json
@@ -11,7 +11,7 @@
             "accelerators": [ { "device": "gpu", "execution_providers": [ "CUDAExecutionProvider" ] } ],
             "aml_compute": "gpu-cluster",
             "aml_docker_config": {
-                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.6-cudnn8-ubuntu20.04",
+                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.8-cudnn8-ubuntu22.04",
                 "conda_file_path": "conda.yaml"
             }
         },
@@ -20,7 +20,7 @@
             "accelerators": [ { "device": "gpu", "execution_providers": [ "CUDAExecutionProvider" ] } ],
             "aml_compute": "olive-test",
             "aml_docker_config": {
-                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.6-cudnn8-ubuntu20.04",
+                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.8-cudnn8-ubuntu22.04",
                 "conda_file_path": "conda.yaml"
             }
         }

diff --git a/examples/test/utils.py b/examples/test/utils.py
@@ -143,7 +143,7 @@ def get_cpu_compute(hf_token):
         "accelerators": [{"device": "CPU", "execution_providers": ["CPUExecutionProvider"]}],
         "aml_compute": "cpu-cluster",
         "aml_docker_config": {
-            "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04",
+            "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04",
             "conda_file_path": "conda.yaml",
         },
         "is_dev": True,

diff --git a/olive/systems/docker/Dockerfile b/olive/systems/docker/Dockerfile
@@ -2,7 +2,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 # --------------------------------------------------------------------------
-FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04
+FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04
 
 RUN apt-get -y update && ACCEPT_EULA=Y apt-get -y upgrade
 RUN pip install azure-ai-ml \

diff --git a/olive/systems/docker/Dockerfile.gpu b/olive/systems/docker/Dockerfile.gpu
@@ -1,6 +1,6 @@
 # mcr image https://github.com/microsoft/mcr
 # tag list https://mcr.microsoft.com/v2/azureml/openmpi4.1.0-cuda11.6-cudnn8-ubuntu20.04/tags/list
-FROM mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.6-cudnn8-ubuntu20.04
+FROM mcr.microsoft.com/azureml/openmpi4.1.0-cuda11.8-cudnn8-ubuntu22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/test/integ_test/aml_model_test/conda.yaml b/test/integ_test/aml_model_test/conda.yaml
@@ -2,7 +2,7 @@ name: project_environment
 channels:
   - defaults
 dependencies:
-  - python=3.8.13
+  - python=3.10.16
   - pip=22.3.1
   - pip:
       - azure-ai-ml
@@ -11,6 +11,6 @@ dependencies:
       - onnxruntime
       - datasets
       - scipy
-      - transformers
+      - transformers==4.31.0 # TODO(team): 55036 Fixed error and update to latest version
       - onnxconverter_common
       - git+https://github.com/microsoft/Olive.git
diff --git a/test/integ_test/aml_model_test/test_aml_model.py b/test/integ_test/aml_model_test/test_aml_model.py
@@ -22,7 +22,7 @@ def test_aml_model_pass_run(tmp_path):
     workspace_config = get_olive_workspace_config()
     azureml_client_config = AzureMLClientConfig(**workspace_config)
     docker_config = AzureMLDockerConfig(
-        base_image="mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04",
+        base_image="mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04",
         conda_file_path=conda_file_location,
     )
     aml_system = AzureMLSystem(

diff --git a/test/integ_test/evaluator/azureml_eval/utils.py b/test/integ_test/evaluator/azureml_eval/utils.py
@@ -106,7 +106,7 @@ def get_aml_target():
     conda_file_location = current_path / "conda.yaml"
     azureml_client_config = AzureMLClientConfig(**get_olive_workspace_config())
     docker_config = AzureMLDockerConfig(
-        base_image="mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04",
+        base_image="mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04",
         conda_file_path=conda_file_location,
     )
     return AzureMLSystem(

diff --git a/test/integ_test/evaluator/docker_eval/dockerfile/Dockerfile b/test/integ_test/evaluator/docker_eval/dockerfile/Dockerfile
@@ -2,7 +2,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 # --------------------------------------------------------------------------
-FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04
+FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04
 
 RUN apt-get -y update && ACCEPT_EULA=Y apt-get -y upgrade
 RUN pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu --no-cache-dir

diff --git a/test/unit_test/systems/azureml/test_alias_system.py b/test/unit_test/systems/azureml/test_alias_system.py
@@ -25,7 +25,7 @@ def test_system_alias(accelerators, expected_accelerators):
         "config": {
             "aml_compute": "gpu-cluster",
             "aml_docker_config": {
-                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04",
+                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04",
                 "conda_file_path": "conda.yaml",
             },
         },
@@ -34,7 +34,7 @@ def test_system_alias(accelerators, expected_accelerators):
     system_config = SystemConfig.parse_obj(config)
     assert system_config.type == "AzureML"
     assert system_config.config.aml_compute == "gpu-cluster"
-    assert system_config.config.aml_docker_config.base_image == "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04"
+    assert system_config.config.aml_docker_config.base_image == "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04"
     assert system_config.config.accelerators == expected_accelerators
 
 
@@ -44,7 +44,7 @@ def test_system_alias_no_accelerators():
         "config": {
             "aml_compute": "gpu-cluster",
             "aml_docker_config": {
-                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04",
+                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04",
                 "conda_file_path": "conda.yaml",
             },
         },

diff --git a/test/unit_test/workflows/mock_data/readymade_system.json b/test/unit_test/workflows/mock_data/readymade_system.json
@@ -12,7 +12,7 @@
                 "accelerators": [ { "device": "gpu", "execution_providers": [ "CUDAExecutionProvider" ] } ],
                 "aml_compute": "gpu-cluster",
                 "aml_docker_config": {
-                    "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04",
+                    "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04",
                     "conda_file_path": "conda.yaml"
                 },
                 "is_dev": true

diff --git a/test/unit_test/workflows/mock_data/user_script.json b/test/unit_test/workflows/mock_data/user_script.json
@@ -15,7 +15,7 @@
             "accelerators": [ { "device": "CPU", "execution_providers": [ "CPUExecutionProvider" ] } ],
             "aml_compute": "cpu-cluster",
             "aml_docker_config": {
-                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04",
+                "base_image": "mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04",
                 "conda_file_path": "conda.yaml"
             },
             "is_dev": true