update to latest

Author: willow-ahrens

spec/latest/index.bs

@@ -296,22 +296,21 @@ operator). We can represent a collection of sparse vectors using a sparse level.
 The sparse level format represents sparse vectors by listing the locations of
 nonzeros, and storing only the nonzero scalars inside an element level.
 
-
 In addition to storing scalars, dense and sparse levels may themselves store
 multidimensional arrays. This leads to multiple ways to store sparse matrices
 and tensors. For example, a dense vector of sparse vectors is equivalent to the
 CSR matrix format, and a sparse vector of sparse vectors is equivalent to the
 hypersparse DCSR matrix format.
 
-When defining a custom format, the `format` key is defined as the root level
-descriptor (a level which will only hold one array). If a level holds many
-different arrays, we refer to the `p`th array as the array in position `p`.
+When defining a custom format, the outermost `subformat` key is defined as the
+root level descriptor (a level which will only hold one array). If a level holds
+many different arrays, we refer to the `p`th array as the array in position `p`.
 
 Levels are row-major by default (adding an outer level adds a row dimension).
-The format descriptor may optionally define a `swizzle` key, equal to a list of
+The format descriptor may optionally define a `transpose` key, equal to a list of
 the described dimensions in the order they should appear. If the tensor we wish
 to represent is `A` and the tensor described by the format descriptor is `B`,
-then `A[i_1, ..., i_n] = B[i_(swizzle[1]), ..., i_(swizzle[n])]`. `swizzle` must
+then `A[i_1, ..., i_n] = B[i_(transpose[1]), ..., i_(transpose[n])]`. `transpose` must
 be a permutation.
 
 If the format key is a dictionary, the `level` key must be present and shall
@@ -377,22 +376,22 @@ The following formats are equivalent
 #### DVEC #### {#dvec_format_equiv}
 
 ```json
-{
-  "format": {
+"format": {
+  "subformat": {
     "level": "dense",
     "rank": 1,
     "subformat": {
       "level": "element",
     }
-  },
+  }
 }
 ```
 
 #### DMATR #### {#dmatr_format_equiv}
 
 ```json
-{
-  "format": {
+"format": {
+  "subformat": {
     "level": "dense",
     "rank": 1,
     "subformat": {
@@ -401,17 +400,17 @@ The following formats are equivalent
       "subformat": {
         "level": "element",
       }
-    },
-  },
+    }
+  }
 }
 ```
 
 #### DMATC #### {#dmatr_format_equiv}
 
 ```json
-{
-  "swizzle": [1, 0]
-  "format": {
+"format": {
+  "transpose": [1, 0],
+  "subformat": {
     "level": "dense",
     "rank": 1,
     "subformat": {
@@ -420,30 +419,30 @@ The following formats are equivalent
       "subformat": {
         "level": "element",
       }
-    },
-  },
+    }
+  }
 }
 ```
 
 #### CVEC #### {#cvec_format_equiv}
 
 ```json
-{
-  "format": {
+"format": {
+  "subformat": {
     "level": "sparse",
     "rank": 1,
     "subformat": {
       "level": "element",
     }
-  },
+  }
 }
 ```
 
 #### CSR #### {#csr_format_equiv}
 
 ```json
-{
-  "format": {
+"format": {
+  "subformat": {
     "level": "dense",
     "rank": 1,
     "subformat": {
@@ -453,16 +452,16 @@ The following formats are equivalent
         "level": "element",
       }
     }
-  },
+  }
 }
 ```
 
 #### CSC #### {#csc_format_equiv}
 
 ```json
-{
-  "swizzle": [1, 0],
-  "format": {
+"format": {
+  "transpose": [1, 0],
+  "subformat": {
     "level": "dense",
     "rank": 1,
     "subformat": {
@@ -472,15 +471,15 @@ The following formats are equivalent
         "level": "element",
       }
     }
-  },
+  }
 }
 ```
 
 #### DCSR #### {#dcsr_format_equiv}
 
 ```json
-{
-  "format": {
+"format": {
+  "subformat": {
     "level": "sparse",
     "rank": 1,
     "subformat": {
@@ -490,16 +489,16 @@ The following formats are equivalent
         "level": "element",
       }
     }
-  },
+  }
 }
 ```
 
 #### DCSC #### {#dcsc_format_equiv}
 
 ```json
-{
-  "format": {
-    "swizzle": [1, 0],
+"format": {
+  "transpose": [1, 0],
+  "subformat": {
     "level": "sparse",
     "rank": 1,
     "subformat": {
@@ -509,21 +508,21 @@ The following formats are equivalent
         "level": "element",
       }
     }
-  },
+  }
 }
 ```
 
 #### COOR #### {#coor_format_equiv}
 
 ```json
-{
-  "format": {
+"format": {
+  "subformat": {
     "level": "sparse",
     "rank": 2,
     "subformat": {
       "level": "element",
     }
-  },
+  }
 }
 ```
 
@@ -532,15 +531,15 @@ The following formats are equivalent
 Column-wise Coordinate format
 
 ```json
-{
-  "swizzle": [1, 0],
-  "format": {
+"format": {
+  "transpose": [1, 0],
+  "subformat": {
     "level": "sparse",
     "rank": 2,
     "subformat": {
       "level": "element",
     }
-  },
+  }
 }
 ```
 
@@ -598,27 +597,12 @@ the modified array shall be at position `2i + 1` in the underlying array.
 The `complex` value modifier may only be used with the types `float32` and
 `float64`.
 
-If the level key is "complex", the `subformat` key must be present. The
-complex level represents zero or more complex-valued arrays specified by
-`subformat`.  The real and imaginary components of the `p`th array are the subarrays at
-positions `2p` and `2p+1`.
-
-One can also specify that a type is complex by writing the type as
-`complex[<type>]`. For example, a value array of complex `float64` would have a
-datatype of `complex[float64]`.
-
 ### All Values the Same (ISO) ### {#iso_level}
 
-When all values of a sparse array are the same identical value, a special level
-is provided to compress the value array to a single value rather than
-duplicating the same number unnecessarily.
-
-If the level key is "iso", the `subformat` key must be present. All arrays
-represented by the iso level map to the same subarray at position 0. The subarray
-is usually a scalar element which is common to all stored indices.
-
-One can specify that the value array should be wrapped in an iso level by
-writing the value type as `iso[<type>]`. 
+When all values of a sparse array are the same identical value, the type is
+written as `iso[<type>]`. This indicates that the array will store only a single
+element which is common to all stored indices. All elements in the modified
+array shall be stored at position 0 of the underlying array.
 
 <div class=example>