From aa3af3c034480db327b6d184782acd28d5d0299e Mon Sep 17 00:00:00 2001 From: Marcin Janas Date: Wed, 16 Oct 2024 11:55:18 +0200 Subject: [PATCH 1/2] feat(deploy/smpcv2): add `libsDir` volume Signed-off-by: Marcin Janas --- .../prod/smpcv2-0-prod/values-iris-mpc.yaml | 18 +++++++++++++-- .../prod/smpcv2-1-prod/values-iris-mpc.yaml | 22 +++++++++++++++++++ .../prod/smpcv2-2-prod/values-iris-mpc.yaml | 22 +++++++++++++++++++ .../stage/smpcv2-0-stage/values-iris-mpc.yaml | 18 +++++++++++++-- .../stage/smpcv2-1-stage/values-iris-mpc.yaml | 22 +++++++++++++++++++ .../stage/smpcv2-2-stage/values-iris-mpc.yaml | 22 +++++++++++++++++++ 6 files changed, 120 insertions(+), 4 deletions(-) diff --git a/deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml b/deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml index 23cf47369..b257b9cd9 100644 --- a/deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml +++ b/deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml @@ -83,6 +83,16 @@ env: - name: SMPC__DISABLE_PERSISTENCE value: "true" +libsDir: + enabled: true + path: "/libs" + size: 2Gi + files: + - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublasLt.so.12.2.5.6" + file: "libcublasLt.so.12.2.5.6" + - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublas.so.12.2.5.6" + file: "libcublas.so.12.2.5.6" + initContainer: enabled: true image: "amazon/aws-cli:2.17.62" @@ -100,7 +110,7 @@ initContainer: # Set up environment variables HOSTED_ZONE_ID=$(aws route53 list-hosted-zones-by-name --dns-name "$PARTY_ID".smpcv2.worldcoin.org --query "HostedZones[].Id" --output text) - + # Generate the JSON content in memory BATCH_JSON=$(cat < Date: Wed, 16 Oct 2024 12:08:35 +0200 Subject: [PATCH 2/2] feat(deploy/smpcv2): move `libsDir` to common values Signed-off-by: Marcin Janas --- deploy/prod/common-values-iris-mpc.yaml | 10 ++++++++++ deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml | 10 ---------- deploy/prod/smpcv2-1-prod/values-iris-mpc.yaml | 10 ---------- deploy/prod/smpcv2-2-prod/values-iris-mpc.yaml | 10 ---------- deploy/stage/common-values-iris-mpc.yaml | 10 ++++++++++ deploy/stage/smpcv2-0-stage/values-iris-mpc.yaml | 10 ---------- deploy/stage/smpcv2-1-stage/values-iris-mpc.yaml | 10 ---------- deploy/stage/smpcv2-2-stage/values-iris-mpc.yaml | 10 ---------- 8 files changed, 20 insertions(+), 60 deletions(-) diff --git a/deploy/prod/common-values-iris-mpc.yaml b/deploy/prod/common-values-iris-mpc.yaml index e449f6194..4f7e8dbed 100644 --- a/deploy/prod/common-values-iris-mpc.yaml +++ b/deploy/prod/common-values-iris-mpc.yaml @@ -63,3 +63,13 @@ tolerations: keelPolling: # -- Specifies whether keel should poll for container updates enabled: true + +libsDir: + enabled: true + path: "/libs" + size: 2Gi + files: + - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublasLt.so.12.2.5.6" + file: "libcublasLt.so.12.2.5.6" + - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublas.so.12.2.5.6" + file: "libcublas.so.12.2.5.6" diff --git a/deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml b/deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml index b257b9cd9..ce9dab082 100644 --- a/deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml +++ b/deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml @@ -83,16 +83,6 @@ env: - name: SMPC__DISABLE_PERSISTENCE value: "true" -libsDir: - enabled: true - path: "/libs" - size: 2Gi - files: - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublasLt.so.12.2.5.6" - file: "libcublasLt.so.12.2.5.6" - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublas.so.12.2.5.6" - file: "libcublas.so.12.2.5.6" - initContainer: enabled: true image: "amazon/aws-cli:2.17.62" diff --git a/deploy/prod/smpcv2-1-prod/values-iris-mpc.yaml b/deploy/prod/smpcv2-1-prod/values-iris-mpc.yaml index 5a4a8f97d..027ef1ab5 100644 --- a/deploy/prod/smpcv2-1-prod/values-iris-mpc.yaml +++ b/deploy/prod/smpcv2-1-prod/values-iris-mpc.yaml @@ -83,16 +83,6 @@ env: - name: SMPC__DISABLE_PERSISTENCE value: "true" -libsDir: - enabled: true - path: "/libs" - size: 2Gi - files: - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublasLt.so.12.2.5.6" - file: "libcublasLt.so.12.2.5.6" - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublas.so.12.2.5.6" - file: "libcublas.so.12.2.5.6" - initContainer: enabled: true image: "amazon/aws-cli:2.17.62" diff --git a/deploy/prod/smpcv2-2-prod/values-iris-mpc.yaml b/deploy/prod/smpcv2-2-prod/values-iris-mpc.yaml index a8ece2dd4..711bf68c5 100644 --- a/deploy/prod/smpcv2-2-prod/values-iris-mpc.yaml +++ b/deploy/prod/smpcv2-2-prod/values-iris-mpc.yaml @@ -83,16 +83,6 @@ env: - name: SMPC__DISABLE_PERSISTENCE value: "true" -libsDir: - enabled: true - path: "/libs" - size: 2Gi - files: - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublasLt.so.12.2.5.6" - file: "libcublasLt.so.12.2.5.6" - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublas.so.12.2.5.6" - file: "libcublas.so.12.2.5.6" - initContainer: enabled: true image: "amazon/aws-cli:2.17.62" diff --git a/deploy/stage/common-values-iris-mpc.yaml b/deploy/stage/common-values-iris-mpc.yaml index 681fdeb63..020a339cb 100644 --- a/deploy/stage/common-values-iris-mpc.yaml +++ b/deploy/stage/common-values-iris-mpc.yaml @@ -61,3 +61,13 @@ tolerations: keelPolling: # -- Specifies whether keel should poll for container updates enabled: true + +libsDir: + enabled: true + path: "/libs" + size: 2Gi + files: + - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublasLt.so.12.2.5.6" + file: "libcublasLt.so.12.2.5.6" + - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublas.so.12.2.5.6" + file: "libcublas.so.12.2.5.6" diff --git a/deploy/stage/smpcv2-0-stage/values-iris-mpc.yaml b/deploy/stage/smpcv2-0-stage/values-iris-mpc.yaml index 14d5d9a57..503c0f400 100644 --- a/deploy/stage/smpcv2-0-stage/values-iris-mpc.yaml +++ b/deploy/stage/smpcv2-0-stage/values-iris-mpc.yaml @@ -77,16 +77,6 @@ env: - name: SMPC__MAX_BATCH_SIZE value: "64" -libsDir: - enabled: true - path: "/libs" - size: 2Gi - files: - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublasLt.so.12.2.5.6" - file: "libcublasLt.so.12.2.5.6" - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublas.so.12.2.5.6" - file: "libcublas.so.12.2.5.6" - initContainer: enabled: true image: "amazon/aws-cli:2.17.62" diff --git a/deploy/stage/smpcv2-1-stage/values-iris-mpc.yaml b/deploy/stage/smpcv2-1-stage/values-iris-mpc.yaml index 0a563df40..c873dc1d9 100644 --- a/deploy/stage/smpcv2-1-stage/values-iris-mpc.yaml +++ b/deploy/stage/smpcv2-1-stage/values-iris-mpc.yaml @@ -77,16 +77,6 @@ env: - name: SMPC__MAX_BATCH_SIZE value: "64" -libsDir: - enabled: true - path: "/libs" - size: 2Gi - files: - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublasLt.so.12.2.5.6" - file: "libcublasLt.so.12.2.5.6" - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublas.so.12.2.5.6" - file: "libcublas.so.12.2.5.6" - initContainer: enabled: true image: "amazon/aws-cli:2.17.62" diff --git a/deploy/stage/smpcv2-2-stage/values-iris-mpc.yaml b/deploy/stage/smpcv2-2-stage/values-iris-mpc.yaml index edc6a25d1..3aaa24a04 100644 --- a/deploy/stage/smpcv2-2-stage/values-iris-mpc.yaml +++ b/deploy/stage/smpcv2-2-stage/values-iris-mpc.yaml @@ -77,16 +77,6 @@ env: - name: SMPC__MAX_BATCH_SIZE value: "64" -libsDir: - enabled: true - path: "/libs" - size: 2Gi - files: - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublasLt.so.12.2.5.6" - file: "libcublasLt.so.12.2.5.6" - - path: "/usr/local/cuda-12.2/targets/x86_64-linux/lib/libcublas.so.12.2.5.6" - file: "libcublas.so.12.2.5.6" - initContainer: enabled: true image: "amazon/aws-cli:2.17.62"