From b44b6a6f56c3745ae1000af69ef96428dade9646 Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Mon, 11 Mar 2024 17:25:08 -0600 Subject: [PATCH 1/4] testing arm python brew overwite --- build/ci/job-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index f185606033..c73df59978 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -71,7 +71,7 @@ jobs: displayName: Install MacOS build dependencies # Extra Apple MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: - - script: brew update && brew install libomp && brew link libomp --force + - script: brew update && brew install libomp && brew link libomp --force --overwrite python@3.12 displayName: Install MacOS ARM build dependencies - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}: - bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH" From aecd79f95b857e951960b1eafe7add86a8d83ac1 Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Mon, 11 Mar 2024 18:02:46 -0600 Subject: [PATCH 2/4] more m1 testing --- .vsts-dotnet-ci.yml | 2 +- build/ci/job-template.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index 9ad25d0b1a..a5478913e9 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -127,7 +127,7 @@ jobs: innerLoop: true pool: vmImage: macOS-12 - helixQueue: OSX.1100.Arm64.Open + helixQueue: OSX.1200.Arm64.Open - template: /build/ci/job-template.yml parameters: diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index c73df59978..004e6b109f 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -71,7 +71,7 @@ jobs: displayName: Install MacOS build dependencies # Extra Apple MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: - - script: brew update && brew install libomp && brew link libomp --force --overwrite python@3.12 + - script: rm '/usr/local/bin/2to3' && brew update && brew install libomp && brew link libomp --force displayName: Install MacOS ARM build dependencies - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}: - bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH" From 5e4dfb6f2ab838e3422bcace9bdced64e7ac57e0 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 11 Mar 2024 19:46:38 -0700 Subject: [PATCH 3/4] Install python@3.12 before libomp --- build/ci/job-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 004e6b109f..b8625090ff 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -71,7 +71,7 @@ jobs: displayName: Install MacOS build dependencies # Extra Apple MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: - - script: rm '/usr/local/bin/2to3' && brew update && brew install libomp && brew link libomp --force + - script: brew update && brew install -f --overwrite python@3.12 && brew install libomp && brew link libomp --force displayName: Install MacOS ARM build dependencies - ${{ if and( eq(parameters.nightlyBuild, 'true'), eq(parameters.pool.vmImage, 'ubuntu-18.04')) }}: - bash: echo "##vso[task.setvariable variable=LD_LIBRARY_PATH]$(nightlyBuildRunPath):$LD_LIBRARY_PATH" From fa9b041d2d35fbdfc1276530828550f573732297 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 11 Mar 2024 20:07:51 -0700 Subject: [PATCH 4/4] Update official build libomp install command --- build/vsts-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 802acba24d..7a803b5a91 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -153,7 +153,7 @@ extends: rm -rf /usr/local/bin/2to3 displayName: MacOS Homebrew bug Workaround continueOnError: true - - script: brew update && brew install libomp && brew link libomp --force + - script: brew update && brew install -f --overwrite python@3.12 && brew install libomp && brew link libomp --force displayName: Install build dependencies # Only build native assets to avoid conflicts. - script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=arm64 /p:CopyPackageAssets=true @@ -319,4 +319,4 @@ extends: -TsaIterationPath DevDiv -TsaRepositoryName machinelearning -TsaCodebaseName machinelearning - -TsaPublish $True' \ No newline at end of file + -TsaPublish $True'