Skip to content

setup java ci mac #2570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Dec 6, 2019
Merged

setup java ci mac #2570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d738c89
some fixes on nuget CPU pipeline
shahasad Oct 19, 2019
56e6fa4
revert d738c89536a06b09a61532bb887f2bcc2182dafb
shahasad Oct 20, 2019
1356f5f
Merge branch 'master' of https://github.com/Microsoft/onnxruntime
shahasad Oct 20, 2019
698a294
Merge branch 'master' of https://github.com/Microsoft/onnxruntime
shahasad Oct 21, 2019
2189a00
Merge branch 'master' of https://github.com/Microsoft/onnxruntime
shahasad Oct 23, 2019
8222814
Merge branch 'master' of https://github.com/Microsoft/onnxruntime
shahasad Oct 25, 2019
b9a8cb1
Merge branch 'master' of https://github.com/Microsoft/onnxruntime
shahasad Nov 27, 2019
7bec526
Merge branch 'master' of https://github.com/Microsoft/onnxruntime
shahasad Dec 3, 2019
6c6895d
Merge branch 'master' of https://github.com/Microsoft/onnxruntime
shahasad Dec 4, 2019
87eecbf
Merge branch 'master' of https://github.com/Microsoft/onnxruntime
shahasad Dec 5, 2019
ac78417
Merge branch 'master' of https://github.com/Microsoft/onnxruntime
shahasad Dec 6, 2019
f28983e
added java related logs to mac ci
shahasad Dec 6, 2019
e2c3287
added java home and build_java to mac ci
shahasad Dec 6, 2019
72b7653
add version in the java log
shahasad Dec 6, 2019
35cbd67
remove the additional linux java build queue
shahasad Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tools/ci_build/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ def parse_arguments():
# C-Sharp bindings
parser.add_argument("--build_csharp", action='store_true', help="Build C#.Net DLL and NuGet package")

# Java bindings
parser.add_argument("--build_java", action='store_true', help="Build Java bindings.")

# Build a shared lib
parser.add_argument("--build_shared_lib", action='store_true', help="Build a shared library for the ONNXRuntime.")
Expand Down
9 changes: 0 additions & 9 deletions tools/ci_build/github/azure-pipelines/linux-ci-pipeline-with-java.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/linux-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
parameters:
AgentPool : 'Linux-CPU'
JobName: 'Linux_CI_Dev'
BuildCommand: 'tools/ci_build/github/linux/run_dockerbuild.sh -o ubuntu16.04 -d cpu -r $(Build.BinariesDirectory) -x "--use_mklml --use_llvm --use_nuphar --use_dnnl --use_tvm --use_automl --build_wheel --enable_language_interop_ops"'
BuildCommand: 'tools/ci_build/github/linux/run_dockerbuild.sh -o ubuntu16.04 -d cpu -r $(Build.BinariesDirectory) -x "--use_mklml --use_llvm --use_nuphar --use_dnnl --use_tvm --use_automl --build_wheel --build_java --enable_language_interop_ops"'
DoNugetPack: 'false'
ArtifactName: 'drop-linux'
TimeoutInMinutes: 120
2 changes: 1 addition & 1 deletion tools/ci_build/github/azure-pipelines/mac-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ jobs:
parameters:
AgentPool : 'Hosted macOS High Sierra'
DoNugetPack: 'false'
BuildCommand: 'python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --build_wheel --skip_submodule_sync --use_automl --parallel --build_shared_lib --enable_language_interop_ops --enable_onnx_tests --config Debug RelWithDebInfo'
BuildCommand: 'python3 $(Build.SourcesDirectory)/tools/ci_build/build.py --use_openmp --build_dir $(Build.BinariesDirectory) --build_wheel --skip_submodule_sync --use_automl --parallel --build_shared_lib --build_java --enable_language_interop_ops --enable_onnx_tests --config Debug RelWithDebInfo'
Copy link
Contributor Author

@shahasad shahasad Dec 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on latest Java API PR
https://dev.azure.com/onnxruntime/onnxruntime/_build/results?buildId=102016

4 changes: 4 additions & 0 deletions tools/ci_build/github/azure-pipelines/templates/mac-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ jobs:
steps:
- template: mac-set-variables-and-download.yml
- script: |
export JAVA_HOME=/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home
java --version
javac --version

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
${{ parameters.BuildCommand }}
Expand Down