Skip to content

Commit 9475047

Browse files
committed
fix: e2e tests per PR
1 parent 0fa4290 commit 9475047

File tree

4 files changed

+64
-10
lines changed

4 files changed

+64
-10
lines changed

tests/e2e/heterogeneous_clusters_kind_test.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,18 @@ def run_heterogeneous_clusters(
4040
else f"rayproject/ray:{constants.RAY_VERSION}"
4141
)
4242

43+
# GPU images need more memory due to CUDA libraries
44+
if number_of_gpus > 0:
45+
head_memory_requests = 4
46+
head_memory_limits = 6
47+
worker_memory_requests = 4
48+
worker_memory_limits = 8
49+
else:
50+
head_memory_requests = 2
51+
head_memory_limits = 2
52+
worker_memory_requests = 1
53+
worker_memory_limits = 4
54+
4355
for flavor in self.resource_flavors:
4456
node_labels = (
4557
get_flavor_spec(self, flavor).get("spec", {}).get("nodeLabels", {})
@@ -58,12 +70,12 @@ def run_heterogeneous_clusters(
5870
num_workers=1,
5971
head_cpu_requests="500m",
6072
head_cpu_limits="500m",
61-
head_memory_requests=2,
62-
head_memory_limits=2,
73+
head_memory_requests=head_memory_requests,
74+
head_memory_limits=head_memory_limits,
6375
worker_cpu_requests="500m",
6476
worker_cpu_limits=1,
65-
worker_memory_requests=1,
66-
worker_memory_limits=4,
77+
worker_memory_requests=worker_memory_requests,
78+
worker_memory_limits=worker_memory_limits,
6779
worker_extended_resource_requests={
6880
gpu_resource_name: number_of_gpus
6981
},

tests/e2e/local_interactive_sdk_kind_test.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,31 @@ def run_local_interactives(
5858
else f"rayproject/ray:{constants.RAY_VERSION}"
5959
)
6060

61+
# GPU images need more memory due to CUDA libraries
62+
if number_of_gpus > 0:
63+
head_memory_requests = 4
64+
head_memory_limits = 6
65+
worker_memory_requests = 4
66+
worker_memory_limits = 8
67+
else:
68+
head_memory_requests = None
69+
head_memory_limits = None
70+
worker_memory_requests = 1
71+
worker_memory_limits = 4
72+
6173
cluster = Cluster(
6274
ClusterConfiguration(
6375
name=cluster_name,
6476
namespace=self.namespace,
6577
num_workers=1,
6678
head_cpu_requests="500m",
6779
head_cpu_limits="500m",
80+
head_memory_requests=head_memory_requests,
81+
head_memory_limits=head_memory_limits,
6882
worker_cpu_requests="500m",
6983
worker_cpu_limits=1,
70-
worker_memory_requests=1,
71-
worker_memory_limits=4,
84+
worker_memory_requests=worker_memory_requests,
85+
worker_memory_limits=worker_memory_limits,
7286
worker_extended_resource_requests={gpu_resource_name: number_of_gpus},
7387
image=ray_image,
7488
verify_tls=False,

tests/e2e/mnist_raycluster_sdk_aw_kind_test.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,31 @@ def run_mnist_raycluster_sdk_kind(
4646
else f"rayproject/ray:{constants.RAY_VERSION}"
4747
)
4848

49+
# GPU images need more memory due to CUDA libraries
50+
if number_of_gpus > 0:
51+
head_memory_requests = 4
52+
head_memory_limits = 6
53+
worker_memory_requests = 4
54+
worker_memory_limits = 8
55+
else:
56+
head_memory_requests = None
57+
head_memory_limits = None
58+
worker_memory_requests = 1
59+
worker_memory_limits = 4
60+
4961
cluster = Cluster(
5062
ClusterConfiguration(
5163
name="mnist",
5264
namespace=self.namespace,
5365
num_workers=1,
5466
head_cpu_requests="500m",
5567
head_cpu_limits="500m",
68+
head_memory_requests=head_memory_requests,
69+
head_memory_limits=head_memory_limits,
5670
worker_cpu_requests="500m",
5771
worker_cpu_limits=1,
58-
worker_memory_requests=1,
59-
worker_memory_limits=4,
72+
worker_memory_requests=worker_memory_requests,
73+
worker_memory_limits=worker_memory_limits,
6074
worker_extended_resource_requests={gpu_resource_name: number_of_gpus},
6175
image=ray_image,
6276
write_to_file=True,

tests/e2e/mnist_raycluster_sdk_kind_test.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,31 @@ def run_mnist_raycluster_sdk_kind(
4646
else f"rayproject/ray:{constants.RAY_VERSION}"
4747
)
4848

49+
# GPU images need more memory due to CUDA libraries
50+
if number_of_gpus > 0:
51+
head_memory_requests = 4
52+
head_memory_limits = 6
53+
worker_memory_requests = 4
54+
worker_memory_limits = 8
55+
else:
56+
head_memory_requests = None
57+
head_memory_limits = None
58+
worker_memory_requests = 1
59+
worker_memory_limits = 4
60+
4961
cluster = Cluster(
5062
ClusterConfiguration(
5163
name="mnist",
5264
namespace=self.namespace,
5365
num_workers=1,
5466
head_cpu_requests="500m",
5567
head_cpu_limits="500m",
68+
head_memory_requests=head_memory_requests,
69+
head_memory_limits=head_memory_limits,
5670
worker_cpu_requests="500m",
5771
worker_cpu_limits=1,
58-
worker_memory_requests=1,
59-
worker_memory_limits=4,
72+
worker_memory_requests=worker_memory_requests,
73+
worker_memory_limits=worker_memory_limits,
6074
worker_extended_resource_requests={gpu_resource_name: number_of_gpus},
6175
image=ray_image,
6276
write_to_file=True,

0 commit comments

Comments
 (0)