Skip to content

Commit 900d4d9

Browse files
author
Le Yao
committed
Update the deployment to aigc
Signed-off-by: Le Yao <le.yao@intel.com>
1 parent d057ac8 commit 900d4d9

8 files changed

+79
-57
lines changed

deployment/fastchat-api-server.yaml renamed to deployment/cse-aigc-api-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: fastchat-api-server
17-
image: leyao/fastchat:latest
17+
image: gar-registry.caas.intel.com/cpio/cnagc-fastchat-k8s:latest
1818
ports:
1919
- containerPort: 8000
2020
command: ["python3.9", "-m", "fastchat.serve.openai_api_server", "--controller-address", "http://fastchat-controller:21001", "--host", "0.0.0.0", "--port", "8000"]

deployment/fastchat-controller.yaml renamed to deployment/cse-aigc-controller.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: fastchat-controller
4+
name: cse-aigc-controller
55
spec:
66
replicas: 1
77
selector:
88
matchLabels:
9-
app: fastchat-controller
9+
app: cse-aigc-controller
1010
template:
1111
metadata:
1212
labels:
13-
app: fastchat-controller
13+
app: cse-aigc-controller
1414
spec:
1515
containers:
16-
- name: fastchat-controller
16+
- name: cse-aigc-controller
1717
image: gar-registry.caas.intel.com/cpio/cnagc-fastchat-k8s:latest
1818
ports:
1919
- containerPort: 21001
@@ -27,10 +27,10 @@ spec:
2727
apiVersion: v1
2828
kind: Service
2929
metadata:
30-
name: fastchat-controller
30+
name: cse-aigc-controller
3131
spec:
3232
selector:
33-
app: fastchat-controller
33+
app: cse-aigc-controller
3434
ports:
3535
- protocol: TCP
3636
port: 21001

deployment/cse-aigc-monitor.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
apiVersion: monitoring.coreos.com/v1
2+
kind: ServiceMonitor
3+
metadata:
4+
name: cse-aigc-model-worker-non
5+
namespace: non
6+
labels:
7+
service-monitor: cse-aigc-model-worker-non
8+
spec:
9+
selector:
10+
matchLabels:
11+
app: cse-aigc-model-worker-non
12+
endpoints:
13+
- port: http
14+
interval: 15s
15+
---
16+
17+
apiVersion: monitoring.coreos.com/v1
18+
kind: ServiceMonitor
19+
metadata:
20+
name: cse-aigc-model-worker-amx
21+
namespace: amx
22+
labels:
23+
service-monitor: cse-aigc-model-worker-amx
24+
spec:
25+
selector:
26+
matchLabels:
27+
app: cse-aigc-model-worker-amx
28+
endpoints:
29+
- port: http
30+
interval: 15s
31+

deployment/fastchat-web-ui.yaml renamed to deployment/cse-aigc-web-ui.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: fastchat-web-ui
4+
name: cse-aigc-web-ui
55
spec:
66
replicas: 1
77
selector:
88
matchLabels:
9-
app: fastchat-web-ui
9+
app: cse-aigc-web-ui
1010
template:
1111
metadata:
1212
labels:
13-
app: fastchat-web-ui
13+
app: cse-aigc-web-ui
1414
spec:
1515
containers:
16-
- name: fastchat-web-ui
16+
- name: cse-aigc-web-ui
1717
image: gar-registry.caas.intel.com/cpio/cnagc-fastchat-k8s:latest
1818
ports:
1919
- containerPort: 9000
@@ -23,16 +23,18 @@ spec:
2323
value: "ui"
2424
- name: FASTCHAT_ROOT
2525
value: "/fastchat"
26+
- name: CONTROLLER_SVC
27+
value: cse-aigc-controller
2628

2729
---
2830
apiVersion: v1
2931
kind: Service
3032
metadata:
31-
name: fastchat-web-ui
33+
name: cse-aigc-web-ui
3234
spec:
3335
type: NodePort
3436
selector:
35-
app: fastchat-web-ui
37+
app: cse-aigc-web-ui
3638
ports:
3739
- protocol: TCP
3840
port: 9000

deployment/fastchat-model-worker-compare.yaml renamed to deployment/cse-aigc-worker-amx.yaml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: fastchat-model-worker1
4+
name: cse-aigc-model-worker-amx
5+
namespace: amx
56
spec:
67
replicas: 1
78
selector:
89
matchLabels:
9-
app: fastchat-model-worker1
10+
app: cse-aigc-model-worker-amx
1011
template:
1112
metadata:
1213
labels:
13-
app: fastchat-model-worker1
14+
app: cse-aigc-model-worker-amx
1415
spec:
1516
containers:
16-
- name: fastchat-model-worker1
17+
- name: cse-aigc-model-worker-amx
1718
image: gar-registry.caas.intel.com/cpio/cnagc-fastchat-k8s:latest
1819
ports:
1920
- containerPort: 8000
@@ -24,29 +25,36 @@ spec:
2425
protocol: TCP
2526
env:
2627
- name: MODEL_NAME
27-
value: "opt-1.3b-bf16-8b-samples"
28+
value: "vicuna-7b-v1.3"
2829
- name: ATEN_CPU_CAPABILITY
29-
value: "avx2"
30+
value: "amx"
31+
- name: CPU_ISA
32+
value: "amx"
3033
- name: DEPLOY_TYPE
3134
value: "model"
3235
- name: FASTCHAT_ROOT
3336
value: "/fastchat"
3437
- name: MODEL_WORKER_SVC
35-
value: fastchat-model-worker1
38+
value: cse-aigc-model-worker-amx.amx.svc.cluster.local
39+
- name: CONTROLLER_SVC
40+
value: cse-aigc-controller.default.svc.cluster.local
3641
- name: MODEL_WORKER_PORT
3742
value: "21003"
43+
- name: OMP_NUM_THREADS
44+
value: "62"
3845
command: ["/entrypoint.sh"]
3946

4047
---
4148
apiVersion: v1
4249
kind: Service
4350
metadata:
44-
name: fastchat-model-worker1
51+
name: cse-aigc-model-worker-amx
52+
namespace: amx
4553
labels:
46-
app: fastchat-model-worker1
54+
app: cse-aigc-model-worker-amx
4755
spec:
4856
selector:
49-
app: fastchat-model-worker1
57+
app: cse-aigc-model-worker-amx
5058
ports:
5159
- protocol: TCP
5260
name: model

deployment/fastchat-model-worker.yaml renamed to deployment/cse-aigc-worker-non.yaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: fastchat-model-worker
4+
name: cse-aigc-model-worker-non
5+
namespace: non
56
spec:
67
replicas: 1
78
selector:
89
matchLabels:
9-
app: fastchat-model-worker
10+
app: cse-aigc-model-worker-non
1011
template:
1112
metadata:
1213
labels:
13-
app: fastchat-model-worker
14+
app: cse-aigc-model-worker-non
1415
spec:
1516
containers:
16-
- name: fastchat-model-worker
17+
- name: cse-aigc-model-worker-non
1718
image: gar-registry.caas.intel.com/cpio/cnagc-fastchat-k8s:latest
1819
ports:
1920
- containerPort: 8000
@@ -25,28 +26,34 @@ spec:
2526
env:
2627
- name: MODEL_NAME
2728
value: "vicuna-7b-v1.3"
29+
#value: "opt-1.3b-bf16-8b-samples"
2830
- name: ATEN_CPU_CAPABILITY
2931
value: "avx2"
3032
- name: DEPLOY_TYPE
3133
value: "model"
3234
- name: FASTCHAT_ROOT
3335
value: "/fastchat"
3436
- name: MODEL_WORKER_SVC
35-
value: fastchat-model-worker
37+
value: cse-aigc-model-worker-non.non.svc.cluster.local
3638
- name: MODEL_WORKER_PORT
3739
value: "21002"
40+
- name: CONTROLLER_SVC
41+
value: cse-aigc-controller.default.svc.cluster.local
42+
- name: OMP_NUM_THREADS
43+
value: "62"
3844
command: ["/entrypoint.sh"]
3945

4046
---
4147
apiVersion: v1
4248
kind: Service
4349
metadata:
44-
name: fastchat-model-worker
50+
name: cse-aigc-model-worker-non
51+
namespace: non
4552
labels:
46-
app: fastchat-model-worker
53+
app: cse-aigc-model-worker-non
4754
spec:
4855
selector:
49-
app: fastchat-model-worker
56+
app: cse-aigc-model-worker-non
5057
ports:
5158
- protocol: TCP
5259
name: model

deployment/model-worker-compare-monitor.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

deployment/model-worker-monitor.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)