Revert "work around of the build break in mac (#6069)" (#6150)

This reverts commit 3cae28699b.
This commit is contained in:
Changming Sun 2020-12-16 14:41:18 -08:00 committed by GitHub
parent 7250562271
commit 344a2a8ee5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 8 deletions

View file

@ -90,8 +90,6 @@ jobs:
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
# The following line is a hack to prevent build pipeline from failing
brew uninstall openssl@1.0.2t
brew install libomp
python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --build_shared_lib --config Release
displayName: 'Build and Test MacOS'

View file

@ -35,8 +35,6 @@ jobs:
packageFolder: '$(Build.BinariesDirectory)/nuget-artifact'
- script: |
# The following line is a hack to prevent build pipeline from failing
brew uninstall openssl@1.0.2t
brew install libomp
$(Build.SourcesDirectory)/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/runtest.sh \
$(Build.BinariesDirectory)/nuget-artifact \

View file

@ -39,8 +39,6 @@ jobs:
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
# The following line is a hack to prevent build pipeline from failing
brew uninstall openssl@1.0.2t
brew install libomp
${{ parameters.BuildCommand }}
displayName: 'Build and Test OnnxRuntime lib for MacOS'

View file

@ -769,8 +769,6 @@ stages:
export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=OFF -DONNX_WERROR=OFF"
sudo python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
sudo xcode-select --switch /Applications/Xcode_10.app/Contents/Developer
# The following line is a hack to prevent build pipeline from failing
brew uninstall openssl@1.0.2t
brew install libomp
python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --config Release --skip_onnx_tests --build_wheel ${{ parameters.build_py_parameters }}
displayName: 'Command Line Script'