Merge pull request #74 from 2i2c-org/bunch

Get staging to a working evaluation
2i2c-org · Feb 1, 2025 · 3d145d5 · 3d145d5
2 parents c472ac6 + 69ae94f
commit 3d145d5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/helm-charts/app/Chart.yaml b/helm-charts/app/Chart.yaml
@@ -7,7 +7,7 @@ appVersion: "1.0"
 
 dependencies:
   - name: frx-challenges
-    version: 0.0.1-0.dev.git.513.hf8578c2
+    version: 0.0.1-0.dev.git.525.h16535ff
     repository: https://2i2c.org/frx-challenges-helm-chart/
   # ingress-nginx for a k8s Ingress resource controller that routes traffic from
   # a single IP entrypoint to various services exposed via k8s Ingress resources

diff --git a/helm-charts/app/common.values.yaml b/helm-charts/app/common.values.yaml
@@ -8,6 +8,10 @@ frx-challenges:
     storageClassName: premium-rwo
     storage: 10Gi
 
+  dind:
+    pvc:
+      storageClassName: premium-rwo
+
   adminUsers:
     - GeorgianaElena
     - yuvipanda
@@ -39,7 +43,7 @@ frx-challenges:
       # Make sure OAuth2 redirect URI is https, not http
       ACCOUNT_DEFAULT_HTTP_PROTOCOL: https
       # Image is built from https://github.com/janelia-cellmap/cellmap-segmentation-challenge
-      EVALUATOR_DOCKER_IMAGE: quay.io/2i2c/cellmap-segmentation-challenge-evaluator:5e4d09cc4870
+      EVALUATOR_DOCKER_IMAGE: quay.io/2i2c/cellmap-segmentation-challenge-evaluator:f70f7f5051aa
       EVALUATOR_DOCKER_CMD:
         - "csc"
         - "evaluate"

diff --git a/helm-charts/app/staging/staging.values.yaml b/helm-charts/app/staging/staging.values.yaml
@@ -11,11 +11,11 @@ frx-challenges:
       # Guarantee 32G of RAM and 6 CPUs
       # this is where all our actual evaluations run
       requests:
-        memory: 32Gi
-        cpu: 6
+        memory: 300Gi
+        cpu: 40
       limits:
-        memory: 32Gi
-        cpu: 6
+        memory: 320Gi
+        cpu: 42
 
   evaluator:
     resources:
@@ -32,9 +32,13 @@ frx-challenges:
       CSRF_TRUSTED_ORIGINS:
         - https://staging.cellmapchallenge.2i2c.cloud
       DEBUG: True
-      EVALUATOR_DOCKER_CONTAINER_CPU_LIMIT: 2
-      # Set this to 24G now to see how much it actually gets to
-      EVALUATOR_DOCKER_CONTAINER_MEMORY_LIMIT: 25769803776
+      EVALUATOR_DOCKER_CONTAINER_CPU_LIMIT: 40
+      # Set this to 300G now to see how much it actually gets to
+      EVALUATOR_DOCKER_CONTAINER_MEMORY_LIMIT: 375809638400
+      EVALUATOR_DOCKER_CONTAINER_ENV:
+        MAX_MAIN_THREADS: "8"
+        MAX_LABEL_THREADS: "8"
+        MAX_INSTANCE_THREADS: "8"
       SOCIALACCOUNT_PROVIDERS:
         github:
           APP: