fix: merged resource limit affected by resource group remaining

lablup · Sep 6, 2024 · d990267 · d990267
1 parent b49b666
commit d990267
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/react/src/hooks/useResourceLimitAndRemaining.tsx b/react/src/hooks/useResourceLimitAndRemaining.tsx
@@ -2,7 +2,7 @@ import { useSuspendedBackendaiClient } from '.';
 import { Image } from '../components/ImageEnvironmentSelectFormItems';
 import { AUTOMATIC_DEFAULT_SHMEM } from '../components/ResourceAllocationFormItems';
 import { addNumberWithUnits, iSizeToSize } from '../helper';
-import { useResourceSlots } from '../hooks/backendai';
+import { ResourceSlotName, useResourceSlots } from '../hooks/backendai';
 import { useSuspenseTanQuery } from './reactQueryAlias';
 import _ from 'lodash';
 import { useMemo } from 'react';
@@ -47,9 +47,7 @@ export interface MergedResourceLimits {
 }
 
 type ResourceLimits = {
-  cpu: string | 'Infinity' | 'NaN';
-  mem: string | 'Infinity' | 'NaN';
-  'cuda.device': string | 'Infinity' | 'NaN';
+  [key in ResourceSlotName]?: string | 'Infinity' | 'NaN';
 };
 type ResourceUsing = ResourceLimits;
 type ResourceRemaining = ResourceLimits;
@@ -237,7 +235,7 @@ export const useResourceLimitAndRemaining = ({
                 : baiClient._config.maxCPUCoresPerContainer,
               limitParser(checkPresetInfo?.keypair_limits.cpu),
               limitParser(checkPresetInfo?.group_limits.cpu),
-              resourceGroupResourceSize?.cpu,
+              // resourceGroupResourceSize?.cpu,
             ]),
           },
     mem:
@@ -273,8 +271,8 @@ export const useResourceLimitAndRemaining = ({
                     'g',
                   )?.number,
                 // scaling group all mem (using + remaining), string type
-                resourceGroupResourceSize?.mem &&
-                  iSizeToSize(resourceGroupResourceSize?.mem + '', 'g')?.number,
+                // resourceGroupResourceSize?.mem &&
+                //   iSizeToSize(resourceGroupResourceSize?.mem + '', 'g')?.number,
               ]) + 'g',
           },
     // shmem:
@@ -306,8 +304,12 @@ export const useResourceLimitAndRemaining = ({
           ),
           max: _.min([
             perContainerLimit || 8,
+            limitParser(
+              checkPresetInfo?.keypair_limits[key as ResourceSlotName],
+            ),
+            limitParser(checkPresetInfo?.group_limits[key as ResourceSlotName]),
             // scaling group all cpu (using + remaining), string type
-            resourceGroupResourceSize.accelerators[key],
+            // resourceGroupResourceSize.accelerators[key],
           ]),
         };
         return result;