Skip to content

Commit

Permalink
Merge branch 'main' into abhisheku/mmlab_model_selection
Browse files Browse the repository at this point in the history
  • Loading branch information
abhishekMS2024 authored Jan 21, 2025
2 parents 1b683a9 + d70f931 commit a72c14c
Show file tree
Hide file tree
Showing 171 changed files with 871 additions and 345 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/assets-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ env:
docs_dir: docs

permissions:
# Required to clone repo
contents: read
# Required to clone repo and push commits to the wiki repo
contents: write

defaults:
run:
Expand Down Expand Up @@ -54,7 +54,6 @@ jobs:
with:
repository: Azure/azureml-assets.wiki
fetch-depth: 0
token: ${{ secrets.AZUREML_BOT_PAT }}
path: ${{ env.wiki_dir }}

- name: Use Python 3.10 or newer
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/assets-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ env:
asset_config_filename: asset.yaml

permissions:
# Required to clone repo
contents: read
# Required to clone repo and push commit to release branch
contents: write
# Required for OIDC login to Azure
id-token: write

Expand Down Expand Up @@ -71,14 +71,14 @@ jobs:
working-directory: ${{ env.main_dir }}

- name: Upload changed assets
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: steps.find-updated-assets.outputs.updated_count > 0
with:
name: ${{ env.changed_assets_artifact }}
path: ${{ runner.temp }}/${{ env.changed_assets_artifact }}

- name: Upload non-testable assets
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: steps.find-updated-assets.outputs.updated_count > 0
with:
name: ${{ env.releasable_assets_artifact }}
Expand All @@ -102,7 +102,7 @@ jobs:
exit 1
- name: Upload list of assets
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.asset_list_artifact }}
path: ${{ runner.temp }}/${{ env.asset_list_artifact }}
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
steps:
- name: Download releasable assets
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.releasable_assets_artifact }}
path: ${{ runner.temp }}/${{ env.releasable_assets_artifact }}
Expand All @@ -198,13 +198,13 @@ jobs:
- name: Download releasable assets
if: needs.check-release-assets.outputs.has_releasable_assets != ''
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.releasable_assets_artifact }}
path: ${{ runner.temp }}/${{ env.releasable_assets_artifact }}

- name: Download list of assets
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.asset_list_artifact }}
path: ${{ runner.temp }}/${{ env.asset_list_artifact }}
Expand All @@ -220,7 +220,6 @@ jobs:
with:
ref: release
fetch-depth: 0
token: ${{ secrets.AZUREML_BOT_PAT }}
path: ${{ env.release_dir }}

- name: Use Python 3.10 or newer
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/assets-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ jobs:
run: python -u $scripts_test_dir/test_assets.py -i "${{ matrix.asset_config_path }}" -a $asset_config_filename -p $scripts_test_dir/requirements.txt -r $GITHUB_WORKSPACE/$pytest_reports

- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.pytest_reports }}
Expand All @@ -179,7 +179,7 @@ jobs:
steps:
- name: Download test results
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.pytest_reports }}
path: ${{ env.pytest_reports }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/batch-score-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
RESOURCE_GROUP: ${{ env.resource_group }}
WORKSPACE_NAME: ${{ env.workspace }}
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.pytest_report_folder }}
Expand All @@ -91,7 +91,7 @@ jobs:
steps:
- name: Download test results
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.pytest_report_folder }}
path: ${{ env.pytest_report_folder }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/batch-score-oss-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
RESOURCE_GROUP: ${{ env.resource_group }}
WORKSPACE_NAME: ${{ env.workspace }}
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.pytest_report_folder }}
Expand All @@ -91,7 +91,7 @@ jobs:
steps:
- name: Download test results
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.pytest_report_folder }}
path: ${{ env.pytest_report_folder }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/environments-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
run: python -u $scripts_environment_dir/validate_build_logs.py -l '${{ runner.temp }}'/$build_logs_artifact_name

- name: Upload build logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.build_logs_artifact_name }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/model-monitoring-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
RESOURCE_GROUP: ${{ env.resource_group }}
WORKSPACE_NAME: ${{ env.workspace }}
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.pytest_report_folder }}
Expand All @@ -152,7 +152,7 @@ jobs:
steps:
- name: Download test results
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.pytest_report_folder }}
path: ${{ env.pytest_report_folder }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/model-monitoring-gsq-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
RESOURCE_GROUP: ${{ env.resource_group }}
WORKSPACE_NAME: ${{ env.workspace }}
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ env.pytest_report_folder }}
Expand All @@ -107,7 +107,7 @@ jobs:
steps:
- name: Download test results
id: download-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.pytest_report_folder }}
path: ${{ env.pytest_report_folder }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi5.0-ubuntu24.04:{{latest-image-tag}}

RUN apt-get update && apt-get -y upgrade

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}

WORKDIR /

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ dependencies:
- pytorch=2.3.1
- torchvision=0.18.1
- pip:
- azureml-designer-cv-modules==0.0.64
- azureml-designer-cv-modules==0.0.66
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ os_type: linux

tags:
Python: 3.8.10
OS: Ubuntu20.04
OS: Ubuntu22.04
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}

WORKDIR /

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ dependencies:
- numpy==1.23.5
- scipy==1.10.0
- pip:
- azureml-designer-cv-modules==0.0.64
- azureml-designer-cv-modules==0.0.66
2 changes: 1 addition & 1 deletion assets/designer/environments/designer-cv/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ os_type: linux

tags:
Python: 3.8.10
OS: Ubuntu20.04
OS: Ubuntu22.04
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}

WORKDIR /

Expand Down
2 changes: 1 addition & 1 deletion assets/designer/environments/designer-io/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ os_type: linux

tags:
Python: 3.8.10
OS: Ubuntu20.04
OS: Ubuntu22.04
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}

WORKDIR /

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ os_type: linux

tags:
Python: 3.8.10
OS: Ubuntu20.04
OS: Ubuntu22.04
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}

WORKDIR /

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ os_type: linux

tags:
Python: 3.8.10
OS: Ubuntu20.04
OS: Ubuntu22.04
8 changes: 6 additions & 2 deletions assets/designer/environments/designer-r/context/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}

WORKDIR /

Expand All @@ -9,11 +9,15 @@ ENV PATH=$CONDA_PREFIX/bin:$PATH
# This is needed for mpi to locate libpython
ENV LD_LIBRARY_PATH=$CONDA_PREFIX/lib:$LD_LIBRARY_PATH

USER root

# Create conda environment
COPY conda_dependencies.yaml .
RUN conda env create -p $CONDA_PREFIX -f conda_dependencies.yaml -q && \
rm conda_dependencies.yaml && \
conda run -p $CONDA_PREFIX pip cache purge && \
conda clean -a -y
conda clean -a -y

RUN conda run -p $CONDA_PREFIX conda remove -p $CONDA_PREFIX --yes r-bslib
RUN rm -rf /opt/miniconda/pkgs/

Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,35 @@ channels:
dependencies:
- pip=23.3
- python=3.9.18
- r-base=4.4.0
- r-caret=6.0
- r-catools=1.17.1
- r-cluster=2.1.0
- r-dplyr=0.8.5
- r-catools=1.18.3
- r-cluster=2.1.8
- r-dplyr=1.1.4
- r-e1071=1.7
- r-forcats=0.5.0
- r-forecast=8.12
- r-glmnet=2.0
- r-igraph=1.2.4
- r-matrix=1.2
- r-mclust=5.4.6
- r-mgcv=1.8
- r-forcats=1.0.0
- r-forecast=8.23.0
- r-glmnet=4.1
- r-igraph=2.0.3
- r-matrix=1.6
- r-mclust=6.1.1
- r-mgcv=1.9
- r-nlme=3.1
- r-nnet=7.3
- r-plyr=1.8.6
- r-randomforest=4.6
- r-reticulate=1.12
- r-plyr=1.8.9
- r-randomforest=4.7
- r-reticulate=1.40
- r-rocr=1.0
- r-rodbc=1.3
- r-rpart=4.1
- r-stringr=1.4.0
- r-tidyverse=1.2.1
- r-timedate=3043.102
- r-stringr=1.5.1
- r-tidyverse=2.0.0
- r-timedate=4041.110
- r-tseries=0.10
- r=3.5.1
- libxcrypt=4.4
- setuptools=70
- cython=0.29.24
- numpy==1.23.5
- scipy==1.10.0
- pip:
- azureml-designer-classic-modules==0.0.189
- azureml-designer-classic-modules==0.0.191
2 changes: 1 addition & 1 deletion assets/designer/environments/designer-r/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ os_type: linux

tags:
Python: 3.8.10
OS: Ubuntu20.04
OS: Ubuntu22.04
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}

WORKDIR /

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ os_type: linux

tags:
Python: 3.8.10
OS: Ubuntu20.04
OS: Ubuntu22.04
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}

WORKDIR /

Expand Down
2 changes: 1 addition & 1 deletion assets/designer/environments/designer-transform/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ os_type: linux

tags:
Python: 3.8.10
OS: Ubuntu20.04
OS: Ubuntu22.04
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:{{latest-image-tag}}
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}

WORKDIR /

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ os_type: linux

tags:
Python: 3.8.10
OS: Ubuntu20.04
OS: Ubuntu22.04
3 changes: 1 addition & 2 deletions assets/designer/environments/designer/context/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu20.04:{{latest-image-tag}}

FROM mcr.microsoft.com/azureml/openmpi4.1.0-ubuntu22.04:{{latest-image-tag}}
WORKDIR /

ENV CONDA_PREFIX=/azureml-envs/designer
Expand Down
Loading

0 comments on commit a72c14c

Please sign in to comment.