refactor: rename memory to system_memory

AllenNeuralDynamics · Sep 26, 2024 · 3909043 · 3909043
1 parent 59090b0
commit 3909043
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/examples/processing.json b/examples/processing.json
@@ -23,7 +23,7 @@
                "cpu": "Intel Core i7",
                "cpu_cores": 8,
                "gpu": "NVIDIA GeForce RTX 3080",
-               "memory": {
+               "system_memory": {
                   "value": "32.0",
                   "unit": "Gigabyte"
                },
@@ -33,42 +33,42 @@
                },
                "cpu_usage": [
                   {
-                     "timestamp": "2024-09-13T00:00:00",
+                     "timestamp": "2024-09-13T00:00:00-07:00",
                      "usage": 75.5
                   },
                   {
-                     "timestamp": "2024-09-13T00:00:00",
+                     "timestamp": "2024-09-13T00:00:00-07:00",
                      "usage": 80.0
                   }
                ],
                "gpu_usage": [
                   {
-                     "timestamp": "2024-09-13T00:00:00",
+                     "timestamp": "2024-09-13T00:00:00-07:00",
                      "usage": 60.0
                   },
                   {
-                     "timestamp": "2024-09-13T00:00:00",
+                     "timestamp": "2024-09-13T00:00:00-07:00",
                      "usage": 65.5
                   }
                ],
                "ram_usage": [
                   {
-                     "timestamp": "2024-09-13T00:00:00",
+                     "timestamp": "2024-09-13T00:00:00-07:00",
                      "usage": 70.0
                   },
                   {
-                     "timestamp": "2024-09-13T00:00:00",
+                     "timestamp": "2024-09-13T00:00:00-07:00",
                      "usage": 72.5
                   }
                ],
                "usage_unit": "percent",
                "file_io_usage": [
                   {
-                     "timestamp": "2024-09-13T00:00:00",
+                     "timestamp": "2024-09-13T00:00:00-07:00",
                      "usage": 5.5
                   },
                   {
-                     "timestamp": "2024-09-13T00:00:00",
+                     "timestamp": "2024-09-13T00:00:00-07:00",
                      "usage": 6.0
                   }
                ],

diff --git a/examples/processing.py b/examples/processing.py
@@ -61,7 +61,7 @@
                     cpu="Intel Core i7",
                     cpu_cores=8,
                     gpu="NVIDIA GeForce RTX 3080",
-                    memory=MemoryValue(value=32.0, unit=MemoryUnit.GB),
+                    system_memory=MemoryValue(value=32.0, unit=MemoryUnit.GB),
                     ram=MemoryValue(value=16.0, unit=MemoryUnit.GB),
                     cpu_usage=timestamped_cpu_usage,
                     gpu_usage=timestamped_gpu_usage,

diff --git a/src/aind_data_schema/core/processing.py b/src/aind_data_schema/core/processing.py
@@ -33,7 +33,7 @@ class ResourceUsage(AindModel):
     cpu: Optional[str] = Field(default=None, title="CPU name")
     cpu_cores: Optional[int] = Field(default=None, title="CPU cores")
     gpu: Optional[str] = Field(default=None, title="GPU name")
-    memory: Optional[MemoryValue] = Field(default=None, title="System memory")
+    system_memory: Optional[MemoryValue] = Field(default=None, title="System memory")
     ram: Optional[MemoryValue] = Field(default=None, title="System RAM")
 
     cpu_usage: Optional[List[ResourceTimestamped]] = Field(default=None, title="CPU usage")