Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
69 changes: 49 additions & 20 deletions ci/azure_pipelines/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ stages:
dependsOn: []
jobs:
- job: RayTestsSmallAndLarge
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -52,7 +52,7 @@ stages:
# Template containing steps to publish artifacts
- template: templates/artifacts.yml
- job: RayTestsMediumAtoJ
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -92,7 +92,7 @@ stages:
# Template containing steps to publish artifacts
- template: templates/artifacts.yml
- job: RayTestsMediumKtoZ
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -134,7 +134,7 @@ stages:
- job: RayASANTests
# Disabled
condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -169,10 +169,39 @@ stages:
displayName: 'RLlib Build'
dependsOn: []
jobs:
- job: RLlibBonsai
# Disabled
# condition: False
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
linux_python36:
# poolName: 'ADORayTests'
imageName: 'ubuntu-16.04'
python.version: '3.6'
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
TEST_TMPDIR: $(Agent.TempDirectory)
TRAVIS_OS_NAME: 'linux'
USE_BAZEL_VERSION: '3.4.1'
AGENT_TOOLSDIRECTORY: /opt/hostedtoolcache/
displayName: RLlib Bonsai Tests
pool:
# name: $(poolName)
vmImage: $(imageName)
steps:
# Template containing the installation of requirements
# - template: templates/requirements-over-ubuntu.yml
# Template containing the installation of steps of python
- template: templates/python.yml
# Template containing the rllib-bonsai custom tests
- template: templates/rlib-bonsai-tests.yml
# Template containing steps to publish artifacts
- template: templates/artifacts.yml
- job: RLlibQuickTrainTF2
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -201,7 +230,7 @@ stages:
- job: RLlibTestsAtoLTF2
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -230,7 +259,7 @@ stages:
- job: RLlibTestsMtoZTF2
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -335,7 +364,7 @@ stages:
- job: TuneTests
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand All @@ -360,7 +389,7 @@ stages:
- job: SGDTests
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand All @@ -385,7 +414,7 @@ stages:
- job: TuneSGDTests
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -416,7 +445,7 @@ stages:
- job: JavaTests
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand All @@ -443,7 +472,7 @@ stages:
- job: StreamingTests
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand All @@ -470,7 +499,7 @@ stages:
- job: CPPWorkerTests
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -499,7 +528,7 @@ stages:
- job: RLlibRegressionTF2
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -528,7 +557,7 @@ stages:
- job: RLlibRegressionTF1
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -557,7 +586,7 @@ stages:
- job: RLlibLearningTorch
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -586,7 +615,7 @@ stages:
- job: RLlibExamplesTF2
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down Expand Up @@ -619,7 +648,7 @@ stages:
- job: MultiPlatformJars
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand All @@ -646,7 +675,7 @@ stages:
- job: TestDocExamples
# Disabled
# condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand All @@ -671,7 +700,7 @@ stages:
- job: Lint
# Disabled
condition: False
timeoutInMinutes: 240
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
strategy:
matrix:
Expand Down
32 changes: 32 additions & 0 deletions ci/azure_pipelines/templates/rlib-bonsai-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This template includes the steps of the rlib quick train (no learning) test job with TF 2 in travix.yml

steps:
- bash: |
echo Running install phase of the original travis.yml

# Set some variables to make the system looks like Travis
source $BUILD_SOURCESDIRECTORY/ci/azure_pipelines/templates/travis-legacy/pre-install.sh

# Start Original script

# install part
. ./ci/travis/ci.sh init RAY_CI_RLLIB_FULL_AFFECTED
. ./ci/travis/ci.sh build

# script part
bazel test --config=ci --build_tests_only --test_tag_filters=bonsai_tests rllib/...

# End Original script

exit 0
env:
PYTHONWARNINGS: 'ignore'
TRAVIS: 'true'
RLLIB_TESTING: 1
RLLIB_QUICK_TRAIN_AND_MISC_TESTS: 1
RLLIB_REGRESSION_TESTS_TF1X: 1
TF_VERSION: 1.15.0
TFP_VERSION: 0.7
TORCH_VERSION: 1.4
displayName: 'Run Bonsai custom tests in rllib'
timeoutInMinutes: 120
2 changes: 1 addition & 1 deletion ci/azure_pipelines/templates/rlib-test-m-to-z-tf-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ steps:
PYTHONWARNINGS: 'ignore'
TRAVIS: 'true'
displayName: 'Run original rlib test job J-to-Z with TF 2'
timeoutInMinutes: 240
timeoutInMinutes: 360
3 changes: 2 additions & 1 deletion python/ray/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@

# Replaced with the current commit when building the wheels.
__commit__ = "{{RAY_COMMIT_SHA}}"
__version__ = "2.0.0.dev0"
# __version__ = "2.0.0.dev0"
__version__ = "1.2.0"

__all__ = [
"__version__",
Expand Down
83 changes: 44 additions & 39 deletions python/ray/tune/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,14 @@ py_test(
tags = ["exclusive"],
)

py_test(
name = "test_tune_restore",
size = "large",
srcs = ["tests/test_tune_restore.py"],
deps = [":tune_lib"],
tags = ["exclusive"],
)
# TODO(Edi) - Disabling: ADO some times has problems downloading MNIST data from lecum site
# py_test(
# name = "test_tune_restore",
# size = "large",
# srcs = ["tests/test_tune_restore.py"],
# deps = [":tune_lib"],
# tags = ["exclusive"],
# )

py_test(
name = "test_tune_save_restore",
Expand Down Expand Up @@ -499,14 +500,15 @@ py_test(
tags = ["exclusive", "example"]
)

py_test(
name = "mlflow_ptl",
size = "medium",
srcs = ["examples/mlflow_ptl.py"],
deps = [":tune_lib"],
tags = ["exclusive", "example", "py37", "pytorch"],
args = ["--smoke-test"]
)
# TODO(Edi) - Disabling: ADO some times has problems downloading MNIST data from lecum site
# py_test(
# name = "mlflow_ptl",
# size = "medium",
# srcs = ["examples/mlflow_ptl.py"],
# deps = [":tune_lib"],
# tags = ["exclusive", "example", "py37", "pytorch"],
# args = ["--smoke-test"]
# )

py_test(
name = "mnist_pytorch",
Expand Down Expand Up @@ -580,14 +582,15 @@ py_test(
args = ["--smoke-test"]
)

py_test(
name = "pbt_convnet_example",
size = "small",
srcs = ["examples/pbt_convnet_example.py"],
deps = [":tune_lib"],
tags = ["exclusive", "example"],
args = ["--smoke-test"]
)
# TODO(Edi) - Disabling: ADO some times has problems downloading MNIST data from lecum site
# py_test(
# name = "pbt_convnet_example",
# size = "small",
# srcs = ["examples/pbt_convnet_example.py"],
# deps = [":tune_lib"],
# tags = ["exclusive", "example"],
# args = ["--smoke-test"]
# )

py_test(
name = "pbt_convnet_function_example",
Expand All @@ -598,23 +601,25 @@ py_test(
args = ["--smoke-test"]
)

py_test(
name = "pbt_dcgan_mnist_func",
size = "medium",
srcs = ["examples/pbt_dcgan_mnist/pbt_dcgan_mnist_func.py"],
deps = [":tune_lib"],
tags = ["exclusive", "example"],
args = ["--smoke-test"]
)
# TODO(Edi) - Disabling: ADO some times has problems downloading MNIST data from lecum site
# py_test(
# name = "pbt_dcgan_mnist_func",
# size = "medium",
# srcs = ["examples/pbt_dcgan_mnist/pbt_dcgan_mnist_func.py"],
# deps = [":tune_lib"],
# tags = ["exclusive", "example"],
# args = ["--smoke-test"]
# )

py_test(
name = "pbt_dcgan_mnist_trainable",
size = "medium",
srcs = ["examples/pbt_dcgan_mnist/pbt_dcgan_mnist_trainable.py"],
deps = [":tune_lib"],
tags = ["exclusive", "example"],
args = ["--smoke-test"]
)
# TODO(Edi) - Disabling: ADO some times has problems downloading MNIST data from lecum site
# py_test(
# name = "pbt_dcgan_mnist_trainable",
# size = "medium",
# srcs = ["examples/pbt_dcgan_mnist/pbt_dcgan_mnist_trainable.py"],
# deps = [":tune_lib"],
# tags = ["exclusive", "example"],
# args = ["--smoke-test"]
# )

py_test(
name = "pbt_example",
Expand Down
17 changes: 9 additions & 8 deletions python/ray/util/lightning_accelerators/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ py_test(
# Please keep these sorted alphabetically.
# --------------------------------------------------------------------

py_test(
name = "ptl_horovod_ray_example",
size = "medium",
srcs = ["examples/ptl_horovod_ray_example.py"],
tags = ["exclusive", "example", "pytorch-lightning", "pytorch", "horovod"],
deps = [":accelerator_lib"],
args = ["--smoke-test"]
)
# TODO(Edi) - Disabling: ADO some times has problems running horovod
# py_test(
# name = "ptl_horovod_ray_example",
# size = "medium",
# srcs = ["examples/ptl_horovod_ray_example.py"],
# tags = ["exclusive", "example", "pytorch-lightning", "pytorch", "horovod"],
# deps = [":accelerator_lib"],
# args = ["--smoke-test"]
# )

# # This is a dummy test dependency that causes the above tests to be
# # re-run if any of these files changes.
Expand Down
Loading