Skip to content

Commit 68dd6a6

Browse files
authored
Kill python3 xpk.py (#812)
feat: kill python3 xpk.py
1 parent 1d474ed commit 68dd6a6

26 files changed

+158
-197
lines changed

README.md

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

docs/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Also, follow [Prerequisites](https://github.com/AI-Hypercomputer/xpk?tab=readme-
6161

6262
### Make your change
6363

64-
Make intended code change, cover it with unit tests and iterate on the code by executing local XPK version via `python3 xpk.py`.
64+
Make intended code change, cover it with unit tests and iterate on the code by executing local XPK version via `xpk`.
6565

6666
### Verify change against checklist
6767

examples/batch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This section should describe how to prepare volumes and add external files execu
88

99
To run xpk batch script run:
1010
```bash
11-
python3 xpk.py batch --cluster my-cluster job.sh
11+
xpk batch --cluster my-cluster job.sh
1212
```
1313

1414
To view results run:

examples/nccl/nccl.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Skip this step if you have already provisioned a GKE cluster with A3 Ultra or A3
1111
First step is to create a cluster with A3 Ultra or A3 Mega machine. Execute command below:
1212

1313
```
14-
python3 xpk.py cluster create \
14+
xpk cluster create \
1515
--cluster=$CLUSTER_NAME --device-type=$DEVICE_TYPE \
1616
--zone=$COMPUTE_ZONE --project=$PROJECT_ID \
1717
--num-nodes=$CLUSTER_NUM_NODES --reservation=$RESERVATION_ID
@@ -26,7 +26,7 @@ The command to run NCCL tests on A3 clusters depends on the type of machine.
2626

2727

2828
```bash
29-
python3 xpk.py workload create \
29+
xpk workload create \
3030
--workload=nccl-test --command="./examples/nccl/nccl-a3mega.sh" \
3131
--base-docker-image=us-docker.pkg.dev/gce-ai-infra/gpudirect-tcpxo/nccl-plugin-gpudirecttcpx-dev:v1.0.8-1 \
3232
--cluster=$CLUSTER_NAME --device-type=$DEVICE_TYPE \
@@ -37,7 +37,7 @@ python3 xpk.py workload create \
3737
#### A3 Ultra
3838

3939
```bash
40-
python3 xpk.py workload create \
40+
xpk workload create \
4141
--workload=nccl-test --command="./examples/nccl/nccl-a3ultra.sh" \
4242
--base-docker-image=us-docker.pkg.dev/gce-ai-infra/gpudirect-gib/nccl-plugin-gib-diagnostic:v1.0.3 \
4343
--cluster=$CLUSTER_NAME --device-type=$DEVICE_TYPE \

goldens.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
goldens:
22
"NAP cluster-create with pathways":
3-
command: python3 xpk.py cluster create-pathways --project=golden-project --zone=us-central1-a --enable-autoprovisioning --cluster=golden-cluster --tpu-type=tpu7x-8 --on-demand --dry-run
3+
command: xpk cluster create-pathways --project=golden-project --zone=us-central1-a --enable-autoprovisioning --cluster=golden-cluster --tpu-type=tpu7x-8 --on-demand --dry-run
44
"NAP cluster-create":
5-
command: python3 xpk.py cluster create --project=golden-project --zone=us-central1-a --enable-autoprovisioning --cluster=golden-cluster --tpu-type=tpu7x-8 --on-demand --dry-run
5+
command: xpk cluster create --project=golden-project --zone=us-central1-a --enable-autoprovisioning --cluster=golden-cluster --tpu-type=tpu7x-8 --on-demand --dry-run
66
"Basic cluster create":
7-
command: python3 xpk.py cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --dry-run
7+
command: xpk cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --dry-run
88
"Cluster create with CPU and memory limits below capacity":
9-
command: python3 xpk.py cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --cpu-limit=1 --memory-limit=1Mi --dry-run
9+
command: xpk cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --cpu-limit=1 --memory-limit=1Mi --dry-run
1010
"Cluster create with CPU and memory limits above capacity":
11-
command: python3 xpk.py cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --cpu-limit=20 --memory-limit=1Gi --dry-run
11+
command: xpk cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --cpu-limit=20 --memory-limit=1Gi --dry-run
1212
"Cluster create with gb200-4":
13-
command: python3 xpk.py cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --device-type=gb200-4 --reservation=golden-reservation --dry-run
13+
command: xpk cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --device-type=gb200-4 --reservation=golden-reservation --dry-run
1414
"Cluster create private":
15-
command: python3 xpk.py cluster create-pathways --project=golden-project --zone=us-central1-a --cluster=golden-cluster-private --private --tpu-type=v5p-8 --num-slices=1 --default-pool-cpu-machine-type=n1-standard-16 --default-pool-cpu-num-nodes=4 --reservation=golden-reservation --dry-run
15+
command: xpk cluster create-pathways --project=golden-project --zone=us-central1-a --cluster=golden-cluster-private --private --tpu-type=v5p-8 --num-slices=1 --default-pool-cpu-machine-type=n1-standard-16 --default-pool-cpu-num-nodes=4 --reservation=golden-reservation --dry-run
1616
"Cluster delete":
17-
command: python3 xpk.py cluster delete --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
17+
command: xpk cluster delete --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
1818
"Cluster delete force":
19-
command: python3 xpk.py cluster delete --project=golden-project --zone=us-central1-a --cluster=golden-cluster --force --dry-run
19+
command: xpk cluster delete --project=golden-project --zone=us-central1-a --cluster=golden-cluster --force --dry-run
2020
"Workload create":
21-
command: python3 xpk.py workload create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --workload=golden-workload --command "bash hello" --tpu-type=v5p-8 --num-slices=1 --script-dir=/tmp --dry-run
21+
command: xpk workload create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --workload=golden-workload --command "bash hello" --tpu-type=v5p-8 --num-slices=1 --script-dir=/tmp --dry-run
2222
"Workload create pathways":
23-
command: python3 xpk.py workload create-pathways --project=golden-project --zone=us-central1-a --cluster=golden-cluster --workload=golden-workload --command "bash hello" --tpu-type=v5p-8 --num-slices=1 --script-dir=/tmp --dry-run
23+
command: xpk workload create-pathways --project=golden-project --zone=us-central1-a --cluster=golden-cluster --workload=golden-workload --command "bash hello" --tpu-type=v5p-8 --num-slices=1 --script-dir=/tmp --dry-run
2424
"Workload delete":
25-
command: python3 xpk.py workload delete --project=golden-project --zone=us-central1-a --cluster=golden-cluster --workload=golden-workload --dry-run
25+
command: xpk workload delete --project=golden-project --zone=us-central1-a --cluster=golden-cluster --workload=golden-workload --dry-run
2626
"Workload list":
27-
command: python3 xpk.py workload list --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
27+
command: xpk workload list --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
2828
"Storage list":
29-
command: python3 xpk.py storage list --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
29+
command: xpk storage list --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
3030
"Job cancel":
31-
command: python3 xpk.py job cancel golden-job --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
31+
command: xpk job cancel golden-job --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
3232
"Batch":
33-
command: python3 xpk.py batch --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run batch-read.sh
33+
command: xpk batch --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run batch-read.sh
3434
"Job list":
35-
command: python3 xpk.py job ls --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
35+
command: xpk job ls --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
3636
"Job info":
37-
command: python3 xpk.py job info golden-job --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run
37+
command: xpk job info golden-job --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run

goldens/Basic_cluster_create.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$ python3 xpk.py cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --dry-run
1+
$ xpk cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --dry-run
22
[XPK] Starting xpk v0.14.3
33
[XPK] Starting cluster create for cluster golden-cluster:
44
[XPK] Working on golden-project and us-central1-a

goldens/Batch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$ python3 xpk.py batch --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run batch-read.sh
1+
$ xpk batch --project=golden-project --zone=us-central1-a --cluster=golden-cluster --dry-run batch-read.sh
22
[XPK] Starting xpk v0.14.3
33
[XPK] Working on golden-project and us-central1-a
44
[XPK] Task: `Find cluster region or zone` is implemented by the following command not running since it is a dry run.

goldens/Cluster_create_private.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$ python3 xpk.py cluster create-pathways --project=golden-project --zone=us-central1-a --cluster=golden-cluster-private --private --tpu-type=v5p-8 --num-slices=1 --default-pool-cpu-machine-type=n1-standard-16 --default-pool-cpu-num-nodes=4 --reservation=golden-reservation --dry-run
1+
$ xpk cluster create-pathways --project=golden-project --zone=us-central1-a --cluster=golden-cluster-private --private --tpu-type=v5p-8 --num-slices=1 --default-pool-cpu-machine-type=n1-standard-16 --default-pool-cpu-num-nodes=4 --reservation=golden-reservation --dry-run
22
[XPK] Starting xpk v0.14.3
33
[XPK] Starting cluster create for cluster golden-cluster-private:
44
[XPK] Working on golden-project and us-central1-a

goldens/Cluster_create_with_CPU_and_memory_limits_above_capacity.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$ python3 xpk.py cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --cpu-limit=20 --memory-limit=1Gi --dry-run
1+
$ xpk cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --cpu-limit=20 --memory-limit=1Gi --dry-run
22
[XPK] Starting xpk v0.14.3
33
[XPK] Starting cluster create for cluster golden-cluster:
44
[XPK] Working on golden-project and us-central1-a

goldens/Cluster_create_with_CPU_and_memory_limits_below_capacity.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$ python3 xpk.py cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --cpu-limit=1 --memory-limit=1Mi --dry-run
1+
$ xpk cluster create --project=golden-project --zone=us-central1-a --cluster=golden-cluster --tpu-type=tpu7x-8 --spot --cpu-limit=1 --memory-limit=1Mi --dry-run
22
[XPK] Starting xpk v0.14.3
33
[XPK] Starting cluster create for cluster golden-cluster:
44
[XPK] Working on golden-project and us-central1-a

0 commit comments

Comments
 (0)