Skip to content

Hotfix/index test #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2016
Merged

Hotfix/index test #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96bccdf
more unused fixes
Mar 26, 2016
3c2f70c
add unwrap for set_index calls
Mar 26, 2016
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
3 changes: 2 additions & 1 deletion src/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ impl Array {
/// # Examples
///
/// ```
/// use arrayfire::{Array, Dim4};
/// use arrayfire::{Array, Dim4, print};
/// let values: &[f32] = &[1.0, 2.0, 3.0];
/// let indices = Array::new(values, Dim4::new(&[3, 1, 1, 1])).unwrap();
/// print(&indices).unwrap();
/// ```
#[allow(unused_mut)]
pub fn new<T: HasAfEnum>(slice: &[T], dims: Dim4) -> Result<Array, AfError> {
Expand Down
14 changes: 7 additions & 7 deletions src/index.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ pub fn index<T: Copy>(input: &Array, seqs: &[Seq<T>]) -> Result<Array, AfError>
/// let a = randu::<f32>(dims).unwrap();
/// println!("Grab last row of the random matrix");
/// print(&a);
/// print(&row(&a, 4).unwrap());
/// print(&row(&a, 4).unwrap()).unwrap();
/// ```
#[allow(dead_code)]
pub fn row(input: &Array, row_num: u64) -> Result<Array, AfError> {
Expand Down Expand Up @@ -351,11 +351,11 @@ pub fn assign_seq<T: Copy>(lhs: &Array, seqs: &[Seq<T>], rhs: &Array) -> Result<
/// Ok(v) => v,
/// Err(e) => panic!("{}",e),
/// };
/// idxrs.set_index(&indices, 0, None); // 2nd parameter is indexing dimension
/// idxrs.set_index(&seq4gen, 1, Some(false)); // 3rd parameter indicates batch operation
/// idxrs.set_index(&indices, 0, None).unwrap(); // 2nd parameter is indexing dimension
/// idxrs.set_index(&seq4gen, 1, Some(false)).unwrap(); // 3rd parameter indicates batch operation
///
/// let sub2 = index_gen(&a, idxrs).unwrap();
/// println!("a(indices, seq(0, 2, 1))"); print(&sub2);
/// println!("a(indices, seq(0, 2, 1))"); print(&sub2).unwrap();
/// // [3 3 1 1]
/// // 0.1315 0.0470 0.5194
/// // 0.7556 0.6789 0.8310
Expand Down Expand Up @@ -396,11 +396,11 @@ pub fn index_gen(input: &Array, indices: Indexer) -> Result<Array, AfError> {
/// Ok(v) => v,
/// Err(e) => panic!("{}",e),
/// };
/// idxrs.set_index(&indices, 0, None); // 2nd parameter is indexing dimension
/// idxrs.set_index(&seq4gen, 1, Some(false)); // 3rd parameter indicates batch operation
/// idxrs.set_index(&indices, 0, None).unwrap(); // 2nd parameter is indexing dimension
/// idxrs.set_index(&seq4gen, 1, Some(false)).unwrap(); // 3rd parameter indicates batch operation
///
/// let sub2 = assign_gen(&a, &idxrs, &b).unwrap();
/// println!("a(indices, seq(0, 2, 1))"); print(&sub2);
/// println!("a(indices, seq(0, 2, 1))"); print(&sub2).unwrap();
/// // [5 3 1 1]
/// // 0.0000 0.2190 0.3835
/// // 2.0000 2.0000 2.0000
Expand Down