Skip to content

Commit 0d37916

Browse files
committed
Fix several bugs
1 parent 0b9ab29 commit 0d37916

File tree

7 files changed

+183
-114
lines changed

7 files changed

+183
-114
lines changed

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,5 @@ volcano-scheduler-deploy: volcano-scheduler-crd
213213

214214
.PHONY: charm
215215
charm: ${BIN_DIR}
216-
rm -rf $(PROJECT_DIR)/dep-libs/charm
217-
mkdir -p $(PROJECT_DIR)/dep-libs/charm
218-
git clone $(CHARM_REPO) $(PROJECT_DIR)/dep-libs/charm
219-
cd $(PROJECT_DIR)/dep-libs/charm && git checkout shrinkexpand-fix && ./build charm++ netlrts-linux-x86_64 --enable-shrinkexpand -j8 --force
216+
cd $(PROJECT_DIR)/dep-libs/charm && git checkout kubernetes && ./build charm++ netlrts-linux-x86_64 --enable-shrinkexpand -j8 --force
220217
cd pkg/controller && $(PROJECT_DIR)/dep-libs/charm/bin/charmc -language c++ -seq -o ${PROJECT_DIR}/${BIN_DIR}/rescale_client rescale_client.C -lccs-client

cmd/mpi-operator/app/options/options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (s *ServerOption) AddFlags(fs *flag.FlagSet) {
5959
`The namespace to monitor mpijobs. If unset, it monitors all namespaces cluster-wide.
6060
If set, it only monitors mpijobs in the given namespace.`)
6161

62-
fs.IntVar(&s.Threadiness, "threadiness", 2,
62+
fs.IntVar(&s.Threadiness, "threadiness", 1,
6363
`How many threads to process the main logic`)
6464

6565
fs.BoolVar(&s.PrintVersion, "version", false, "Show version and quit")

deploy/v2beta1/mpi-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8241,7 +8241,7 @@ spec:
82418241
- args:
82428242
- -alsologtostderr
82438243
- --lock-namespace=mpi-operator
8244-
image: adityapb/mpi-operator:autoscale
8244+
image: adityapb/mpi-operator:rescale-gap
82458245
imagePullPolicy: Always
82468246
name: mpi-operator
82478247
serviceAccountName: mpi-operator

examples/v2beta1/charm/charm-0.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
priority: 1
99
runPolicy:
1010
cleanPodPolicy: Running
11-
ttlSecondsAfterFinished: 60
11+
ttlSecondsAfterFinished: 600
1212
sshAuthMountPath: /home/mpiuser/.ssh
1313
mpiReplicaSpecs:
1414
Launcher:
@@ -25,9 +25,9 @@ spec:
2525
- /app/charmrun
2626
args:
2727
- /app/jacobi2d
28-
- "4096"
28+
- "8192"
2929
- "512"
30-
- "3000"
30+
- "600"
3131
- +balancer
3232
- MetisLB
3333
- +LBDebug
@@ -36,7 +36,6 @@ spec:
3636
resources:
3737
limits:
3838
cpu: 1
39-
memory: 1Gi
4039
Worker:
4140
minReplicas: 1
4241
maxReplicas: 10
@@ -46,6 +45,9 @@ spec:
4645
- image: adityapb/charm-netlrts:dev-new
4746
imagePullPolicy: Always
4847
name: mpi-worker
48+
volumeMounts:
49+
- mountPath: /dev/shm
50+
name: shm-volume
4951
securityContext:
5052
runAsUser: 1000
5153
command:
@@ -57,3 +59,8 @@ spec:
5759
resources:
5860
limits:
5961
cpu: 1
62+
volumes:
63+
- name: shm-volume
64+
emptyDir:
65+
medium: Memory
66+
sizeLimit: 1Gi

examples/v2beta1/charm/charm-2.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
priority: 3
99
runPolicy:
1010
cleanPodPolicy: Running
11-
ttlSecondsAfterFinished: 60
11+
ttlSecondsAfterFinished: 600
1212
sshAuthMountPath: /home/mpiuser/.ssh
1313
mpiReplicaSpecs:
1414
Launcher:
@@ -36,7 +36,6 @@ spec:
3636
resources:
3737
limits:
3838
cpu: 1
39-
memory: 1Gi
4039
Worker:
4140
minReplicas: 1
4241
maxReplicas: 10

0 commit comments

Comments
 (0)