Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
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
53 changes: 53 additions & 0 deletions src/tensor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pub mod ops;
mod utils;

use ops::elementwise::{Add, Div, Mul, Sub};
use ops::reductions::Sum;
use std::ops::Index;
use utils::{
are_broadcast_compatible, broadcast_shape, compute_strides, multi_dim_iter, recursive_slice,
Expand Down Expand Up @@ -364,3 +365,55 @@ impl Div for Tensor {
Ok(Box::new(Self::new(new_data, self.shape.clone())))
}
}

impl Sum for Tensor {
fn sum(&self, dim: Option<usize>) -> Self {
if dim.is_none() {
let total_sum = self.data.iter().sum();
return Self::new(vec![total_sum], vec![1]);
}

let dim = dim.unwrap();
let mut result_shape = self.shape.clone();
result_shape[dim] = 1;

let mut result_data = vec![0.0; result_shape.iter().product()];
let result_strides = compute_strides(&result_shape);

// TODO: Might need to revisit as it will introduced overhead
// overhead because we're repeatedly converting between
// flat and multi-dimensional indices
for i in 0..self.shape[dim] {
for (j, result_val) in result_data.iter_mut().enumerate() {
let mut idx = flat_to_multi_index(&self.shape, &self.strides, j);
idx[dim] = i;

let flat_index = compute_flat_index(&self.shape, &self.strides, &idx);
*result_val += self.data[flat_index];
}
}

Self {
data: result_data,
shape: result_shape,
strides: result_strides,
}
}
}

fn compute_flat_index(shape: &[usize], strides: &[usize], idx: &[usize]) -> usize {
assert_eq!(shape.len(), idx.len());
idx.iter().zip(strides).fold(0, |acc, (&i, &s)| acc + i * s)
}

fn flat_to_multi_index(shape: &[usize], strides: &[usize], flat_index: usize) -> Vec<usize> {
let mut idx = vec![0; shape.len()];
let mut remainder = flat_index;

for i in (0..shape.len()).rev() {
idx[i] = remainder / strides[i];
remainder %= strides[i];
}

idx
}
1 change: 1 addition & 0 deletions src/tensor/ops/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
pub mod elementwise;
pub mod reductions;
15 changes: 15 additions & 0 deletions src/tensor/ops/reductions.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
pub trait Sum {
fn sum(&self, dim: Option<usize>) -> Self;
}

pub trait Average {
fn mean(&self, dim: Option<usize>) -> Self;
}

pub trait Max {
fn max(&self, dim: Option<usize>) -> Self;
}

pub trait Min {
fn min(&self, dim: Option<usize>) -> Self;
}