refactor: default docker-compose w/ python backend

README.md

@@ -84,7 +84,7 @@ make dev
 ```
 or
 ```bash
-make dev-python  # Turn off triton backend (for non-cuda env developers)
+make dev-triton # Turn on triton backend (for cuda env developers)
 ```
 
 ## TODOs

deployment/docker-compose.python.yml

@@ -1,31 +0,0 @@
-version: '3.3'
-
-services:
-  init:
-    image: tabbyml/tabby
-    container_name: init
-    user: root
-    volumes:
-      - ${DATA_VOLUME}
-      - ${HF_VOLUME}
-    command: chown -R 1000 /data
-
-  tabby:
-    image: tabbyml/tabby
-    container_name: tabby
-    environment:
-      MODEL_NAME: ${MODEL_NAME}
-    ports:
-      - "5000:5000"
-      - "8080:8080"
-      - "8501:8501"
-    volumes:
-      - ${DATA_VOLUME}
-      - ${HF_VOLUME}
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:5000"]
-      interval: 2s
-      timeout: 2s
-      start_period: 1200s
-    depends_on:
-      - init

deployment/docker-compose.triton.yml

@@ -0,0 +1,15 @@
+version: '3.3'
+
+services:
+  tabby:
+    shm_size: 1gb
+    environment:
+      MODEL_BACKEND: triton
+      MODEL_REPLICA: ${MODEL_REPLICA:-1}
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: all
+              capabilities: [gpu]

deployment/docker-compose.yml

@@ -13,11 +13,8 @@ services:
   tabby:
     image: tabbyml/tabby
     container_name: tabby
-    shm_size: 1gb
     environment:
       MODEL_NAME: ${MODEL_NAME}
-      MODEL_BACKEND: triton
-      MODEL_REPLICA: ${MODEL_REPLICA:-1}
     ports:
       - "5000:5000"
       - "8080:8080"
@@ -30,12 +27,5 @@ services:
       interval: 2s
       timeout: 2s
       start_period: 1200s
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: all
-              capabilities: [gpu]
     depends_on:
       - init

deployment/skypilot/default.yml

@@ -22,4 +22,4 @@ setup: |
 
 run: |
   cd tabby/deployment
-  sudo MODEL_REPLICA=${MODEL_REPLICA:-8} docker-compose up
+  sudo MODEL_REPLICA=${MODEL_REPLICA:-8} docker-compose -f docker-compose.yml -f docker-compose.triton.yml up

development/Makefile

@@ -7,5 +7,5 @@ build:
 dev:
 	docker-compose -f ../deployment/docker-compose.yml -f docker-compose.dev.yml $(UP_FLAGS)
 
-dev-python:
+dev-triton:
-	docker-compose -f ../deployment/docker-compose.python.yml -f docker-compose.dev.yml $(UP_FLAGS)
+	docker-compose -f ../deployment/docker-compose.yml -f ../deployment/docker-compose.triton.yml -f docker-compose.dev.yml $(UP_FLAGS)