Implement sum over axis

Author: sd109

scripts/client.py

@@ -116,11 +116,14 @@ def display(response, verbose=False):
     #print(response.content)
     dtype = response.headers['x-activestorage-dtype']
     shape = json.loads(response.headers['x-activestorage-shape'])
-    result = np.frombuffer(response.content, dtype=dtype)
-    result = result.reshape(shape)
+    counts = json.loads(response.headers['x-activestorage-count'])
+    counts = np.array(counts).reshape(shape)
+    result = np.frombuffer(response.content, dtype=dtype).reshape(shape)
     if verbose:
+        sep = "\n" if len(counts.shape) > 1 else " "
         print("\nResponse headers:", response.headers)
-        print("\nResult:", result)
+        print("\nNon-missing count(s):", counts, sep=sep)
+        print("\nResult:", result, sep=sep)
     else:
         print(result)
 

scripts/upload_sample_data.py

@@ -6,7 +6,7 @@
 import s3fs
 import zlib
 
-NUM_ITEMS = 10
+NUM_ITEMS = 12
 OBJECT_PREFIX = "data"
 COMPRESSION_ALGS = [None, "gzip", "zlib"]
 FILTER_ALGS = [None, "shuffle"]

src/models.rs

@@ -263,12 +263,12 @@ pub struct Response {
     /// Shape of the response
     pub shape: Vec<usize>,
     /// Number of non-missing elements operated on to generate response
-    pub count: i64,
+    pub count: Vec<i64>,
 }
 
 impl Response {
     /// Return a Response object
-    pub fn new(body: Bytes, dtype: DType, shape: Vec<usize>, count: i64) -> Response {
+    pub fn new(body: Bytes, dtype: DType, shape: Vec<usize>, count: Vec<i64>) -> Response {
         Response {
             body,
             dtype,

src/operation.rs

@@ -111,7 +111,7 @@ mod tests {
                 data.into(),
                 request_data.dtype,
                 vec![3],
-                3,
+                vec![3],
             ))
         }
     }
@@ -125,7 +125,7 @@ mod tests {
         assert_eq!(&[1, 2, 3, 4][..], response.body);
         assert_eq!(models::DType::Uint32, response.dtype);
         assert_eq!(vec![3], response.shape);
-        assert_eq!(3, response.count);
+        assert_eq!(vec![3], response.count);
     }
 
     struct TestNumOp {}
@@ -141,7 +141,7 @@ mod tests {
                 body.into(),
                 request_data.dtype,
                 vec![1, 2],
-                2,
+                vec![2],
             ))
         }
     }
@@ -155,6 +155,6 @@ mod tests {
         assert_eq!("i64", response.body);
         assert_eq!(models::DType::Int64, response.dtype);
         assert_eq!(vec![1, 2], response.shape);
-        assert_eq!(2, response.count);
+        assert_eq!(vec![2], response.count);
     }
 }