Merge branch 'main' of https://github.com/worldcoin/iris-mpc into ps/…

…feat/partial-matches
worldcoin · Oct 16, 2024 · f349a4c · f349a4c
2 parents 7e1683b + f90e7ae
commit f349a4c
Show file tree

Hide file tree

Showing 20 changed files with 243 additions and 100 deletions.
diff --git a/deploy/prod/common-values-iris-mpc.yaml b/deploy/prod/common-values-iris-mpc.yaml
@@ -1,4 +1,4 @@
-image: "ghcr.io/worldcoin/iris-mpc:v0.8.23"
+image: "ghcr.io/worldcoin/iris-mpc:v0.8.25"
 
 environment: prod
 replicaCount: 1
@@ -28,6 +28,12 @@ readinessProbe:
     path: /health
     port: health
 
+startupProbe:
+  enabled: true
+  httpGet:
+    path: /health
+    port: health
+
 resources:
   limits:
     cpu: 192
@@ -63,3 +69,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/common-values-upgrade-server-left.yaml b/deploy/prod/common-values-upgrade-server-left.yaml
@@ -1,4 +1,4 @@
-image: "ghcr.io/worldcoin/iris-mpc:v0.8.23"
+image: "ghcr.io/worldcoin/iris-mpc:v0.8.25"
 
 environment: prod
 replicaCount: 1
@@ -17,6 +17,12 @@ ports:
     name: health
     protocol: TCP
 
+startupProbe:
+  enabled: true
+  httpGet:
+    path: /health
+    port: health
+
 livenessProbe:
   httpGet:
     path: /health
@@ -42,6 +48,7 @@ imagePullSecrets:
 
 nodeSelector:
   kubernetes.io/arch: amd64
+  beta.kubernetes.io/instance-type: t3.2xlarge
 
 hostNetwork: true
 

diff --git a/deploy/prod/common-values-upgrade-server-right.yaml b/deploy/prod/common-values-upgrade-server-right.yaml
@@ -1,4 +1,4 @@
-image: "ghcr.io/worldcoin/iris-mpc:v0.8.23"
+image: "ghcr.io/worldcoin/iris-mpc:v0.8.25"
 
 environment: prod
 replicaCount: 1
@@ -17,6 +17,12 @@ ports:
     name: health
     protocol: TCP
 
+startupProbe:
+  enabled: true
+  httpGet:
+    path: /health
+    port: health
+
 livenessProbe:
   httpGet:
     path: /health
@@ -42,6 +48,7 @@ imagePullSecrets:
 
 nodeSelector:
   kubernetes.io/arch: amd64
+  beta.kubernetes.io/instance-type: t3.2xlarge
 
 hostNetwork: true
 

diff --git a/deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml b/deploy/prod/smpcv2-0-prod/values-iris-mpc.yaml
@@ -5,9 +5,6 @@ env:
   - name: NCCL_SOCKET_IFNAME
     value: "eth0"
 
-  - name: NCCL_DEBUG
-    value: "trace"
-
   - name: NCCL_COMM_ID
     value: "iris-mpc-node.1.smpcv2.worldcoin.org:4000"
 
@@ -80,6 +77,12 @@ env:
   - name: SMPC__MAX_BATCH_SIZE
     value: "64"
 
+  - name: SMPC__FAKE_DB_SIZE
+    value: "6000000"
+
+  - name: SMPC__DISABLE_PERSISTENCE
+    value: "true"
+
 initContainer:
   enabled: true
   image: "amazon/aws-cli:2.17.62"
@@ -97,7 +100,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 <<EOF
       {
@@ -118,6 +121,10 @@ initContainer:
       }
       EOF
       )
-      
+
       # Execute AWS CLI command with the generated JSON
       aws route53 change-resource-record-sets --hosted-zone-id "$HOSTED_ZONE_ID" --change-batch "$BATCH_JSON"
+
+      cd /libs
+      aws s3 cp s3://wf-smpcv2-prod-libs/libcublas.so.12.2.5.6 .
+      aws s3 cp s3://wf-smpcv2-prod-libs/libcublasLt.so.12.2.5.6 .
diff --git a/deploy/prod/smpcv2-1-prod/values-iris-mpc.yaml b/deploy/prod/smpcv2-1-prod/values-iris-mpc.yaml
@@ -8,9 +8,6 @@ env:
   - name: NCCL_SOCKET_IFNAME
     value: "eth0"
 
-  - name: NCCL_DEBUG
-    value: "trace"
-
   - name: NCCL_COMM_ID
     value: "iris-mpc-node.1.smpcv2.worldcoin.org:4000"
 
@@ -79,3 +76,21 @@ env:
 
   - name: SMPC__MAX_BATCH_SIZE
     value: "64"
+
+  - name: SMPC__FAKE_DB_SIZE
+    value: "6000000"
+
+  - name: SMPC__DISABLE_PERSISTENCE
+    value: "true"
+
+initContainer:
+  enabled: true
+  image: "amazon/aws-cli:2.17.62"
+  name: "iris-mpc-copy-cuda-libs"
+  configMap:
+    init.sh: |
+      #!/usr/bin/env bash
+
+      cd /libs
+      aws s3 cp s3://wf-smpcv2-prod-libs/libcublas.so.12.2.5.6 .
+      aws s3 cp s3://wf-smpcv2-prod-libs/libcublasLt.so.12.2.5.6 .
diff --git a/deploy/prod/smpcv2-2-prod/values-iris-mpc.yaml b/deploy/prod/smpcv2-2-prod/values-iris-mpc.yaml
@@ -8,9 +8,6 @@ env:
   - name: NCCL_SOCKET_IFNAME
     value: "eth0"
 
-  - name: NCCL_DEBUG
-    value: "trace"
-
   - name: NCCL_COMM_ID
     value: "iris-mpc-node.1.smpcv2.worldcoin.org:4000"
 
@@ -79,3 +76,21 @@ env:
 
   - name: SMPC__MAX_BATCH_SIZE
     value: "64"
+
+  - name: SMPC__FAKE_DB_SIZE
+    value: "6000000"
+
+  - name: SMPC__DISABLE_PERSISTENCE
+    value: "true"
+
+initContainer:
+  enabled: true
+  image: "amazon/aws-cli:2.17.62"
+  name: "iris-mpc-copy-cuda-libs"
+  configMap:
+    init.sh: |
+      #!/usr/bin/env bash
+
+      cd /libs
+      aws s3 cp s3://wf-smpcv2-prod-libs/libcublas.so.12.2.5.6 .
+      aws s3 cp s3://wf-smpcv2-prod-libs/libcublasLt.so.12.2.5.6 .
diff --git a/deploy/stage/common-values-iris-mpc.yaml b/deploy/stage/common-values-iris-mpc.yaml
@@ -1,4 +1,4 @@
-image: "ghcr.io/worldcoin/iris-mpc:v0.8.23"
+image: "ghcr.io/worldcoin/iris-mpc:v0.8.25"
 
 environment: stage
 replicaCount: 1
@@ -28,6 +28,12 @@ readinessProbe:
     path: /health
     port: health
 
+startupProbe:
+  enabled: true
+  httpGet:
+    path: /health
+    port: health
+
 resources:
   limits:
     cpu: 31
@@ -61,3 +67,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/common-values-upgrade-server-left.yaml b/deploy/stage/common-values-upgrade-server-left.yaml
@@ -1,4 +1,4 @@
-image: "ghcr.io/worldcoin/iris-mpc:v0.8.23"
+image: "ghcr.io/worldcoin/iris-mpc:v0.8.25"
 
 environment: stage
 replicaCount: 1
@@ -46,6 +46,7 @@ imagePullSecrets:
 
 nodeSelector:
   kubernetes.io/arch: amd64
+  beta.kubernetes.io/instance-type: t3.2xlarge
 
 podSecurityContext:
   runAsUser: 65534

diff --git a/deploy/stage/common-values-upgrade-server-right.yaml b/deploy/stage/common-values-upgrade-server-right.yaml
@@ -1,4 +1,4 @@
-image: "ghcr.io/worldcoin/iris-mpc:v0.8.23"
+image: "ghcr.io/worldcoin/iris-mpc:v0.8.25"
 
 environment: stage
 replicaCount: 1
@@ -46,6 +46,7 @@ imagePullSecrets:
 
 nodeSelector:
   kubernetes.io/arch: amd64
+  beta.kubernetes.io/instance-type: t3.2xlarge
 
 podSecurityContext:
   runAsUser: 65534

diff --git a/deploy/stage/smpcv2-0-stage/values-iris-mpc.yaml b/deploy/stage/smpcv2-0-stage/values-iris-mpc.yaml
@@ -94,7 +94,7 @@ initContainer:
 
       # Set up environment variables
       HOSTED_ZONE_ID=$(aws route53 list-hosted-zones-by-name --dns-name "$PARTY_ID".stage.smpcv2.worldcoin.dev --query "HostedZones[].Id" --output text)
-      
+
       # Generate the JSON content in memory
       BATCH_JSON=$(cat <<EOF
       {
@@ -115,6 +115,10 @@ initContainer:
       }
       EOF
       )
-      
+
       # Execute AWS CLI command with the generated JSON
       aws route53 change-resource-record-sets --hosted-zone-id "$HOSTED_ZONE_ID" --change-batch "$BATCH_JSON"
+
+      cd /libs
+      aws s3 cp s3://wf-smpcv2-stage-libs/libcublas.so.12.2.5.6 .
+      aws s3 cp s3://wf-smpcv2-stage-libs/libcublasLt.so.12.2.5.6 .
diff --git a/deploy/stage/smpcv2-1-stage/values-iris-mpc.yaml b/deploy/stage/smpcv2-1-stage/values-iris-mpc.yaml
@@ -76,3 +76,15 @@ env:
 
   - name: SMPC__MAX_BATCH_SIZE
     value: "64"
+
+initContainer:
+  enabled: true
+  image: "amazon/aws-cli:2.17.62"
+  name: "iris-mpc-copy-cuda-libs"
+  configMap:
+    init.sh: |
+      #!/usr/bin/env bash
+
+      cd /libs
+      aws s3 cp s3://wf-smpcv2-stage-libs/libcublas.so.12.2.5.6 .
+      aws s3 cp s3://wf-smpcv2-stage-libs/libcublasLt.so.12.2.5.6 .
diff --git a/deploy/stage/smpcv2-2-stage/values-iris-mpc.yaml b/deploy/stage/smpcv2-2-stage/values-iris-mpc.yaml
@@ -76,3 +76,15 @@ env:
 
   - name: SMPC__MAX_BATCH_SIZE
     value: "64"
+
+initContainer:
+  enabled: true
+  image: "amazon/aws-cli:2.17.62"
+  name: "iris-mpc-copy-cuda-libs"
+  configMap:
+    init.sh: |
+      #!/usr/bin/env bash
+
+      cd /libs
+      aws s3 cp s3://wf-smpcv2-stage-libs/libcublas.so.12.2.5.6 .
+      aws s3 cp s3://wf-smpcv2-stage-libs/libcublasLt.so.12.2.5.6 .
diff --git a/iris-mpc-common/src/config/mod.rs b/iris-mpc-common/src/config/mod.rs
@@ -69,6 +69,9 @@ pub struct Config {
 
     #[serde(default)]
     pub return_partial_results: bool,
+
+    #[serde(default)]
+    pub disable_persistence: bool,
 }
 
 fn default_processing_timeout_secs() -> u64 {