15370: Merge branch 'main' into 15370-loopback-dispatchcloud

[arvados.git] / sdk / go / arvados / container.go

diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index 8e335f875ce71d529a37bee859ed75477ed64195..d6d75192f01837ee6779fc9c8ea1cea9937c8b7d 100644 (file)
--- a/sdk/go/arvados/container.go
+++ b/sdk/go/arvados/container.go
@@ -37,6 +37,7 @@ type Container struct {
        RuntimeAuthScopes         []string               `json:"runtime_auth_scopes"`
        RuntimeToken              string                 `json:"runtime_token"`
        AuthUUID                  string                 `json:"auth_uuid"`
+       Log                       string                 `json:"log"`
 }
 
 // ContainerRequest is an arvados#container_request resource.
@@ -93,17 +94,20 @@ type Mount struct {
        GitURL            string      `json:"git_url"`         // only if kind=="git_tree"
 }
 
+type CUDARuntimeConstraints struct {
+       DriverVersion      string `json:"driver_version"`
+       HardwareCapability string `json:"hardware_capability"`
+       DeviceCount        int    `json:"device_count"`
+}
+
 // RuntimeConstraints specify a container's compute resources (RAM,
 // CPU) and network connectivity.
 type RuntimeConstraints struct {
-       API                         bool     `json:"API"`
-       RAM                         int64    `json:"ram"`
-       VCPUs                       int      `json:"vcpus"`
-       KeepCacheRAM                int64    `json:"keep_cache_ram"`
-       CUDADriverVersion           string   `json:"cuda_driver_version,omitempty"`
-       CUDACubinHardwareCapability []string `json:"cuda_cubin_hardware_capability,omitempty"`
-       CUDAPTXHardwardCapability   string   `json:"cuda_ptx_hardware_capability,omitempty"`
-       CUDADeviceCount             int      `json:"cuda_device_count,omitempty"`
+       API          bool                   `json:"API"`
+       RAM          int64                  `json:"ram"`
+       VCPUs        int                    `json:"vcpus"`
+       KeepCacheRAM int64                  `json:"keep_cache_ram"`
+       CUDA         CUDARuntimeConstraints `json:"cuda"`
 }
 
 // SchedulingParameters specify a container's scheduling parameters