From 22f02c63e3948946fdd2c9d04f511c4747963526 Mon Sep 17 00:00:00 2001
From: shendrew <74935437+shendrew@users.noreply.github.com>
Date: Mon, 29 Jul 2024 11:28:33 -0400
Subject: [PATCH] Fix simulation docker-compose file with slurm (#141)

* fix simulation docker-compose file with slurm

* Force workflow rerun

* Update setup.py

---------

Co-authored-by: VishGit1234 <47926842+VishGit1234@users.noreply.github.com>
---
 modules/docker-compose.simulation.yaml | 11 ++++++++---
 src/samples/python/aggregator/setup.py |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/docker-compose.simulation.yaml b/modules/docker-compose.simulation.yaml
index 241f4567..14926d08 100644
--- a/modules/docker-compose.simulation.yaml
+++ b/modules/docker-compose.simulation.yaml
@@ -5,11 +5,16 @@ services:
     image: carlasim/carla:0.9.13
     environment:
       - DISPLAY=1
-      - CUDA_VISIBLE_DEVICES=0,1,2
-      - NVIDIA_VISIBLE_DEVICES=0,1,2
-    runtime: nvidia
+      - CUDA_VISIBLE_DEVICES=0
+      - NVIDIA_VISIBLE_DEVICES=0
     restart: always
     command: /bin/bash -c "./CarlaUE4.sh -nosound -carla-server -RenderOffscreen -world-port=2000 -quality-level=Low"
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              capabilities: [gpu]
     
   carla_ros_bridge:
     build:
diff --git a/src/samples/python/aggregator/setup.py b/src/samples/python/aggregator/setup.py
index b0afb9f6..f77c1804 100755
--- a/src/samples/python/aggregator/setup.py
+++ b/src/samples/python/aggregator/setup.py
@@ -14,7 +14,7 @@
         # Include our package.xml file
         (os.path.join('share', package_name), ['package.xml']),
         # Include all launch files.
-        (os.path.join('share', package_name, 'launch'), \
+        (os.path.join('share', package_name, 'launch'),
          glob(os.path.join('launch', '*.launch.py'))),
     ],
     install_requires=['setuptools'],