support gpus: all alias

Signed-off-by: Nicolas De Loof <[email protected]>

loader/loader_test.go

@@ -3581,3 +3581,29 @@ services:
 		},
 	})
 }
+<<<<<<< Updated upstream
+=======
+
+func TestOmitEmptyDNS(t *testing.T) {
+	p, err := loadYAML(`
+name: load-empty-dsn
+services:
+  test:
+    dns: ${UNSET_VAR}
+`)
+	assert.NilError(t, err)
+	assert.Equal(t, len(p.Services["test"].DNS), 0)
+}
+
+func TestAllGPUS(t *testing.T) {
+	p, err := loadYAML(`
+name: load-all-gpus
+services:
+  test:
+    gpus: all
+`)
+	assert.NilError(t, err)
+	assert.Equal(t, len(p.Services["test"].Gpus), 1)
+	assert.Equal(t, p.Services["test"].Gpus[0].Count, types.DeviceCount(-1))
+}
+>>>>>>> Stashed changes

schema/compose-spec.json

@@ -654,19 +654,23 @@
 
     "gpus": {
       "id": "#/definitions/gpus",
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "capabilities": {"$ref": "#/definitions/list_of_strings"},
-          "count": {"type": ["string", "integer"]},
-          "device_ids": {"$ref": "#/definitions/list_of_strings"},
-          "driver":{"type": "string"},
-          "options":{"$ref": "#/definitions/list_or_dict"}
-        },
-        "additionalProperties": false,
-        "patternProperties": {"^x-": {}}
-      }
+      "oneOf": [
+        {"type": "string", "enum": ["all"]},
+        {"type": "array",
+         "items": {
+          "type": "object",
+            "properties": {
+              "capabilities": {"$ref": "#/definitions/list_of_strings"},
+              "count": {"type": ["string", "integer"]},
+              "device_ids": {"$ref": "#/definitions/list_of_strings"},
+              "driver":{"type": "string"},
+              "options":{"$ref": "#/definitions/list_or_dict"}
+            }
+          },
+          "additionalProperties": false,
+          "patternProperties": {"^x-": {}}
+        }
+      ]
     },
 
     "include": {

transform/canonical.go

@@ -31,6 +31,7 @@ func init() {
 	transformers["services.*.depends_on"] = transformDependsOn
 	transformers["services.*.env_file"] = transformEnvFile
 	transformers["services.*.extends"] = transformExtends
+	transformers["services.*.gpus"] = transformGpus
 	transformers["services.*.networks"] = transformServiceNetworks
 	transformers["services.*.volumes.*"] = transformVolumeMount
 	transformers["services.*.devices.*"] = transformDeviceMapping

transform/gpus.go

@@ -0,0 +1,38 @@
+/*
+   Copyright 2020 The Compose Specification Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package transform
+
+import (
+	"fmt"
+
+	"github.com/compose-spec/compose-go/v2/tree"
+)
+
+func transformGpus(data any, p tree.Path, ignoreParseError bool) (any, error) {
+	switch v := data.(type) {
+	case []any:
+		return transformSequence(v, p, ignoreParseError)
+	case string:
+		return []any{
+			map[string]any{
+				"count": "all",
+			},
+		}, nil
+	default:
+		return data, fmt.Errorf("%s: invalid type %T for gpus", p, v)
+	}
+}