Skip to content

Commit 941d30f

Browse files
authored
CQL Support v1 (#61)
* Second iteration of CQL * Separating Bonsai RLlib tests * Missing file * CQLApexSAC support and dataset improvements * Fix numpy conversion * putting right version * Fix offline data fast data path * Disabling some tune tests
1 parent 67b3aa8 commit 941d30f

34 files changed

+2041
-294
lines changed

ci/azure_pipelines/main.yml

Lines changed: 49 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ stages:
1212
dependsOn: []
1313
jobs:
1414
- job: RayTestsSmallAndLarge
15-
timeoutInMinutes: 240
15+
timeoutInMinutes: 360
1616
cancelTimeoutInMinutes: 5
1717
strategy:
1818
matrix:
@@ -52,7 +52,7 @@ stages:
5252
# Template containing steps to publish artifacts
5353
- template: templates/artifacts.yml
5454
- job: RayTestsMediumAtoJ
55-
timeoutInMinutes: 240
55+
timeoutInMinutes: 360
5656
cancelTimeoutInMinutes: 5
5757
strategy:
5858
matrix:
@@ -92,7 +92,7 @@ stages:
9292
# Template containing steps to publish artifacts
9393
- template: templates/artifacts.yml
9494
- job: RayTestsMediumKtoZ
95-
timeoutInMinutes: 240
95+
timeoutInMinutes: 360
9696
cancelTimeoutInMinutes: 5
9797
strategy:
9898
matrix:
@@ -134,7 +134,7 @@ stages:
134134
- job: RayASANTests
135135
# Disabled
136136
condition: False
137-
timeoutInMinutes: 240
137+
timeoutInMinutes: 360
138138
cancelTimeoutInMinutes: 5
139139
strategy:
140140
matrix:
@@ -169,10 +169,39 @@ stages:
169169
displayName: 'RLlib Build'
170170
dependsOn: []
171171
jobs:
172+
- job: RLlibBonsai
173+
# Disabled
174+
# condition: False
175+
timeoutInMinutes: 360
176+
cancelTimeoutInMinutes: 5
177+
strategy:
178+
matrix:
179+
linux_python36:
180+
# poolName: 'ADORayTests'
181+
imageName: 'ubuntu-16.04'
182+
python.version: '3.6'
183+
bazel.outputRoot: $(Agent.TempDirectory)/_bazel_*
184+
TEST_TMPDIR: $(Agent.TempDirectory)
185+
TRAVIS_OS_NAME: 'linux'
186+
USE_BAZEL_VERSION: '3.4.1'
187+
AGENT_TOOLSDIRECTORY: /opt/hostedtoolcache/
188+
displayName: RLlib Bonsai Tests
189+
pool:
190+
# name: $(poolName)
191+
vmImage: $(imageName)
192+
steps:
193+
# Template containing the installation of requirements
194+
# - template: templates/requirements-over-ubuntu.yml
195+
# Template containing the installation of steps of python
196+
- template: templates/python.yml
197+
# Template containing the rllib-bonsai custom tests
198+
- template: templates/rlib-bonsai-tests.yml
199+
# Template containing steps to publish artifacts
200+
- template: templates/artifacts.yml
172201
- job: RLlibQuickTrainTF2
173202
# Disabled
174203
# condition: False
175-
timeoutInMinutes: 240
204+
timeoutInMinutes: 360
176205
cancelTimeoutInMinutes: 5
177206
strategy:
178207
matrix:
@@ -201,7 +230,7 @@ stages:
201230
- job: RLlibTestsAtoLTF2
202231
# Disabled
203232
# condition: False
204-
timeoutInMinutes: 240
233+
timeoutInMinutes: 360
205234
cancelTimeoutInMinutes: 5
206235
strategy:
207236
matrix:
@@ -230,7 +259,7 @@ stages:
230259
- job: RLlibTestsMtoZTF2
231260
# Disabled
232261
# condition: False
233-
timeoutInMinutes: 240
262+
timeoutInMinutes: 360
234263
cancelTimeoutInMinutes: 5
235264
strategy:
236265
matrix:
@@ -335,7 +364,7 @@ stages:
335364
- job: TuneTests
336365
# Disabled
337366
# condition: False
338-
timeoutInMinutes: 240
367+
timeoutInMinutes: 360
339368
cancelTimeoutInMinutes: 5
340369
strategy:
341370
matrix:
@@ -360,7 +389,7 @@ stages:
360389
- job: SGDTests
361390
# Disabled
362391
# condition: False
363-
timeoutInMinutes: 240
392+
timeoutInMinutes: 360
364393
cancelTimeoutInMinutes: 5
365394
strategy:
366395
matrix:
@@ -385,7 +414,7 @@ stages:
385414
- job: TuneSGDTests
386415
# Disabled
387416
# condition: False
388-
timeoutInMinutes: 240
417+
timeoutInMinutes: 360
389418
cancelTimeoutInMinutes: 5
390419
strategy:
391420
matrix:
@@ -416,7 +445,7 @@ stages:
416445
- job: JavaTests
417446
# Disabled
418447
# condition: False
419-
timeoutInMinutes: 240
448+
timeoutInMinutes: 360
420449
cancelTimeoutInMinutes: 5
421450
strategy:
422451
matrix:
@@ -443,7 +472,7 @@ stages:
443472
- job: StreamingTests
444473
# Disabled
445474
# condition: False
446-
timeoutInMinutes: 240
475+
timeoutInMinutes: 360
447476
cancelTimeoutInMinutes: 5
448477
strategy:
449478
matrix:
@@ -470,7 +499,7 @@ stages:
470499
- job: CPPWorkerTests
471500
# Disabled
472501
# condition: False
473-
timeoutInMinutes: 240
502+
timeoutInMinutes: 360
474503
cancelTimeoutInMinutes: 5
475504
strategy:
476505
matrix:
@@ -499,7 +528,7 @@ stages:
499528
- job: RLlibRegressionTF2
500529
# Disabled
501530
# condition: False
502-
timeoutInMinutes: 240
531+
timeoutInMinutes: 360
503532
cancelTimeoutInMinutes: 5
504533
strategy:
505534
matrix:
@@ -528,7 +557,7 @@ stages:
528557
- job: RLlibRegressionTF1
529558
# Disabled
530559
# condition: False
531-
timeoutInMinutes: 240
560+
timeoutInMinutes: 360
532561
cancelTimeoutInMinutes: 5
533562
strategy:
534563
matrix:
@@ -557,7 +586,7 @@ stages:
557586
- job: RLlibLearningTorch
558587
# Disabled
559588
# condition: False
560-
timeoutInMinutes: 240
589+
timeoutInMinutes: 360
561590
cancelTimeoutInMinutes: 5
562591
strategy:
563592
matrix:
@@ -586,7 +615,7 @@ stages:
586615
- job: RLlibExamplesTF2
587616
# Disabled
588617
# condition: False
589-
timeoutInMinutes: 240
618+
timeoutInMinutes: 360
590619
cancelTimeoutInMinutes: 5
591620
strategy:
592621
matrix:
@@ -619,7 +648,7 @@ stages:
619648
- job: MultiPlatformJars
620649
# Disabled
621650
# condition: False
622-
timeoutInMinutes: 240
651+
timeoutInMinutes: 360
623652
cancelTimeoutInMinutes: 5
624653
strategy:
625654
matrix:
@@ -646,7 +675,7 @@ stages:
646675
- job: TestDocExamples
647676
# Disabled
648677
# condition: False
649-
timeoutInMinutes: 240
678+
timeoutInMinutes: 360
650679
cancelTimeoutInMinutes: 5
651680
strategy:
652681
matrix:
@@ -671,7 +700,7 @@ stages:
671700
- job: Lint
672701
# Disabled
673702
condition: False
674-
timeoutInMinutes: 240
703+
timeoutInMinutes: 360
675704
cancelTimeoutInMinutes: 5
676705
strategy:
677706
matrix:
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# This template includes the steps of the rlib quick train (no learning) test job with TF 2 in travix.yml
2+
3+
steps:
4+
- bash: |
5+
echo Running install phase of the original travis.yml
6+
7+
# Set some variables to make the system looks like Travis
8+
source $BUILD_SOURCESDIRECTORY/ci/azure_pipelines/templates/travis-legacy/pre-install.sh
9+
10+
# Start Original script
11+
12+
# install part
13+
. ./ci/travis/ci.sh init RAY_CI_RLLIB_FULL_AFFECTED
14+
. ./ci/travis/ci.sh build
15+
16+
# script part
17+
bazel test --config=ci --build_tests_only --test_tag_filters=bonsai_tests rllib/...
18+
19+
# End Original script
20+
21+
exit 0
22+
env:
23+
PYTHONWARNINGS: 'ignore'
24+
TRAVIS: 'true'
25+
RLLIB_TESTING: 1
26+
RLLIB_QUICK_TRAIN_AND_MISC_TESTS: 1
27+
RLLIB_REGRESSION_TESTS_TF1X: 1
28+
TF_VERSION: 1.15.0
29+
TFP_VERSION: 0.7
30+
TORCH_VERSION: 1.4
31+
displayName: 'Run Bonsai custom tests in rllib'
32+
timeoutInMinutes: 120

ci/azure_pipelines/templates/rlib-test-m-to-z-tf-2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ steps:
3939
PYTHONWARNINGS: 'ignore'
4040
TRAVIS: 'true'
4141
displayName: 'Run original rlib test job J-to-Z with TF 2'
42-
timeoutInMinutes: 240
42+
timeoutInMinutes: 360

python/ray/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@
9292

9393
# Replaced with the current commit when building the wheels.
9494
__commit__ = "{{RAY_COMMIT_SHA}}"
95-
__version__ = "2.0.0.dev0"
95+
# __version__ = "2.0.0.dev0"
96+
__version__ = "1.2.0"
9697

9798
__all__ = [
9899
"__version__",

python/ray/tune/BUILD

Lines changed: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,14 @@ py_test(
265265
tags = ["exclusive"],
266266
)
267267

268-
py_test(
269-
name = "test_tune_restore",
270-
size = "large",
271-
srcs = ["tests/test_tune_restore.py"],
272-
deps = [":tune_lib"],
273-
tags = ["exclusive"],
274-
)
268+
# TODO(Edi) - Disabling: ADO some times has problems downloading MNIST data from lecum site
269+
# py_test(
270+
# name = "test_tune_restore",
271+
# size = "large",
272+
# srcs = ["tests/test_tune_restore.py"],
273+
# deps = [":tune_lib"],
274+
# tags = ["exclusive"],
275+
# )
275276

276277
py_test(
277278
name = "test_tune_save_restore",
@@ -499,14 +500,15 @@ py_test(
499500
tags = ["exclusive", "example"]
500501
)
501502

502-
py_test(
503-
name = "mlflow_ptl",
504-
size = "medium",
505-
srcs = ["examples/mlflow_ptl.py"],
506-
deps = [":tune_lib"],
507-
tags = ["exclusive", "example", "py37", "pytorch"],
508-
args = ["--smoke-test"]
509-
)
503+
# TODO(Edi) - Disabling: ADO some times has problems downloading MNIST data from lecum site
504+
# py_test(
505+
# name = "mlflow_ptl",
506+
# size = "medium",
507+
# srcs = ["examples/mlflow_ptl.py"],
508+
# deps = [":tune_lib"],
509+
# tags = ["exclusive", "example", "py37", "pytorch"],
510+
# args = ["--smoke-test"]
511+
# )
510512

511513
py_test(
512514
name = "mnist_pytorch",
@@ -580,14 +582,15 @@ py_test(
580582
args = ["--smoke-test"]
581583
)
582584

583-
py_test(
584-
name = "pbt_convnet_example",
585-
size = "small",
586-
srcs = ["examples/pbt_convnet_example.py"],
587-
deps = [":tune_lib"],
588-
tags = ["exclusive", "example"],
589-
args = ["--smoke-test"]
590-
)
585+
# TODO(Edi) - Disabling: ADO some times has problems downloading MNIST data from lecum site
586+
# py_test(
587+
# name = "pbt_convnet_example",
588+
# size = "small",
589+
# srcs = ["examples/pbt_convnet_example.py"],
590+
# deps = [":tune_lib"],
591+
# tags = ["exclusive", "example"],
592+
# args = ["--smoke-test"]
593+
# )
591594

592595
py_test(
593596
name = "pbt_convnet_function_example",
@@ -598,23 +601,25 @@ py_test(
598601
args = ["--smoke-test"]
599602
)
600603

601-
py_test(
602-
name = "pbt_dcgan_mnist_func",
603-
size = "medium",
604-
srcs = ["examples/pbt_dcgan_mnist/pbt_dcgan_mnist_func.py"],
605-
deps = [":tune_lib"],
606-
tags = ["exclusive", "example"],
607-
args = ["--smoke-test"]
608-
)
604+
# TODO(Edi) - Disabling: ADO some times has problems downloading MNIST data from lecum site
605+
# py_test(
606+
# name = "pbt_dcgan_mnist_func",
607+
# size = "medium",
608+
# srcs = ["examples/pbt_dcgan_mnist/pbt_dcgan_mnist_func.py"],
609+
# deps = [":tune_lib"],
610+
# tags = ["exclusive", "example"],
611+
# args = ["--smoke-test"]
612+
# )
609613

610-
py_test(
611-
name = "pbt_dcgan_mnist_trainable",
612-
size = "medium",
613-
srcs = ["examples/pbt_dcgan_mnist/pbt_dcgan_mnist_trainable.py"],
614-
deps = [":tune_lib"],
615-
tags = ["exclusive", "example"],
616-
args = ["--smoke-test"]
617-
)
614+
# TODO(Edi) - Disabling: ADO some times has problems downloading MNIST data from lecum site
615+
# py_test(
616+
# name = "pbt_dcgan_mnist_trainable",
617+
# size = "medium",
618+
# srcs = ["examples/pbt_dcgan_mnist/pbt_dcgan_mnist_trainable.py"],
619+
# deps = [":tune_lib"],
620+
# tags = ["exclusive", "example"],
621+
# args = ["--smoke-test"]
622+
# )
618623

619624
py_test(
620625
name = "pbt_example",

python/ray/util/lightning_accelerators/BUILD

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ py_test(
1616
# Please keep these sorted alphabetically.
1717
# --------------------------------------------------------------------
1818

19-
py_test(
20-
name = "ptl_horovod_ray_example",
21-
size = "medium",
22-
srcs = ["examples/ptl_horovod_ray_example.py"],
23-
tags = ["exclusive", "example", "pytorch-lightning", "pytorch", "horovod"],
24-
deps = [":accelerator_lib"],
25-
args = ["--smoke-test"]
26-
)
19+
# TODO(Edi) - Disabling: ADO some times has problems running horovod
20+
# py_test(
21+
# name = "ptl_horovod_ray_example",
22+
# size = "medium",
23+
# srcs = ["examples/ptl_horovod_ray_example.py"],
24+
# tags = ["exclusive", "example", "pytorch-lightning", "pytorch", "horovod"],
25+
# deps = [":accelerator_lib"],
26+
# args = ["--smoke-test"]
27+
# )
2728

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

0 commit comments

Comments
 (0)