[Bug] fix RayActorOptionSpec.items.spec.serveConfig.deployments.rayAc…

…torOptions.memory int32 data type (#1220) fix RayActorOptionSpec.items.spec.serveConfig.deployments.rayActorOptions.memory int32 data type
ray-project · Jul 7, 2023 · ddb5e52 · ddb5e52
1 parent 1ee5f95
commit ddb5e52
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git a/helm-chart/kuberay-operator/crds/ray.io_rayservices.yaml b/helm-chart/kuberay-operator/crds/ray.io_rayservices.yaml
@@ -12113,14 +12113,14 @@ spec:
                             acceleratorType:
                               type: string
                             memory:
-                              format: int32
+                              format: int64
                               type: integer
                             numCpus:
                               type: number
                             numGpus:
                               type: number
                             objectStoreMemory:
-                              format: int32
+                              format: int64
                               type: integer
                             resources:
                               type: string

diff --git a/proto/go_client/serve.pb.go b/proto/go_client/serve.pb.go
diff --git a/proto/kuberay_api.swagger.json b/proto/kuberay_api.swagger.json
@@ -1629,13 +1629,13 @@
           "description": "The number of GPUs required by the deployment's application per replica."
         },
         "memoryPerActor": {
-          "type": "integer",
-          "format": "int32",
+          "type": "string",
+          "format": "uint64",
           "description": "Restrict the heap memory usage of each replica."
         },
         "objectStoreMemoryPerActor": {
-          "type": "integer",
-          "format": "int32",
+          "type": "string",
+          "format": "uint64",
           "description": "Restrict the object store memory used per replica when creating objects."
         },
         "customResource": {

diff --git a/proto/serve.proto b/proto/serve.proto
@@ -220,9 +220,9 @@ message ActorOptions {
   // The number of GPUs required by the deployment's application per replica.
   double gpus_per_actor = 3;
   // Restrict the heap memory usage of each replica.
-  int32 memory_per_actor = 4;
+  uint64 memory_per_actor = 4;
   // Restrict the object store memory used per replica when creating objects.
-  int32 object_store_memory_per_actor = 5;
+  uint64 object_store_memory_per_actor = 5;
   // The custom resources required by each replica.
   string custom_resource = 6;
   // Forces replicas to run on nodes with the specified accelerator type.

diff --git a/proto/swagger/serve.swagger.json b/proto/swagger/serve.swagger.json
@@ -379,13 +379,13 @@
           "description": "The number of GPUs required by the deployment's application per replica."
         },
         "memoryPerActor": {
-          "type": "integer",
-          "format": "int32",
+          "type": "string",
+          "format": "uint64",
           "description": "Restrict the heap memory usage of each replica."
         },
         "objectStoreMemoryPerActor": {
-          "type": "integer",
-          "format": "int32",
+          "type": "string",
+          "format": "uint64",
           "description": "Restrict the object store memory used per replica when creating objects."
         },
         "customResource": {

diff --git a/ray-operator/apis/ray/v1alpha1/rayservice_types.go b/ray-operator/apis/ray/v1alpha1/rayservice_types.go
@@ -87,8 +87,8 @@ type RayActorOptionSpec struct {
 	RuntimeEnv        string   `json:"runtimeEnv,omitempty"`
 	NumCpus           *float64 `json:"numCpus,omitempty"`
 	NumGpus           *float64 `json:"numGpus,omitempty"`
-	Memory            *int32   `json:"memory,omitempty"`
-	ObjectStoreMemory *int32   `json:"objectStoreMemory,omitempty"`
+	Memory            *uint64  `json:"memory,omitempty"`
+	ObjectStoreMemory *uint64  `json:"objectStoreMemory,omitempty"`
 	Resources         string   `json:"resources,omitempty"`
 	AcceleratorType   string   `json:"acceleratorType,omitempty"`
 }

diff --git a/ray-operator/apis/ray/v1alpha1/zz_generated.deepcopy.go b/ray-operator/apis/ray/v1alpha1/zz_generated.deepcopy.go
diff --git a/ray-operator/config/crd/bases/ray.io_rayservices.yaml b/ray-operator/config/crd/bases/ray.io_rayservices.yaml
@@ -12113,14 +12113,14 @@ spec:
                             acceleratorType:
                               type: string
                             memory:
-                              format: int32
+                              format: int64
                               type: integer
                             numCpus:
                               type: number
                             numGpus:
                               type: number
                             objectStoreMemory:
-                              format: int32
+                              format: int64
                               type: integer
                             resources:
                               type: string

diff --git a/ray-operator/controllers/ray/utils/serve_api_models.go b/ray-operator/controllers/ray/utils/serve_api_models.go
@@ -89,8 +89,8 @@ type RayActorOptionSpec struct {
 	RuntimeEnv        map[string]interface{} `json:"runtime_env,omitempty"`
 	NumCpus           *float64               `json:"num_cpus,omitempty"`
 	NumGpus           *float64               `json:"num_gpus,omitempty"`
-	Memory            *int32                 `json:"memory,omitempty"`
-	ObjectStoreMemory *int32                 `json:"object_store_memory,omitempty"`
+	Memory            *uint64                `json:"memory,omitempty"`
+	ObjectStoreMemory *uint64                `json:"object_store_memory,omitempty"`
 	Resources         map[string]interface{} `json:"resources,omitempty"`
 	AcceleratorType   string                 `json:"accelerator_type,omitempty"`
 }