Add software backend, document singularity URLs should be ORAS

omnibenchmark · Aug 6, 2024 · ad158c6 · ad158c6
1 parent 07b3a77
commit ad158c6
Show file tree

Hide file tree

Showing 12 changed files with 247 additions and 181 deletions.
diff --git a/project/excel/omni_schema.xlsx b/project/excel/omni_schema.xlsx
diff --git a/project/graphql/omni_schema.graphql b/project/graphql/omni_schema.graphql
@@ -5,6 +5,7 @@ type Benchmark
     description: String
     version: String!
     benchmarker: String!
+    softwareBackend: String!
     storage: String!
     storageApi: StorageAPIEnum!
     softwareEnvironments: [SoftwareEnvironment]!

diff --git a/project/jsonld/omni_schema.context.jsonld b/project/jsonld/omni_schema.context.jsonld
@@ -1,7 +1,7 @@
 {
    "comments": {
       "description": "Auto generated by LinkML jsonld context generator",
-      "generation_date": "2024-06-18T18:10:53",
+      "generation_date": "2024-08-06T14:53:16",
       "source": "omni_schema.yaml"
    },
    "@context": {

diff --git a/project/jsonld/omni_schema.jsonld b/project/jsonld/omni_schema.jsonld
@@ -431,6 +431,20 @@
       "required": true,
       "@type": "SlotDefinition"
     },
+    {
+      "name": "software_backend",
+      "definition_uri": "https://w3id.org/omnibenchmark/omni-schema/software_backend",
+      "description": "The software backend used to run the benchmark, e.g. whether apptainer, envmodules, or conda.",
+      "from_schema": "https://w3id.org/omnibenchmark/omni-schema",
+      "slot_uri": "https://w3id.org/omnibenchmark/omni-schema/software_backend",
+      "owner": "Benchmark",
+      "domain_of": [
+        "Benchmark"
+      ],
+      "range": "string",
+      "required": true,
+      "@type": "SlotDefinition"
+    },
     {
       "name": "storage",
       "definition_uri": "https://w3id.org/omnibenchmark/omni-schema/storage",
@@ -448,7 +462,7 @@
     {
       "name": "storage_api",
       "definition_uri": "https://w3id.org/omnibenchmark/omni-schema/storage_api",
-      "description": "The type of the storage API (i.e. S3)",
+      "description": "The type of the storage API, i.e. S3.",
       "from_schema": "https://w3id.org/omnibenchmark/omni-schema",
       "slot_uri": "https://w3id.org/omnibenchmark/omni-schema/storage_api",
       "owner": "Benchmark",
@@ -704,7 +718,7 @@
     {
       "name": "apptainer",
       "definition_uri": "https://w3id.org/omnibenchmark/omni-schema/apptainer",
-      "description": "Apptainer image URL.",
+      "description": "Apptainer image static ORAS url, including name:tag.",
       "from_schema": "https://w3id.org/omnibenchmark/omni-schema",
       "slot_uri": "https://w3id.org/omnibenchmark/omni-schema/apptainer",
       "owner": "SoftwareEnvironment",
@@ -759,6 +773,7 @@
         "description",
         "version",
         "benchmarker",
+        "software_backend",
         "storage",
         "storage_api",
         "software_environments",
@@ -882,9 +897,9 @@
   ],
   "metamodel_version": "1.7.0",
   "source_file": "omni_schema.yaml",
-  "source_file_date": "2024-06-18T18:10:43",
-  "source_file_size": 4820,
-  "generation_date": "2024-06-18T18:10:54",
+  "source_file_date": "2024-08-06T14:49:47",
+  "source_file_size": 5054,
+  "generation_date": "2024-08-06T14:53:16",
   "@type": "SchemaDefinition",
   "@context": [
     "project/jsonld/omni_schema.context.jsonld",

diff --git a/project/jsonschema/omni_schema.schema.json b/project/jsonschema/omni_schema.schema.json
@@ -24,6 +24,10 @@
                     "description": "A human-readable name for a thing",
                     "type": "string"
                 },
+                "software_backend": {
+                    "description": "The software backend used to run the benchmark, e.g. whether apptainer, envmodules, or conda.",
+                    "type": "string"
+                },
                 "software_environments": {
                     "description": "Dictionary of software environments keyed by their identifiers",
                     "items": {
@@ -43,7 +47,7 @@
                 },
                 "storage_api": {
                     "$ref": "#/$defs/StorageAPIEnum",
-                    "description": "The type of the storage API (i.e. S3)"
+                    "description": "The type of the storage API, i.e. S3."
                 },
                 "version": {
                     "description": "The version of the benchmark.",
@@ -53,6 +57,7 @@
             "required": [
                 "version",
                 "benchmarker",
+                "software_backend",
                 "storage",
                 "storage_api",
                 "software_environments",
@@ -188,7 +193,7 @@
             "description": "Contains snapshots of the software environment required for the modules to run.",
             "properties": {
                 "apptainer": {
-                    "description": "Apptainer image URL.",
+                    "description": "Apptainer image static ORAS url, including name:tag.",
                     "type": "string"
                 },
                 "conda": {
@@ -299,6 +304,10 @@
             "description": "A human-readable name for a thing",
             "type": "string"
         },
+        "software_backend": {
+            "description": "The software backend used to run the benchmark, e.g. whether apptainer, envmodules, or conda.",
+            "type": "string"
+        },
         "software_environments": {
             "description": "Dictionary of software environments keyed by their identifiers",
             "items": {
@@ -318,7 +327,7 @@
         },
         "storage_api": {
             "$ref": "#/$defs/StorageAPIEnum",
-            "description": "The type of the storage API (i.e. S3)"
+            "description": "The type of the storage API, i.e. S3."
         },
         "version": {
             "description": "The version of the benchmark.",
@@ -328,6 +337,7 @@
     "required": [
         "version",
         "benchmarker",
+        "software_backend",
         "storage",
         "storage_api",
         "software_environments",