From 1dd7304c4cdd17464153c4e35fd447530b1cb1e7 Mon Sep 17 00:00:00 2001 From: Zeeshan Siddiqui Date: Tue, 14 May 2019 16:07:49 -0700 Subject: [PATCH 1/4] Brew install libomp 7.0.0 only. --- build/ci/phase-template.yml | 2 +- build/vsts-ci.yml | 2 +- docs/building/unix-instructions.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index f018d9613c..fc2c11869a 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -34,7 +34,7 @@ phases: ${{ insert }}: ${{ parameters.queue }} steps: - ${{ if eq(parameters.queue.name, 'Hosted macOS') }}: - - script: brew update && brew install libomp && brew install mono-libgdiplus gettext && brew link gettext --force && brew link libomp --force + - script: brew update && brew install libomp@7.0.0 && brew install mono-libgdiplus gettext && brew link gettext --force && brew link libomp@7.0.0 --force displayName: Install build dependencies - script: $(_buildScript) -$(_configuration) -buildArch=$(_arch) displayName: Build diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 05bfda32b0..f5dd728128 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -48,7 +48,7 @@ phases: demands: - agent.os -equals Darwin steps: - - script: brew update && brew install libomp && brew link libomp --force + - script: brew update && brew install libomp@7.0.0 && brew link libomp@7.0.0 --force displayName: Install build dependencies # Only build native assets to avoid conflicts. - script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets diff --git a/docs/building/unix-instructions.md b/docs/building/unix-instructions.md index ec7e27e8d4..7ee297f71d 100644 --- a/docs/building/unix-instructions.md +++ b/docs/building/unix-instructions.md @@ -43,12 +43,12 @@ macOS 10.12 (Sierra) or higher is needed to build dotnet/machinelearning. On macOS a few components are needed which are not provided by a default developer setup: * cmake 3.10.3 -* libomp +* libomp 7.0.0 * libgdiplus * gettext * All the requirements necessary to run .NET Core 2.0 applications. To view macOS prerequisites click [here](https://docs.microsoft.com/en-us/dotnet/core/macos-prerequisites?tabs=netcore2x). One way of obtaining CMake and other required libraries is via [Homebrew](https://brew.sh): ```sh -$ brew install cmake libomp mono-libgdiplus gettext && brew link gettext --force +$ brew install cmake libomp@7.0.0 mono-libgdiplus gettext && brew link gettext --force ``` From 31dcb5801eb414753da1dbe871bb9329150538e1 Mon Sep 17 00:00:00 2001 From: Zeeshan Siddiqui Date: Tue, 14 May 2019 16:11:52 -0700 Subject: [PATCH 2/4] Brew install libomp 7.0.0 only. --- build/ci/phase-template.yml | 2 +- build/vsts-ci.yml | 2 +- docs/building/unix-instructions.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index fc2c11869a..603a791bf4 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -34,7 +34,7 @@ phases: ${{ insert }}: ${{ parameters.queue }} steps: - ${{ if eq(parameters.queue.name, 'Hosted macOS') }}: - - script: brew update && brew install libomp@7.0.0 && brew install mono-libgdiplus gettext && brew link gettext --force && brew link libomp@7.0.0 --force + - script: brew update && brew install libomp@7 && brew install mono-libgdiplus gettext && brew link gettext --force && brew link libomp@7 --force displayName: Install build dependencies - script: $(_buildScript) -$(_configuration) -buildArch=$(_arch) displayName: Build diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index f5dd728128..3b13abc842 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -48,7 +48,7 @@ phases: demands: - agent.os -equals Darwin steps: - - script: brew update && brew install libomp@7.0.0 && brew link libomp@7.0.0 --force + - script: brew update && brew install libomp@7 && brew link libomp@7 --force displayName: Install build dependencies # Only build native assets to avoid conflicts. - script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets diff --git a/docs/building/unix-instructions.md b/docs/building/unix-instructions.md index 7ee297f71d..cde08f08c8 100644 --- a/docs/building/unix-instructions.md +++ b/docs/building/unix-instructions.md @@ -43,12 +43,12 @@ macOS 10.12 (Sierra) or higher is needed to build dotnet/machinelearning. On macOS a few components are needed which are not provided by a default developer setup: * cmake 3.10.3 -* libomp 7.0.0 +* libomp 7 * libgdiplus * gettext * All the requirements necessary to run .NET Core 2.0 applications. To view macOS prerequisites click [here](https://docs.microsoft.com/en-us/dotnet/core/macos-prerequisites?tabs=netcore2x). One way of obtaining CMake and other required libraries is via [Homebrew](https://brew.sh): ```sh -$ brew install cmake libomp@7.0.0 mono-libgdiplus gettext && brew link gettext --force +$ brew install cmake libomp@7 mono-libgdiplus gettext && brew link gettext --force ``` From 2d39c406d123cdcc119550a32198bb32cf5b8daa Mon Sep 17 00:00:00 2001 From: Zeeshan Siddiqui Date: Tue, 14 May 2019 16:37:02 -0700 Subject: [PATCH 3/4] Brew install libomp 7.0.0 only. --- build/ci/phase-template.yml | 2 +- build/vsts-ci.yml | 2 +- docs/building/unix-instructions.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index 603a791bf4..f01c393f60 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -34,7 +34,7 @@ phases: ${{ insert }}: ${{ parameters.queue }} steps: - ${{ if eq(parameters.queue.name, 'Hosted macOS') }}: - - script: brew update && brew install libomp@7 && brew install mono-libgdiplus gettext && brew link gettext --force && brew link libomp@7 --force + - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f2a764ef944b1080be64bd88dca9a1d80130c558/Formula/python.rb && brew install mono-libgdiplus gettext && brew link gettext --force && brew link libomp --force displayName: Install build dependencies - script: $(_buildScript) -$(_configuration) -buildArch=$(_arch) displayName: Build diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 3b13abc842..c8091ea281 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -48,7 +48,7 @@ phases: demands: - agent.os -equals Darwin steps: - - script: brew update && brew install libomp@7 && brew link libomp@7 --force + - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f5b1ac99a7fba27c19cee0bc4f036775c889b359/Formula/libomp.rb && brew link libomp --force displayName: Install build dependencies # Only build native assets to avoid conflicts. - script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets diff --git a/docs/building/unix-instructions.md b/docs/building/unix-instructions.md index cde08f08c8..f495b2c1bf 100644 --- a/docs/building/unix-instructions.md +++ b/docs/building/unix-instructions.md @@ -50,5 +50,5 @@ On macOS a few components are needed which are not provided by a default develop One way of obtaining CMake and other required libraries is via [Homebrew](https://brew.sh): ```sh -$ brew install cmake libomp@7 mono-libgdiplus gettext && brew link gettext --force +$ brew install cmake https://raw.githubusercontent.com/Homebrew/homebrew-core/f5b1ac99a7fba27c19cee0bc4f036775c889b359/Formula/libomp.rb mono-libgdiplus gettext && brew link gettext --force ``` From e5a6e53e9446004c47c76387ca367d0dba0d8d38 Mon Sep 17 00:00:00 2001 From: Zeeshan Siddiqui Date: Tue, 14 May 2019 16:39:51 -0700 Subject: [PATCH 4/4] Brew install libomp 7.0.0 only. --- build/ci/phase-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml index f01c393f60..6d70c14bda 100644 --- a/build/ci/phase-template.yml +++ b/build/ci/phase-template.yml @@ -34,7 +34,7 @@ phases: ${{ insert }}: ${{ parameters.queue }} steps: - ${{ if eq(parameters.queue.name, 'Hosted macOS') }}: - - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f2a764ef944b1080be64bd88dca9a1d80130c558/Formula/python.rb && brew install mono-libgdiplus gettext && brew link gettext --force && brew link libomp --force + - script: brew update && brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f5b1ac99a7fba27c19cee0bc4f036775c889b359/Formula/libomp.rb && brew install mono-libgdiplus gettext && brew link gettext --force && brew link libomp --force displayName: Install build dependencies - script: $(_buildScript) -$(_configuration) -buildArch=$(_arch) displayName: Build