remove cpu cores from config

Author: dnsi0

.env.example

@@ -69,9 +69,9 @@ export P2P_FILTER_ANNOUNCED_ADDRESSES=
 # CPU, RAM, and disk are per-env exclusive: inUse tracked only within the environment where the job runs.
 # A global check ensures the aggregate usage across all environments does not exceed physical capacity.
 # GPUs are shared-exclusive: if a job on envA uses gpu0, it shows as in-use on envB too.
-# CPU cores can be hard-partitioned per environment via cpuCores (e.g., envA gets cores 0-3, envB gets 4-7).
+# CPU cores are automatically partitioned across environments based on each env's cpu.total.
 # CPU and RAM defaults are auto-detected from the system when not configured.
-# export DOCKER_COMPUTE_ENVIRONMENTS='[{"socketPath":"/var/run/docker.sock","environments":[{"id":"envA","cpuCores":[0,1,2,3],"storageExpiry":604800,"maxJobDuration":3600,"minJobDuration":60,"resources":[{"id":"cpu","total":4,"max":4,"min":1,"type":"cpu"},{"id":"ram","total":16,"max":16,"min":1,"type":"ram"},{"id":"disk","total":500,"max":500,"min":10,"type":"disk"},{"id":"gpu0","total":1,"max":1,"min":0,"type":"gpu","init":{"deviceRequests":{"Driver":"nvidia","DeviceIDs":["0"],"Capabilities":[["gpu"]]}}}],"fees":{"1":[{"feeToken":"0x123","prices":[{"id":"cpu","price":1},{"id":"ram","price":0.1},{"id":"disk","price":0.01},{"id":"gpu0","price":5}]}]}}]}]'
+# export DOCKER_COMPUTE_ENVIRONMENTS='[{"socketPath":"/var/run/docker.sock","environments":[{"id":"envA","storageExpiry":604800,"maxJobDuration":3600,"minJobDuration":60,"resources":[{"id":"cpu","total":4,"max":4,"min":1,"type":"cpu"},{"id":"ram","total":16,"max":16,"min":1,"type":"ram"},{"id":"disk","total":500,"max":500,"min":10,"type":"disk"},{"id":"gpu0","total":1,"max":1,"min":0,"type":"gpu","init":{"deviceRequests":{"Driver":"nvidia","DeviceIDs":["0"],"Capabilities":[["gpu"]]}}}],"fees":{"1":[{"feeToken":"0x123","prices":[{"id":"cpu","price":1},{"id":"ram","price":0.1},{"id":"disk","price":0.01},{"id":"gpu0","price":5}]}]}}]}]'
 export DOCKER_COMPUTE_ENVIRONMENTS=
 
 

src/@types/C2D/C2D.ts

@@ -150,7 +150,6 @@ export interface C2DEnvironmentConfig {
   access?: ComputeAccessList
   free?: ComputeEnvironmentFreeOptions
   resources?: ComputeResource[]
-  cpuCores?: number[] // explicit physical CPU core indices for this environment
 }
 
 export interface C2DDockerConfig {

src/components/c2d/compute_engine_docker.ts

@@ -272,20 +272,25 @@ export class C2DEngineDocker extends C2DEngine {
         '-' +
         create256Hash(JSON.stringify(env.fees) + envIdSuffix)
 
-      // Per-environment CPU core affinity
-      if (envDef.cpuCores && envDef.cpuCores.length > 0) {
-        this.envCpuCoresMap.set(env.id, envDef.cpuCores)
-        CORE_LOGGER.info(
-          `CPU affinity: environment ${env.id} cores [${envDef.cpuCores.join(',')}]`
-        )
-      }
-
       this.envs.push(env)
       CORE_LOGGER.info(
         `Engine ${this.getC2DConfig().hash}: created environment ${env.id} (index=${envIdx}, resources=${envResources.map((r) => r.id).join(',')})`
       )
     }
 
+    let cpuOffset = 0
+    for (const env of this.envs) {
+      const cpuRes = this.getResource(env.resources, 'cpu')
+      if (cpuRes && cpuRes.total > 0) {
+        const cores = Array.from({ length: cpuRes.total }, (_, i) => cpuOffset + i)
+        this.envCpuCoresMap.set(env.id, cores)
+        CORE_LOGGER.info(
+          `CPU affinity: environment ${env.id} cores ${cores[0]}-${cores[cores.length - 1]} (offset=${cpuOffset}, total=${cpuRes.total})`
+        )
+        cpuOffset += cpuRes.total
+      }
+    }
+
     // Rebuild CPU allocations from running containers (handles node restart)
     await this.rebuildCpuAllocations()
 

src/utils/config/schemas.ts

@@ -175,8 +175,7 @@ export const C2DEnvironmentConfigSchema = z
       })
       .optional(),
     free: ComputeEnvironmentFreeOptionsSchema.optional(),
-    resources: z.array(ComputeResourceSchema).optional(),
-    cpuCores: z.array(z.number().int().min(0)).optional()
+    resources: z.array(ComputeResourceSchema).optional()
   })
   .refine(
     (data) =>
@@ -206,21 +205,6 @@ export const C2DDockerConfigSchema = z.array(
       paymentClaimInterval: z.number().int().optional(),
       environments: z.array(C2DEnvironmentConfigSchema).min(1)
     })
-    .refine(
-      (data) => {
-        // CPU core assignments must not overlap across environments
-        const seenCores = new Set<number>()
-        for (const env of data.environments) {
-          if (!env.cpuCores) continue
-          for (const core of env.cpuCores) {
-            if (seenCores.has(core)) return false
-            seenCores.add(core)
-          }
-        }
-        return true
-      },
-      { message: 'CPU core assignments must not overlap across environments' }
-    )
 )
 
 export const C2DClusterInfoSchema = z.object({