From 9afd0f8191045dc5c2f32dbddf21f72c63be4a6c Mon Sep 17 00:00:00 2001 From: Mohammad Reza Saleh Date: Tue, 28 Nov 2023 22:29:58 +0100 Subject: [PATCH] restructure the directories and delete model --- deckard/iaac/gcp/README.md | 2 +- .../conf/deploy-cpu => deckard/iaac/gcp}/pvc.yaml | 0 .../deploy-cpu => deckard/iaac/gcp}/sclass.yaml | 0 examples/power/conf/deploy-cpu/default.yaml | 14 -------------- .../conf/deploy-nvidia-tesla-a100/default.yaml | 14 -------------- .../power/conf/deploy-nvidia-tesla-a100/pvc.yaml | 11 ----------- .../conf/deploy-nvidia-tesla-a100/sclass.yaml | 10 ---------- .../conf/deploy-nvidia-tesla-p100/default.yaml | 14 -------------- .../power/conf/deploy-nvidia-tesla-p100/pvc.yaml | 11 ----------- .../conf/deploy-nvidia-tesla-p100/sclass.yaml | 10 ---------- .../conf/deploy-nvidia-tesla-v100/default.yaml | 14 -------------- .../power/conf/deploy-nvidia-tesla-v100/pvc.yaml | 11 ----------- .../conf/deploy-nvidia-tesla-v100/sclass.yaml | 10 ---------- .../conf/{deploy-cpu => deploy/cpu}/cifar10.yaml | 0 .../conf/{deploy-cpu => deploy/cpu}/cifar100.yaml | 0 .../conf/{deploy-cpu => deploy/cpu}/mnist.yaml | 2 +- .../nvidia-tesla-a100}/cifar10.yaml | 0 .../nvidia-tesla-a100}/cifar100.yaml | 0 .../nvidia-tesla-a100}/mnist.yaml | 0 .../nvidia-tesla-p100}/cifar10.yaml | 0 .../nvidia-tesla-p100}/cifar100.yaml | 0 .../nvidia-tesla-p100}/mnist.yaml | 0 .../nvidia-tesla-v100}/cifar10.yaml | 0 .../nvidia-tesla-v100}/cifar100.yaml | 0 .../nvidia-tesla-v100}/mnist.yaml | 0 examples/power/dvc.yaml | 8 ++++---- 26 files changed, 6 insertions(+), 125 deletions(-) rename {examples/power/conf/deploy-cpu => deckard/iaac/gcp}/pvc.yaml (100%) rename {examples/power/conf/deploy-cpu => deckard/iaac/gcp}/sclass.yaml (100%) delete mode 100644 examples/power/conf/deploy-cpu/default.yaml delete mode 100644 examples/power/conf/deploy-nvidia-tesla-a100/default.yaml delete mode 100644 examples/power/conf/deploy-nvidia-tesla-a100/pvc.yaml delete mode 100644 examples/power/conf/deploy-nvidia-tesla-a100/sclass.yaml delete mode 100644 examples/power/conf/deploy-nvidia-tesla-p100/default.yaml delete mode 100644 examples/power/conf/deploy-nvidia-tesla-p100/pvc.yaml delete mode 100644 examples/power/conf/deploy-nvidia-tesla-p100/sclass.yaml delete mode 100644 examples/power/conf/deploy-nvidia-tesla-v100/default.yaml delete mode 100644 examples/power/conf/deploy-nvidia-tesla-v100/pvc.yaml delete mode 100644 examples/power/conf/deploy-nvidia-tesla-v100/sclass.yaml rename examples/power/conf/{deploy-cpu => deploy/cpu}/cifar10.yaml (100%) rename examples/power/conf/{deploy-cpu => deploy/cpu}/cifar100.yaml (100%) rename examples/power/conf/{deploy-cpu => deploy/cpu}/mnist.yaml (95%) rename examples/power/conf/{deploy-nvidia-tesla-a100 => deploy/nvidia-tesla-a100}/cifar10.yaml (100%) rename examples/power/conf/{deploy-nvidia-tesla-a100 => deploy/nvidia-tesla-a100}/cifar100.yaml (100%) rename examples/power/conf/{deploy-nvidia-tesla-a100 => deploy/nvidia-tesla-a100}/mnist.yaml (100%) rename examples/power/conf/{deploy-nvidia-tesla-p100 => deploy/nvidia-tesla-p100}/cifar10.yaml (100%) rename examples/power/conf/{deploy-nvidia-tesla-p100 => deploy/nvidia-tesla-p100}/cifar100.yaml (100%) rename examples/power/conf/{deploy-nvidia-tesla-p100 => deploy/nvidia-tesla-p100}/mnist.yaml (100%) rename examples/power/conf/{deploy-nvidia-tesla-v100 => deploy/nvidia-tesla-v100}/cifar10.yaml (100%) rename examples/power/conf/{deploy-nvidia-tesla-v100 => deploy/nvidia-tesla-v100}/cifar100.yaml (100%) rename examples/power/conf/{deploy-nvidia-tesla-v100 => deploy/nvidia-tesla-v100}/mnist.yaml (100%) diff --git a/deckard/iaac/gcp/README.md b/deckard/iaac/gcp/README.md index bc6b84bd..51d6ee4a 100644 --- a/deckard/iaac/gcp/README.md +++ b/deckard/iaac/gcp/README.md @@ -23,7 +23,7 @@ sudo apt-get update && sudo apt-get install google-cloud-cli 1-We then create the cluster called `k8s-cluster`. This cluster will be installed in `europe-west4` in GCP regions. ``` gcloud container clusters create k8s-cluster \ - --zone europe-west4-a --num-nodes 1 --no-enable-autoupgrade + --zone europe-west4-a --num-nodes 3 --no-enable-autoupgrade --addons=GcpFilestoreCsiDriver ``` 2- In order to manage the Kubernetes cluster we need to [install `kubectl`](https://kubernetes.io/docs/tasks/tools/#kubectl). diff --git a/examples/power/conf/deploy-cpu/pvc.yaml b/deckard/iaac/gcp/pvc.yaml similarity index 100% rename from examples/power/conf/deploy-cpu/pvc.yaml rename to deckard/iaac/gcp/pvc.yaml diff --git a/examples/power/conf/deploy-cpu/sclass.yaml b/deckard/iaac/gcp/sclass.yaml similarity index 100% rename from examples/power/conf/deploy-cpu/sclass.yaml rename to deckard/iaac/gcp/sclass.yaml diff --git a/examples/power/conf/deploy-cpu/default.yaml b/examples/power/conf/deploy-cpu/default.yaml deleted file mode 100644 index 134da65f..00000000 --- a/examples/power/conf/deploy-cpu/default.yaml +++ /dev/null @@ -1,14 +0,0 @@ -num_nodes: 1 -cluster_name: k8s-cluster -gpu_type: nvidia-tesla-v100 -gpu_count: 1 -gpu_driver_version: default -machine_type: n1-standard-2 -min_nodes: 1 -max_nodes: 1 -storage_config: conf/deploy/sclass.yaml -persistent_volume_claim: conf/deploy/pvc.yaml -pod : conf/deploy/pod.yaml -image_project: ubuntu-os-cloud -image_family: ubuntu-2204-lts -mount_directory: /mnt/filestore diff --git a/examples/power/conf/deploy-nvidia-tesla-a100/default.yaml b/examples/power/conf/deploy-nvidia-tesla-a100/default.yaml deleted file mode 100644 index 134da65f..00000000 --- a/examples/power/conf/deploy-nvidia-tesla-a100/default.yaml +++ /dev/null @@ -1,14 +0,0 @@ -num_nodes: 1 -cluster_name: k8s-cluster -gpu_type: nvidia-tesla-v100 -gpu_count: 1 -gpu_driver_version: default -machine_type: n1-standard-2 -min_nodes: 1 -max_nodes: 1 -storage_config: conf/deploy/sclass.yaml -persistent_volume_claim: conf/deploy/pvc.yaml -pod : conf/deploy/pod.yaml -image_project: ubuntu-os-cloud -image_family: ubuntu-2204-lts -mount_directory: /mnt/filestore diff --git a/examples/power/conf/deploy-nvidia-tesla-a100/pvc.yaml b/examples/power/conf/deploy-nvidia-tesla-a100/pvc.yaml deleted file mode 100644 index a7deee4d..00000000 --- a/examples/power/conf/deploy-nvidia-tesla-a100/pvc.yaml +++ /dev/null @@ -1,11 +0,0 @@ -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: podpvc -spec: - accessModes: - - ReadWriteMany - storageClassName: filestore-sc - resources: - requests: - storage: 256Gi diff --git a/examples/power/conf/deploy-nvidia-tesla-a100/sclass.yaml b/examples/power/conf/deploy-nvidia-tesla-a100/sclass.yaml deleted file mode 100644 index d566656c..00000000 --- a/examples/power/conf/deploy-nvidia-tesla-a100/sclass.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: filestore-sc -provisioner: filestore.csi.storage.gke.io -volumeBindingMode: Immediate -allowVolumeExpansion: true -parameters: - tier: standard - network: default diff --git a/examples/power/conf/deploy-nvidia-tesla-p100/default.yaml b/examples/power/conf/deploy-nvidia-tesla-p100/default.yaml deleted file mode 100644 index 134da65f..00000000 --- a/examples/power/conf/deploy-nvidia-tesla-p100/default.yaml +++ /dev/null @@ -1,14 +0,0 @@ -num_nodes: 1 -cluster_name: k8s-cluster -gpu_type: nvidia-tesla-v100 -gpu_count: 1 -gpu_driver_version: default -machine_type: n1-standard-2 -min_nodes: 1 -max_nodes: 1 -storage_config: conf/deploy/sclass.yaml -persistent_volume_claim: conf/deploy/pvc.yaml -pod : conf/deploy/pod.yaml -image_project: ubuntu-os-cloud -image_family: ubuntu-2204-lts -mount_directory: /mnt/filestore diff --git a/examples/power/conf/deploy-nvidia-tesla-p100/pvc.yaml b/examples/power/conf/deploy-nvidia-tesla-p100/pvc.yaml deleted file mode 100644 index a7deee4d..00000000 --- a/examples/power/conf/deploy-nvidia-tesla-p100/pvc.yaml +++ /dev/null @@ -1,11 +0,0 @@ -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: podpvc -spec: - accessModes: - - ReadWriteMany - storageClassName: filestore-sc - resources: - requests: - storage: 256Gi diff --git a/examples/power/conf/deploy-nvidia-tesla-p100/sclass.yaml b/examples/power/conf/deploy-nvidia-tesla-p100/sclass.yaml deleted file mode 100644 index d566656c..00000000 --- a/examples/power/conf/deploy-nvidia-tesla-p100/sclass.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: filestore-sc -provisioner: filestore.csi.storage.gke.io -volumeBindingMode: Immediate -allowVolumeExpansion: true -parameters: - tier: standard - network: default diff --git a/examples/power/conf/deploy-nvidia-tesla-v100/default.yaml b/examples/power/conf/deploy-nvidia-tesla-v100/default.yaml deleted file mode 100644 index 134da65f..00000000 --- a/examples/power/conf/deploy-nvidia-tesla-v100/default.yaml +++ /dev/null @@ -1,14 +0,0 @@ -num_nodes: 1 -cluster_name: k8s-cluster -gpu_type: nvidia-tesla-v100 -gpu_count: 1 -gpu_driver_version: default -machine_type: n1-standard-2 -min_nodes: 1 -max_nodes: 1 -storage_config: conf/deploy/sclass.yaml -persistent_volume_claim: conf/deploy/pvc.yaml -pod : conf/deploy/pod.yaml -image_project: ubuntu-os-cloud -image_family: ubuntu-2204-lts -mount_directory: /mnt/filestore diff --git a/examples/power/conf/deploy-nvidia-tesla-v100/pvc.yaml b/examples/power/conf/deploy-nvidia-tesla-v100/pvc.yaml deleted file mode 100644 index a7deee4d..00000000 --- a/examples/power/conf/deploy-nvidia-tesla-v100/pvc.yaml +++ /dev/null @@ -1,11 +0,0 @@ -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: podpvc -spec: - accessModes: - - ReadWriteMany - storageClassName: filestore-sc - resources: - requests: - storage: 256Gi diff --git a/examples/power/conf/deploy-nvidia-tesla-v100/sclass.yaml b/examples/power/conf/deploy-nvidia-tesla-v100/sclass.yaml deleted file mode 100644 index d566656c..00000000 --- a/examples/power/conf/deploy-nvidia-tesla-v100/sclass.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: filestore-sc -provisioner: filestore.csi.storage.gke.io -volumeBindingMode: Immediate -allowVolumeExpansion: true -parameters: - tier: standard - network: default diff --git a/examples/power/conf/deploy-cpu/cifar10.yaml b/examples/power/conf/deploy/cpu/cifar10.yaml similarity index 100% rename from examples/power/conf/deploy-cpu/cifar10.yaml rename to examples/power/conf/deploy/cpu/cifar10.yaml diff --git a/examples/power/conf/deploy-cpu/cifar100.yaml b/examples/power/conf/deploy/cpu/cifar100.yaml similarity index 100% rename from examples/power/conf/deploy-cpu/cifar100.yaml rename to examples/power/conf/deploy/cpu/cifar100.yaml diff --git a/examples/power/conf/deploy-cpu/mnist.yaml b/examples/power/conf/deploy/cpu/mnist.yaml similarity index 95% rename from examples/power/conf/deploy-cpu/mnist.yaml rename to examples/power/conf/deploy/cpu/mnist.yaml index b0d10a30..11d9ecfe 100644 --- a/examples/power/conf/deploy-cpu/mnist.yaml +++ b/examples/power/conf/deploy/cpu/mnist.yaml @@ -21,7 +21,7 @@ spec: # - name: REDIS_PASSWORD # value: "" volumeMounts: - - mountPath: /deckard/ + - mountPath: /result/ name: mypvc volumes: - name: mypvc diff --git a/examples/power/conf/deploy-nvidia-tesla-a100/cifar10.yaml b/examples/power/conf/deploy/nvidia-tesla-a100/cifar10.yaml similarity index 100% rename from examples/power/conf/deploy-nvidia-tesla-a100/cifar10.yaml rename to examples/power/conf/deploy/nvidia-tesla-a100/cifar10.yaml diff --git a/examples/power/conf/deploy-nvidia-tesla-a100/cifar100.yaml b/examples/power/conf/deploy/nvidia-tesla-a100/cifar100.yaml similarity index 100% rename from examples/power/conf/deploy-nvidia-tesla-a100/cifar100.yaml rename to examples/power/conf/deploy/nvidia-tesla-a100/cifar100.yaml diff --git a/examples/power/conf/deploy-nvidia-tesla-a100/mnist.yaml b/examples/power/conf/deploy/nvidia-tesla-a100/mnist.yaml similarity index 100% rename from examples/power/conf/deploy-nvidia-tesla-a100/mnist.yaml rename to examples/power/conf/deploy/nvidia-tesla-a100/mnist.yaml diff --git a/examples/power/conf/deploy-nvidia-tesla-p100/cifar10.yaml b/examples/power/conf/deploy/nvidia-tesla-p100/cifar10.yaml similarity index 100% rename from examples/power/conf/deploy-nvidia-tesla-p100/cifar10.yaml rename to examples/power/conf/deploy/nvidia-tesla-p100/cifar10.yaml diff --git a/examples/power/conf/deploy-nvidia-tesla-p100/cifar100.yaml b/examples/power/conf/deploy/nvidia-tesla-p100/cifar100.yaml similarity index 100% rename from examples/power/conf/deploy-nvidia-tesla-p100/cifar100.yaml rename to examples/power/conf/deploy/nvidia-tesla-p100/cifar100.yaml diff --git a/examples/power/conf/deploy-nvidia-tesla-p100/mnist.yaml b/examples/power/conf/deploy/nvidia-tesla-p100/mnist.yaml similarity index 100% rename from examples/power/conf/deploy-nvidia-tesla-p100/mnist.yaml rename to examples/power/conf/deploy/nvidia-tesla-p100/mnist.yaml diff --git a/examples/power/conf/deploy-nvidia-tesla-v100/cifar10.yaml b/examples/power/conf/deploy/nvidia-tesla-v100/cifar10.yaml similarity index 100% rename from examples/power/conf/deploy-nvidia-tesla-v100/cifar10.yaml rename to examples/power/conf/deploy/nvidia-tesla-v100/cifar10.yaml diff --git a/examples/power/conf/deploy-nvidia-tesla-v100/cifar100.yaml b/examples/power/conf/deploy/nvidia-tesla-v100/cifar100.yaml similarity index 100% rename from examples/power/conf/deploy-nvidia-tesla-v100/cifar100.yaml rename to examples/power/conf/deploy/nvidia-tesla-v100/cifar100.yaml diff --git a/examples/power/conf/deploy-nvidia-tesla-v100/mnist.yaml b/examples/power/conf/deploy/nvidia-tesla-v100/mnist.yaml similarity index 100% rename from examples/power/conf/deploy-nvidia-tesla-v100/mnist.yaml rename to examples/power/conf/deploy/nvidia-tesla-v100/mnist.yaml diff --git a/examples/power/dvc.yaml b/examples/power/dvc.yaml index 51d1cbff..b20ecef7 100644 --- a/examples/power/dvc.yaml +++ b/examples/power/dvc.yaml @@ -56,10 +56,10 @@ stages: cache : false - ${files.directory}/${files.data_dir}/${files.data_file}${files.data_type}: cache : false - - ${files.directory}/${files.model_dir}/${files.model_file}${files.model_type}: - cache : false - - ${files.directory}/${files.model_dir}/${files.model_file}.optimizer${files.model_type}: - cache : false + # - ${files.directory}/${files.model_dir}/${files.model_file}${files.model_type}: + # cache : false + # - ${files.directory}/${files.model_dir}/${files.model_file}.optimizer${files.model_type}: + # cache : false - ${files.directory}/${files.reports}/attack/${files.name}/${files.predictions_file}: # logit outputs for our model cache : false deps: