Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add software backend, document singularity URLs should be ORAS #7

Merged
merged 6 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified project/excel/omni_schema.xlsx
Binary file not shown.
1 change: 1 addition & 0 deletions project/graphql/omni_schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ type Benchmark
description: String
version: String!
benchmarker: String!
softwareBackend: String!
storage: String!
storageApi: StorageAPIEnum!
softwareEnvironments: [SoftwareEnvironment]!
Expand Down
2 changes: 1 addition & 1 deletion project/jsonld/omni_schema.context.jsonld
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
25 changes: 20 additions & 5 deletions project/jsonld/omni_schema.jsonld
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -759,6 +773,7 @@
"description",
"version",
"benchmarker",
"software_backend",
"storage",
"storage_api",
"software_environments",
Expand Down Expand Up @@ -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",
Expand Down
16 changes: 13 additions & 3 deletions project/jsonschema/omni_schema.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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.",
Expand All @@ -53,6 +57,7 @@
"required": [
"version",
"benchmarker",
"software_backend",
"storage",
"storage_api",
"software_environments",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -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.",
Expand All @@ -328,6 +337,7 @@
"required": [
"version",
"benchmarker",
"software_backend",
"storage",
"storage_api",
"software_environments",
Expand Down
Loading
Loading