Skip to content

Commit 456c74e

Browse files
sd109sd109
committed
Rename request field: axes -> axis
1 parent 8c8b81b commit 456c74e

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎benches/byte_order.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fn get_test_request_data() -> RequestData {
1414
offset: None,
1515
size: None,
1616
shape: None,
17-
axes: reductionist::models::ReductionAxes::All,
17+
axis: reductionist::models::ReductionAxes::All,
1818
order: None,
1919
selection: None,
2020
compression: None,

‎benches/operations.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn get_test_request_data() -> RequestData {
1919
offset: None,
2020
size: None,
2121
shape: None,
22-
axes: reductionist::models::ReductionAxes::All,
22+
axis: reductionist::models::ReductionAxes::All,
2323
order: None,
2424
selection: None,
2525
compression: None,

‎scripts/client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def get_args() -> argparse.Namespace:
3636
parser.add_argument("--offset", type=int)
3737
parser.add_argument("--size", type=int)
3838
parser.add_argument("--shape", type=str)
39-
parser.add_argument("--axes", type=str)
39+
parser.add_argument("--axis", type=str)
4040
parser.add_argument("--order", default="C") #, choices=["C", "F"]) allow invalid for testing
4141
parser.add_argument("--selection", type=str)
4242
parser.add_argument("--compression", type=str)
@@ -73,8 +73,8 @@ def build_request_data(args: argparse.Namespace) -> dict:
7373
request_data["byte_order"] = args.byte_order
7474
if args.shape:
7575
request_data["shape"] = json.loads(args.shape)
76-
if args.axes is not None:
77-
request_data["axes"] = json.loads(args.axes)
76+
if args.axis is not None:
77+
request_data["axis"] = json.loads(args.axis)
7878
if args.selection:
7979
request_data["selection"] = json.loads(args.selection)
8080
if args.compression:

‎scripts/parallel-client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def get_args() -> argparse.Namespace:
4848
parser.add_argument("--offset", type=int)
4949
parser.add_argument("--size", type=int)
5050
parser.add_argument("--shape", type=str)
51-
parser.add_argument("--axes", type=str)
51+
parser.add_argument("--axis", type=str)
5252
parser.add_argument("--order", default="C") #, choices=["C", "F"]) allow invalid for testing
5353
parser.add_argument("--selection", type=str)
5454
parser.add_argument("--compression", type=str)
@@ -91,8 +91,8 @@ def build_request_data(args: argparse.Namespace) -> dict:
9191
request_data["byte_order"] = args.byte_order
9292
if args.shape:
9393
request_data["shape"] = json.loads(args.shape)
94-
if args.axes is not None:
95-
request_data["axes"] = json.loads(args.axes)
94+
if args.axis is not None:
95+
request_data["axis"] = json.loads(args.axis)
9696
if args.selection:
9797
request_data["selection"] = json.loads(args.selection)
9898
if args.compression:

‎src/models.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ pub struct RequestData {
149149
/// Axis over which to perform the reduction operation
150150
// pub axis: Option<usize>,
151151
#[serde(default)]
152-
pub axes: ReductionAxes,
152+
pub axis: ReductionAxes,
153153
/// Order of the multi-dimensional array
154154
pub order: Option<Order>,
155155
/// Subset of the data to operate on
@@ -249,7 +249,7 @@ fn validate_request_data(request_data: &RequestData) -> Result<(), ValidationErr
249249
_ => (),
250250
};
251251
// Check axis is compatible with shape
252-
match (&request_data.shape, &request_data.axes) {
252+
match (&request_data.shape, &request_data.axis) {
253253
(Some(shape), ReductionAxes::One(axis)) => {
254254
if *axis > shape.len() - 1 {
255255
return Err(ValidationError::new("Axis must be within shape"));
@@ -377,7 +377,7 @@ mod tests {
377377
Token::U32(5),
378378
Token::U32(1),
379379
Token::SeqEnd,
380-
Token::Str("axes"),
380+
Token::Str("axis"),
381381
Token::Seq { len: Some(2) },
382382
Token::U32(1),
383383
Token::U32(2),
@@ -715,15 +715,15 @@ mod tests {
715715
#[should_panic(expected = "Axis requires shape to be specified")]
716716
fn test_axis_without_shape() {
717717
let mut request_data = test_utils::get_test_request_data();
718-
request_data.axes = ReductionAxes::One(1);
718+
request_data.axis = ReductionAxes::One(1);
719719
request_data.validate().unwrap()
720720
}
721721

722722
#[test]
723723
#[should_panic(expected = "Axis must be within shape")]
724724
fn test_axis_gt_shape() {
725725
let mut request_data = test_utils::get_test_request_data();
726-
request_data.axes = ReductionAxes::One(2);
726+
request_data.axis = ReductionAxes::One(2);
727727
request_data.shape = Some(vec![2, 5]);
728728
request_data.validate().unwrap()
729729
}
@@ -801,7 +801,7 @@ mod tests {
801801
Token::Str("foo"),
802802
Token::StructEnd
803803
],
804-
"unknown field `foo`, expected one of `source`, `bucket`, `object`, `dtype`, `byte_order`, `offset`, `size`, `shape`, `axes`, `order`, `selection`, `compression`, `filters`, `missing`"
804+
"unknown field `foo`, expected one of `source`, `bucket`, `object`, `dtype`, `byte_order`, `offset`, `size`, `shape`, `axis`, `order`, `selection`, `compression`, `filters`, `missing`"
805805
)
806806
}
807807

@@ -825,7 +825,7 @@ mod tests {
825825
"offset": 4,
826826
"size": 8,
827827
"shape": [2, 5, 1],
828-
"axes": [1, 2],
828+
"axis": [1, 2],
829829
"order": "C",
830830
"selection": [[1, 2, 3], [4, 5, 6], [1, 1, 1]],
831831
"compression": {"id": "gzip"},
@@ -847,7 +847,7 @@ mod tests {
847847
"offset": 4,
848848
"size": 8,
849849
"shape": [2, 5, 10],
850-
"axes": 2,
850+
"axis": 2,
851851
"order": "F",
852852
"selection": [[1, 2, 3], [4, 5, 6], [7, 8, 9]],
853853
"compression": {"id": "zlib"},
@@ -859,7 +859,7 @@ mod tests {
859859
expected.dtype = DType::Float64;
860860
expected.byte_order = Some(ByteOrder::Big);
861861
expected.shape = Some(vec![2, 5, 10]);
862-
expected.axes = ReductionAxes::One(2);
862+
expected.axis = ReductionAxes::One(2);
863863
expected.order = Some(Order::F);
864864
expected.selection = Some(vec![
865865
Slice::new(1, 2, 3),

‎src/operations.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ impl NumOperation for Min {
220220
// Use ndarray::fold, ndarray::fold_axis or dispatch to specialised
221221
// multi-axis function depending on whether we're performing reduction
222222
// over all axes or only a subset
223-
match &request_data.axes {
223+
match &request_data.axis {
224224
ReductionAxes::One(axis) => {
225225
let init = T::max_value();
226226
let result =
@@ -387,7 +387,7 @@ impl NumOperation for Sum {
387387

388388
// Use ndarray::fold or ndarray::fold_axis depending on whether we're
389389
// performing reduction over all axes or only a subset
390-
match &request_data.axes {
390+
match &request_data.axis {
391391
ReductionAxes::One(axis) => {
392392
let result = sliced.fold_axis(Axis(*axis), (T::zero(), 0), |(sum, count), val| {
393393
if let Some(missing) = &typed_missing {
@@ -817,7 +817,7 @@ mod tests {
817817
let mut request_data = test_utils::get_test_request_data();
818818
request_data.dtype = models::DType::Uint32;
819819
request_data.shape = Some(vec![2, 4]);
820-
request_data.axes = ReductionAxes::One(0);
820+
request_data.axis = ReductionAxes::One(0);
821821
let data: Vec<u32> = vec![1, 2, 3, 4, 5, 6, 7, 8];
822822
// Act
823823
let response = Sum::execute(&request_data, data.as_bytes().into()).unwrap();
@@ -838,7 +838,7 @@ mod tests {
838838
let mut request_data = test_utils::get_test_request_data();
839839
request_data.dtype = models::DType::Uint32;
840840
request_data.shape = Some(vec![2, 4]);
841-
request_data.axes = ReductionAxes::One(1);
841+
request_data.axis = ReductionAxes::One(1);
842842
request_data.missing = Some(Missing::MissingValue(0.into()));
843843
let data: Vec<u32> = vec![0, 2, 3, 4, 5, 6, 7, 8];
844844
// Act
@@ -860,7 +860,7 @@ mod tests {
860860
let mut request_data = test_utils::get_test_request_data();
861861
request_data.dtype = models::DType::Float64;
862862
request_data.shape = Some(vec![2, 2, 2]);
863-
request_data.axes = ReductionAxes::One(1);
863+
request_data.axis = ReductionAxes::One(1);
864864
request_data.missing = Some(Missing::MissingValue(0.into()));
865865
let data: Vec<f64> = vec![0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0];
866866
// Act

‎src/test_utils.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub(crate) fn get_test_request_data() -> RequestData {
1313
byte_order: None,
1414
offset: None,
1515
size: None,
16-
axes: ReductionAxes::All,
16+
axis: ReductionAxes::All,
1717
shape: None,
1818
order: None,
1919
selection: None,
@@ -33,7 +33,7 @@ pub(crate) fn get_test_request_data_optional() -> RequestData {
3333
byte_order: Some(ByteOrder::Little),
3434
offset: Some(4),
3535
size: Some(8),
36-
axes: ReductionAxes::Multi(vec![1, 2]),
36+
axis: ReductionAxes::Multi(vec![1, 2]),
3737
shape: Some(vec![2, 5, 1]),
3838
order: Some(Order::C),
3939
selection: Some(vec![

0 commit comments

Comments
 (0)