diff --git a/contributed_definitions/NXadc.nxdl.xml b/contributed_definitions/NXadc.nxdl.xml deleted file mode 100644 index 498c27dbaf..0000000000 --- a/contributed_definitions/NXadc.nxdl.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Analog-to-digital converter component/integrated circuit. - - - - TBD. - - - diff --git a/contributed_definitions/NXcircuit_board.nxdl.xml b/contributed_definitions/NXcircuit_board.nxdl.xml deleted file mode 100644 index 9610f8f43f..0000000000 --- a/contributed_definitions/NXcircuit_board.nxdl.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Circuit board with e.g. ADC and/or DAC electronic components. - - Currently used to store the settings of the so-called magboards used in - Nion electron microscopes but likely this could be a useful base class for - substantially more use cases where details at a deep technical instrument design - level are relevant or important. - - - - TBD by Nion Co. - - - - - diff --git a/contributed_definitions/NXcs_computer.nxdl.xml b/contributed_definitions/NXcs_computer.nxdl.xml index 79a8accf15..6303eb3ae7 100644 --- a/contributed_definitions/NXcs_computer.nxdl.xml +++ b/contributed_definitions/NXcs_computer.nxdl.xml @@ -22,13 +22,8 @@ # For further information, see http://www.nexusformat.org --> - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - Computer science description of a set of computing nodes. + Base class for reporting the description of a computer @@ -57,24 +52,95 @@ - - - Details about (classical) processing units (CPUs) or a system thereof. - - - + - Details about coprocessor/graphic cards/accelerator units or a system thereof. + Details about the system of processing units e.g. (classical) processing units (CPUs), + coprocessor, graphic cards, accelerator processing units or a system of these. + + + Granularizing the processing units. Typical examples, a desktop computer + with a single CPU one could describe using one instance of NXcircuit. + A dual-socket server one could describe using two instances NXcircuit + A server with two dual-socket server nodes one could describe with + four instances of NXcircuit surplus a field with their level in the hierarchy. + + + + General type of the processing unit + + + + + + + + + + + Given name + + + - + - Details about the memory sub-system. + Details about the memory system. + + + Granularizing the components of the memory system. + + + + Qualifier for the type of random access memory. + + + + + + + + + Total amount of data which the medium can hold. + + + + + Given name + + + - + - Details about the I/O sub-system. + Details about the I/O system. + + + Granularizing the components of the I/O system. + + + + Qualifier for the type of storage medium used. + + + + + + + + + + Total amount of data which the medium can hold. + + + + + Given name + + + + diff --git a/contributed_definitions/NXcs_cpu.nxdl.xml b/contributed_definitions/NXcs_cpu.nxdl.xml deleted file mode 100644 index 13357448b3..0000000000 --- a/contributed_definitions/NXcs_cpu.nxdl.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Computer science description of a central processing unit (CPU) of a computer. - - - - Given name of the CPU. Users should be as specific as possible. - - - - diff --git a/contributed_definitions/NXcs_cpu_obj.nxdl.xml b/contributed_definitions/NXcs_cpu_obj.nxdl.xml deleted file mode 100644 index 8a23293212..0000000000 --- a/contributed_definitions/NXcs_cpu_obj.nxdl.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Computer science description of a (central) processing unit (C)PU of a computer. - - - - Given name of the CPU. Users should be as specific as possible. - - - - diff --git a/contributed_definitions/NXcs_cpu_sys.nxdl.xml b/contributed_definitions/NXcs_cpu_sys.nxdl.xml deleted file mode 100644 index 7a05ae8403..0000000000 --- a/contributed_definitions/NXcs_cpu_sys.nxdl.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Computer science description of a system of classical central processing units. - - For coprocessor or graphic cards use :ref:`NXcs_gpu_sys` instead. - - - - Granularizing at the socket level. - - Typical examples follow: A desktop computer with a single CPU one - could describe using one instance of :ref:`NXcs_cpu_obj` inside one instance of - :ref:`NXcs_cpu_sys`. - A dual-socket server one could describe using two instances of :ref:`NXcs_cpu_obj` - inside one instance of :ref:`NXcs_cpu_sys`. - A server with two dual-socket server nodes one could describe - with the above group of one :ref:`NXcs_cpu_sys` into another :ref:`NXcs_cpu_sys`. - - - diff --git a/contributed_definitions/NXcs_gpu.nxdl.xml b/contributed_definitions/NXcs_gpu.nxdl.xml deleted file mode 100644 index 94adaf58ef..0000000000 --- a/contributed_definitions/NXcs_gpu.nxdl.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Computer science description of a graphic processing unit (GPU) of a computer. - - - - Given name of the GPU. Users should be as specific as possible. - - - - diff --git a/contributed_definitions/NXcs_gpu_obj.nxdl.xml b/contributed_definitions/NXcs_gpu_obj.nxdl.xml deleted file mode 100644 index 8353ca814c..0000000000 --- a/contributed_definitions/NXcs_gpu_obj.nxdl.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Computer science description of a graphic processing unit (GPU) of a computer. - - - - Given name of the GPU. Users should be as specific as possible. - - - - diff --git a/contributed_definitions/NXcs_gpu_sys.nxdl.xml b/contributed_definitions/NXcs_gpu_sys.nxdl.xml deleted file mode 100644 index e7fedabd41..0000000000 --- a/contributed_definitions/NXcs_gpu_sys.nxdl.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Computer science description of a system of coprocessor or graphics processors. - - - - Granularizing at the socket level. - - Typical examples follow: A desktop computer with a single GPU one - could describe using one instance of :ref:`NXcs_gpu_obj` inside one instance of - :ref:`NXcs_gpu_sys`. - A desktop computer with two GPUs one could describe using two instances - of :ref:`NXcs_gpu_obj` inside one instance of :ref:`NXcs_gpu_sys`. - A GPU server like nowadays used for artificial intelligence - one could describe as a system with n instances of :ref:`NXcs_gpu_obj` - in one :ref:`NXcs_gpu_sys` or :ref:`NXcs_cpu_sys`. - - - diff --git a/contributed_definitions/NXcs_io_obj.nxdl.xml b/contributed_definitions/NXcs_io_obj.nxdl.xml deleted file mode 100644 index de28eb64ca..0000000000 --- a/contributed_definitions/NXcs_io_obj.nxdl.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Computer science description of a storage object in an input/output system. - - - - Qualifier for the type of storage medium used. - - - - - - - - - - Total amount of data which the medium can hold. - - - - - - Given name to the I/O unit. - - - - diff --git a/contributed_definitions/NXcs_io_sys.nxdl.xml b/contributed_definitions/NXcs_io_sys.nxdl.xml deleted file mode 100644 index 0caf528f04..0000000000 --- a/contributed_definitions/NXcs_io_sys.nxdl.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Computer science description of system of a computer. - - In the same way how a hierarchy of instances of :ref:`NXcs_cpu_obj` or :ref:`NXcs_gpu_obj` - can be defined one can also define a hierarchy of :ref:`NXcs_mm_obj` and :ref:`NXcs_io_obj` - instances. - - - diff --git a/contributed_definitions/NXcs_mm_obj.nxdl.xml b/contributed_definitions/NXcs_mm_obj.nxdl.xml deleted file mode 100644 index 4e69e64e1d..0000000000 --- a/contributed_definitions/NXcs_mm_obj.nxdl.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Computer science description of a memory in a memory system. - - - - Qualifier for the type of random access memory. - - - - - - Total amount of data which the medium can hold. - - - - - - Given name to the I/O unit. - - - - diff --git a/contributed_definitions/NXcs_mm_sys.nxdl.xml b/contributed_definitions/NXcs_mm_sys.nxdl.xml deleted file mode 100644 index 70037fbeaa..0000000000 --- a/contributed_definitions/NXcs_mm_sys.nxdl.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Computer science description of a memory system of a computer. - - In the same way how a hierarchy of instances of :ref:`NXcs_cpu_obj` or :ref:`NXcs_gpu_obj` - can be defined one can also define a hierarchy of :ref:`NXcs_mm_obj` and :ref:`NXcs_io_obj` - instances. - - - - How much physical memory does the system provide. - - - - diff --git a/contributed_definitions/NXdac.nxdl.xml b/contributed_definitions/NXdac.nxdl.xml deleted file mode 100644 index b73dc7abee..0000000000 --- a/contributed_definitions/NXdac.nxdl.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - The symbols used in the schema to specify e.g. dimensions of arrays. - - - - Digital-to-analog converter component/integrated circuit. - - - - TBD. - - - diff --git a/contributed_definitions/NXms_score_results.nxdl.xml b/contributed_definitions/NXms_score_results.nxdl.xml index fa7e9c20e9..40b2e54356 100644 --- a/contributed_definitions/NXms_score_results.nxdl.xml +++ b/contributed_definitions/NXms_score_results.nxdl.xml @@ -646,39 +646,6 @@ exists: optional--> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contributed_definitions/nyaml/NXadc.yaml b/contributed_definitions/nyaml/NXadc.yaml deleted file mode 100644 index d86bd8d566..0000000000 --- a/contributed_definitions/nyaml/NXadc.yaml +++ /dev/null @@ -1,53 +0,0 @@ -category: base -doc: | - Analog-to-digital converter component/integrated circuit. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXadc(NXobject): - value(NX_NUMBER): - unit: NX_UNITLESS - doc: | - TBD. - -# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++ -# 4804d0b6bf4c31429d0e602b482093871010cb40a4e62da03804396faa54d158 -# -# -# -# -# -# -# The symbols used in the schema to specify e.g. dimensions of arrays. -# -# -# -# Analog-to-digital converter component/integrated circuit. -# -# -# -# TBD. -# -# -# diff --git a/contributed_definitions/nyaml/NXcircuit_board.yaml b/contributed_definitions/nyaml/NXcircuit_board.yaml deleted file mode 100644 index c3c3d044e7..0000000000 --- a/contributed_definitions/nyaml/NXcircuit_board.yaml +++ /dev/null @@ -1,67 +0,0 @@ -category: base -doc: | - Circuit board with e.g. ADC and/or DAC electronic components. - - Currently used to store the settings of the so-called magboards used in - Nion electron microscopes but likely this could be a useful base class for - substantially more use cases where details at a deep technical instrument design - level are relevant or important. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcircuit_board(NXobject): - relay(NX_NUMBER): - unit: NX_UNITLESS - doc: | - TBD by Nion Co. - (NXdac): - (NXadc): - -# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++ -# b720e7a4089ff6b669d026c44b1d610485fe501d8ebc34ca5f367e65bf99066a -# -# -# -# -# -# -# The symbols used in the schema to specify e.g. dimensions of arrays. -# -# -# -# Circuit board with e.g. ADC and/or DAC electronic components. -# -# Currently used to store the settings of the so-called magboards used in -# Nion electron microscopes but likely this could be a useful base class for -# substantially more use cases where details at a deep technical instrument design -# level are relevant or important. -# -# -# -# TBD by Nion Co. -# -# -# -# -# diff --git a/contributed_definitions/nyaml/NXcs_computer.yaml b/contributed_definitions/nyaml/NXcs_computer.yaml index 01cf37da32..1517407fea 100644 --- a/contributed_definitions/nyaml/NXcs_computer.yaml +++ b/contributed_definitions/nyaml/NXcs_computer.yaml @@ -1,9 +1,6 @@ category: base doc: | - Computer science description of a set of computing nodes. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. + Base class for reporting the description of a computer type: group NXcs_computer(NXobject): name(NX_CHAR): @@ -25,15 +22,56 @@ NXcs_computer(NXobject): Ideally a (globally) unique persistent identifier of the computer, i.e. the Universally Unique Identifier (UUID) of the computing node. # when it comes to performance monitoring - (NXcs_cpu_sys): + processing(NXobject): doc: | - Details about (classical) processing units (CPUs) or a system thereof. - (NXcs_gpu_sys): - doc: | - Details about coprocessor/graphic cards/accelerator units or a system thereof. - (NXcs_mm_sys): + Details about the system of processing units e.g. (classical) processing units (CPUs), + coprocessor, graphic cards, accelerator processing units or a system of these. + (NXcircuit): + doc: | + Granularizing the processing units. Typical examples, a desktop computer + with a single CPU one could describe using one instance of NXcircuit. + A dual-socket server one could describe using two instances NXcircuit + A server with two dual-socket server nodes one could describe with + four instances of NXcircuit surplus a field with their level in the hierarchy. + type(NX_CHAR): + doc: | + General type of the processing unit + enumeration: [cpu, gpu, fpga, other] + name(NX_CHAR): + doc: | + Given name + memory(NXobject): doc: | - Details about the memory sub-system. - (NXcs_io_sys): + Details about the memory system. + (NXcircuit): + doc: | + Granularizing the components of the memory system. + type(NX_CHAR): + doc: | + Qualifier for the type of random access memory. + enumeration: [ddr4, ddr5] + max_physical_capacity(NX_POSINT): + doc: | + Total amount of data which the medium can hold. + unit: NX_ANY + name(NX_CHAR): + doc: | + Given name + storage(NXobject): doc: | - Details about the I/O sub-system. + Details about the I/O system. + (NXcircuit): + doc: | + Granularizing the components of the I/O system. + type(NX_CHAR): + doc: | + Qualifier for the type of storage medium used. + enumeration: [solid_state_disk, hard_disk, tape] + max_physical_capacity(NX_POSINT): + doc: | + Total amount of data which the medium can hold. + unit: NX_ANY # NX_BIT + name(NX_CHAR): + doc: | + Given name + # NXcircuit inherits fabrication from NXcomponent diff --git a/contributed_definitions/nyaml/NXcs_cpu.yaml b/contributed_definitions/nyaml/NXcs_cpu.yaml deleted file mode 100644 index 2160aa3dd4..0000000000 --- a/contributed_definitions/nyaml/NXcs_cpu.yaml +++ /dev/null @@ -1,54 +0,0 @@ -category: base -doc: | - Computer science description of a central processing unit (CPU) of a computer. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcs_cpu(NXobject): - name: - doc: | - Given name of the CPU. Users should be as specific as possible. - (NXfabrication): - -# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++ -# 7acc57d7e709c31f39bfe27c48566ae19f040f70c491c764259dab65ee1a36b2 -# -# -# -# -# -# -# The symbols used in the schema to specify e.g. dimensions of arrays. -# -# -# -# Computer science description of a central processing unit (CPU) of a computer. -# -# -# -# Given name of the CPU. Users should be as specific as possible. -# -# -# -# diff --git a/contributed_definitions/nyaml/NXcs_cpu_obj.yaml b/contributed_definitions/nyaml/NXcs_cpu_obj.yaml deleted file mode 100644 index 73097d5ca5..0000000000 --- a/contributed_definitions/nyaml/NXcs_cpu_obj.yaml +++ /dev/null @@ -1,12 +0,0 @@ -category: base -doc: | - Computer science description of a (central) processing unit (C)PU of a computer. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcs_cpu_obj(NXobject): - name(NX_CHAR): - doc: | - Given name of the CPU. Users should be as specific as possible. - (NXfabrication): diff --git a/contributed_definitions/nyaml/NXcs_cpu_sys.yaml b/contributed_definitions/nyaml/NXcs_cpu_sys.yaml deleted file mode 100644 index 5eaf8f0eab..0000000000 --- a/contributed_definitions/nyaml/NXcs_cpu_sys.yaml +++ /dev/null @@ -1,21 +0,0 @@ -category: base -doc: | - Computer science description of a system of classical central processing units. - - For coprocessor or graphic cards use :ref:`NXcs_gpu_sys` instead. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcs_cpu_sys(NXobject): - cpuID(NXcs_cpu_obj): - doc: | - Granularizing at the socket level. - - Typical examples follow: A desktop computer with a single CPU one - could describe using one instance of :ref:`NXcs_cpu_obj` inside one instance of - :ref:`NXcs_cpu_sys`. - A dual-socket server one could describe using two instances of :ref:`NXcs_cpu_obj` - inside one instance of :ref:`NXcs_cpu_sys`. - A server with two dual-socket server nodes one could describe - with the above group of one :ref:`NXcs_cpu_sys` into another :ref:`NXcs_cpu_sys`. diff --git a/contributed_definitions/nyaml/NXcs_gpu.yaml b/contributed_definitions/nyaml/NXcs_gpu.yaml deleted file mode 100644 index 573f14f29c..0000000000 --- a/contributed_definitions/nyaml/NXcs_gpu.yaml +++ /dev/null @@ -1,54 +0,0 @@ -category: base -doc: | - Computer science description of a graphic processing unit (GPU) of a computer. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcs_gpu(NXobject): - name: - doc: | - Given name of the GPU. Users should be as specific as possible. - (NXfabrication): - -# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++ -# 739989c53a5e4fe43a63035920aab39528e8933c2ec9e35465e04e40d69d9a7c -# -# -# -# -# -# -# The symbols used in the schema to specify e.g. dimensions of arrays. -# -# -# -# Computer science description of a graphic processing unit (GPU) of a computer. -# -# -# -# Given name of the GPU. Users should be as specific as possible. -# -# -# -# diff --git a/contributed_definitions/nyaml/NXcs_gpu_obj.yaml b/contributed_definitions/nyaml/NXcs_gpu_obj.yaml deleted file mode 100644 index 04468b7b2b..0000000000 --- a/contributed_definitions/nyaml/NXcs_gpu_obj.yaml +++ /dev/null @@ -1,12 +0,0 @@ -category: base -doc: | - Computer science description of a graphic processing unit (GPU) of a computer. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcs_gpu_obj(NXobject): # NXcircuit_board ? - name(NX_CHAR): - doc: | - Given name of the GPU. Users should be as specific as possible. - (NXfabrication): diff --git a/contributed_definitions/nyaml/NXcs_gpu_sys.yaml b/contributed_definitions/nyaml/NXcs_gpu_sys.yaml deleted file mode 100644 index dee199330c..0000000000 --- a/contributed_definitions/nyaml/NXcs_gpu_sys.yaml +++ /dev/null @@ -1,20 +0,0 @@ -category: base -doc: | - Computer science description of a system of coprocessor or graphics processors. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcs_gpu_sys(NXobject): - gpuID(NXcs_gpu_obj): - doc: | - Granularizing at the socket level. - - Typical examples follow: A desktop computer with a single GPU one - could describe using one instance of :ref:`NXcs_gpu_obj` inside one instance of - :ref:`NXcs_gpu_sys`. - A desktop computer with two GPUs one could describe using two instances - of :ref:`NXcs_gpu_obj` inside one instance of :ref:`NXcs_gpu_sys`. - A GPU server like nowadays used for artificial intelligence - one could describe as a system with n instances of :ref:`NXcs_gpu_obj` - in one :ref:`NXcs_gpu_sys` or :ref:`NXcs_cpu_sys`. diff --git a/contributed_definitions/nyaml/NXcs_io_obj.yaml b/contributed_definitions/nyaml/NXcs_io_obj.yaml deleted file mode 100644 index 100f0cae41..0000000000 --- a/contributed_definitions/nyaml/NXcs_io_obj.yaml +++ /dev/null @@ -1,21 +0,0 @@ -category: base -doc: | - Computer science description of a storage object in an input/output system. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcs_io_obj(NXobject): - technology(NX_CHAR): - doc: | - Qualifier for the type of storage medium used. - enumeration: [solid_state_disk, hard_disk, tape] - max_physical_capacity(NX_NUMBER): - doc: | - Total amount of data which the medium can hold. - unit: NX_ANY - # NX_BIT - name(NX_CHAR): - doc: | - Given name to the I/O unit. - (NXfabrication): diff --git a/contributed_definitions/nyaml/NXcs_io_sys.yaml b/contributed_definitions/nyaml/NXcs_io_sys.yaml deleted file mode 100644 index b62768a234..0000000000 --- a/contributed_definitions/nyaml/NXcs_io_sys.yaml +++ /dev/null @@ -1,13 +0,0 @@ -category: base -doc: | - Computer science description of system of a computer. - - In the same way how a hierarchy of instances of :ref:`NXcs_cpu_obj` or :ref:`NXcs_gpu_obj` - can be defined one can also define a hierarchy of :ref:`NXcs_mm_obj` and :ref:`NXcs_io_obj` - instances. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcs_io_sys(NXobject): - ioID(NXcs_io_obj): diff --git a/contributed_definitions/nyaml/NXcs_mm_obj.yaml b/contributed_definitions/nyaml/NXcs_mm_obj.yaml deleted file mode 100644 index d1fead8c8b..0000000000 --- a/contributed_definitions/nyaml/NXcs_mm_obj.yaml +++ /dev/null @@ -1,21 +0,0 @@ -category: base -doc: | - Computer science description of a memory in a memory system. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcs_mm_obj(NXobject): - technology(NX_CHAR): - doc: | - Qualifier for the type of random access memory. - # make an enumeration - max_physical_capacity(NX_NUMBER): - doc: | - Total amount of data which the medium can hold. - unit: NX_ANY - # NX_BIT - name(NX_CHAR): - doc: | - Given name to the I/O unit. - (NXfabrication): diff --git a/contributed_definitions/nyaml/NXcs_mm_sys.yaml b/contributed_definitions/nyaml/NXcs_mm_sys.yaml deleted file mode 100644 index 60293e362b..0000000000 --- a/contributed_definitions/nyaml/NXcs_mm_sys.yaml +++ /dev/null @@ -1,17 +0,0 @@ -category: base -doc: | - Computer science description of a memory system of a computer. - - In the same way how a hierarchy of instances of :ref:`NXcs_cpu_obj` or :ref:`NXcs_gpu_obj` - can be defined one can also define a hierarchy of :ref:`NXcs_mm_obj` and :ref:`NXcs_io_obj` - instances. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXcs_mm_sys(NXobject): - total_physical_memory(NX_NUMBER): - doc: | - How much physical memory does the system provide. - unit: NX_ANY - # NX_BIT diff --git a/contributed_definitions/nyaml/NXdac.yaml b/contributed_definitions/nyaml/NXdac.yaml deleted file mode 100644 index f0b09372b2..0000000000 --- a/contributed_definitions/nyaml/NXdac.yaml +++ /dev/null @@ -1,53 +0,0 @@ -category: base -doc: | - Digital-to-analog converter component/integrated circuit. -symbols: - doc: | - The symbols used in the schema to specify e.g. dimensions of arrays. -type: group -NXdac(NXobject): - value(NX_NUMBER): - unit: NX_UNITLESS - doc: | - TBD. - -# ++++++++++++++++++++++++++++++++++ SHA HASH ++++++++++++++++++++++++++++++++++ -# 3126ae3b0a957ca0a5ab3d91942ccee0c849665d53ec3cf085dee4f2fc420899 -# -# -# -# -# -# -# The symbols used in the schema to specify e.g. dimensions of arrays. -# -# -# -# Digital-to-analog converter component/integrated circuit. -# -# -# -# TBD. -# -# -# diff --git a/contributed_definitions/nyaml/NXms_score_results.yaml b/contributed_definitions/nyaml/NXms_score_results.yaml index 56b70c7a79..acc6f3dff2 100644 --- a/contributed_definitions/nyaml/NXms_score_results.yaml +++ b/contributed_definitions/nyaml/NXms_score_results.yaml @@ -531,49 +531,6 @@ NXms_score_results(NXobject): number_of_gpus(NX_POSINT): (NXcs_computer): exists: recommended - name: - exists: recommended - operating_system: - \@version: - uuid: - exists: optional - (NXcs_cpu): - exists: ['min', '0', 'max', 'unbounded'] - name: - exists: optional - (NXfabrication): - exists: recommended - identifier: - exists: optional - capabilities: - exists: optional - (NXcs_gpu): - exists: ['min', '0', 'max', 'unbounded'] - name: - exists: optional - (NXfabrication): - exists: recommended - identifier: - exists: optional - capabilities: - exists: optional - (NXcs_mm_sys): - exists: ['min', '0', 'max', '1'] - total_physical_memory(NX_NUMBER): - (NXcs_io_sys): - exists: ['min', '0', 'max', '1'] - (NXcs_io_obj): - exists: ['min', '1', 'max', 'unbounded'] - technology: - max_physical_capacity(NX_NUMBER): - name: - exists: optional - (NXfabrication): - exists: recommended - identifier: - exists: optional - capabilities: - exists: optional (NXcs_profiling_event): start_time(NX_DATE_TIME): exists: optional diff --git a/manual/source/classes/contributed_definitions/cgms-structure.rst b/manual/source/classes/contributed_definitions/cgms-structure.rst index f7a4629fe0..a802096997 100644 --- a/manual/source/classes/contributed_definitions/cgms-structure.rst +++ b/manual/source/classes/contributed_definitions/cgms-structure.rst @@ -220,16 +220,4 @@ input parameters and to summarize its performance statistics: A base class for documenting profiling/benchmark for an algorithm or computational step. :ref:`NXcs_computer`: - A base class for documenting a computer. - - :ref:`NXcs_cpu_sys`, :ref:`NXcs_cpu_obj`, :ref:`NXcs_cpu`: - Base classes for documenting a central processing unit. - - :ref:`NXcs_gpu_sys`, :ref:`NXcs_gpu_obj`, :ref:`NXcs_gpu`: - Base classes for documenting a graphical processing unit / accelerator. - - :ref:`NXcs_mm_sys`, :ref:`NXcs_mm_obj`: - Base classes for documenting the (main) memory (sub-)system. - - :ref:`NXcs_io_sys`, :ref:`NXcs_io_obj`: - Base classes for documenting the input/output system. + Base class for describing a computer and its components. diff --git a/manual/source/classes/contributed_definitions/em-structure.rst b/manual/source/classes/contributed_definitions/em-structure.rst index 86647eccd9..02005fe9ce 100644 --- a/manual/source/classes/contributed_definitions/em-structure.rst +++ b/manual/source/classes/contributed_definitions/em-structure.rst @@ -130,8 +130,8 @@ The following base classes are proposed to support modularizing the storage of p is a component in a microscope which controls eventually multiple other components such as beam deflectors to achieve deflection and thus a controlled scanning of the beam over the sample/specimen surface. - :ref:`NXcircuit`, :ref:`NXcircuit_board`, :ref:`NXadc`, :ref: `NXdac`: - Base classes to describe integrated circuits (ICs). Further consolidation of these base classes is planned. + :ref:`NXcircuit`: + Base class to describe logical unit of at least one integrated circuit. :ref:`NXspectrum_set`: A base class and specializations comparable to :ref:`NXimage_set` but for storing spectra.