Skip to content

Commit c0ddaaa

Browse files
committed
Commented out functions from latest devel for now
These functions will be re-enabled once we update arrayfire submodule to point to v3.1.0
1 parent 28b2a6c commit c0ddaaa

File tree

2 files changed

+41
-40
lines changed

2 files changed

+41
-40
lines changed

src/algorithm/mod.rs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ type AfArray = ::libc::c_longlong;
1212
extern {
1313
fn af_sum(out: MutAfArray, input: AfArray, dim: c_int) -> c_int;
1414

15-
fn af_sum_nan(out: MutAfArray, input: AfArray, dim: c_int, nanval: c_double) -> c_int;
15+
//fn af_sum_nan(out: MutAfArray, input: AfArray, dim: c_int, nanval: c_double) -> c_int;
1616

1717
fn af_product(out: MutAfArray, input: AfArray, dim: c_int) -> c_int;
1818

19-
fn af_product_nan(out: MutAfArray, input: AfArray, dim: c_int, val: c_double) -> c_int;
19+
//fn af_product_nan(out: MutAfArray, input: AfArray, dim: c_int, val: c_double) -> c_int;
2020

2121
fn af_min(out: MutAfArray, input: AfArray, dim: c_int) -> c_int;
2222

@@ -30,11 +30,11 @@ extern {
3030

3131
fn af_sum_all(r: MutDouble, i: MutDouble, input: AfArray) -> c_int;
3232

33-
fn af_sum_nan_all(r: MutDouble, i: MutDouble, input: AfArray, val: c_double) -> c_int;
33+
//fn af_sum_nan_all(r: MutDouble, i: MutDouble, input: AfArray, val: c_double) -> c_int;
3434

3535
fn af_product_all(r: MutDouble, i: MutDouble, input: AfArray) -> c_int;
3636

37-
fn af_product_nan_all(r: MutDouble, i: MutDouble, input: AfArray, val: c_double) -> c_int;
37+
//fn af_product_nan_all(r: MutDouble, i: MutDouble, input: AfArray, val: c_double) -> c_int;
3838

3939
fn af_min_all(r: MutDouble, i: MutDouble, input: AfArray) -> c_int;
4040

@@ -85,14 +85,14 @@ pub fn sum(input: &Array, dim: i32) -> Array {
8585
}
8686
}
8787

88-
pub fn sum_nan(input: &Array, dim: i32, nanval: f64) -> Array {
89-
unsafe {
90-
let mut temp: i64 = 0;
91-
af_sum_nan(&mut temp as MutAfArray, input.get() as AfArray,
92-
dim as c_int, nanval as c_double);
93-
Array {handle: temp}
94-
}
95-
}
88+
//pub fn sum_nan(input: &Array, dim: i32, nanval: f64) -> Array {
89+
// unsafe {
90+
// let mut temp: i64 = 0;
91+
// af_sum_nan(&mut temp as MutAfArray, input.get() as AfArray,
92+
// dim as c_int, nanval as c_double);
93+
// Array {handle: temp}
94+
// }
95+
//}
9696

9797
pub fn product(input: &Array, dim: i32) -> Array {
9898
unsafe {
@@ -102,14 +102,14 @@ pub fn product(input: &Array, dim: i32) -> Array {
102102
}
103103
}
104104

105-
pub fn product_nan(input: &Array, dim: i32, nanval: f64) -> Array {
106-
unsafe {
107-
let mut temp: i64 = 0;
108-
af_product_nan(&mut temp as MutAfArray, input.get() as AfArray,
109-
dim as c_int, nanval as c_double);
110-
Array {handle: temp}
111-
}
112-
}
105+
//pub fn product_nan(input: &Array, dim: i32, nanval: f64) -> Array {
106+
// unsafe {
107+
// let mut temp: i64 = 0;
108+
// af_product_nan(&mut temp as MutAfArray, input.get() as AfArray,
109+
// dim as c_int, nanval as c_double);
110+
// Array {handle: temp}
111+
// }
112+
//}
113113

114114
pub fn min(input: &Array, dim: i32) -> Array {
115115
unsafe {
@@ -161,15 +161,15 @@ pub fn sum_all(input: &Array) -> (f64, f64) {
161161
}
162162
}
163163

164-
pub fn sum_nan_all(input: &Array, val: f64) -> (f64, f64) {
165-
unsafe {
166-
let mut real: f64 = 0.0;
167-
let mut imag: f64 = 0.0;
168-
af_sum_nan_all(&mut real as MutDouble, &mut imag as MutDouble,
169-
input.get() as AfArray, val as c_double);
170-
(real, imag)
171-
}
172-
}
164+
//pub fn sum_nan_all(input: &Array, val: f64) -> (f64, f64) {
165+
// unsafe {
166+
// let mut real: f64 = 0.0;
167+
// let mut imag: f64 = 0.0;
168+
// af_sum_nan_all(&mut real as MutDouble, &mut imag as MutDouble,
169+
// input.get() as AfArray, val as c_double);
170+
// (real, imag)
171+
// }
172+
//}
173173

174174
pub fn product_all(input: &Array) -> (f64, f64) {
175175
unsafe {
@@ -181,15 +181,15 @@ pub fn product_all(input: &Array) -> (f64, f64) {
181181
}
182182
}
183183

184-
pub fn product_nan_all(input: &Array, val: f64) -> (f64, f64) {
185-
unsafe {
186-
let mut real: f64 = 0.0;
187-
let mut imag: f64 = 0.0;
188-
af_product_nan_all(&mut real as MutDouble, &mut imag as MutDouble,
189-
input.get() as AfArray, val as c_double);
190-
(real, imag)
191-
}
192-
}
184+
//pub fn product_nan_all(input: &Array, val: f64) -> (f64, f64) {
185+
// unsafe {
186+
// let mut real: f64 = 0.0;
187+
// let mut imag: f64 = 0.0;
188+
// af_product_nan_all(&mut real as MutDouble, &mut imag as MutDouble,
189+
// input.get() as AfArray, val as c_double);
190+
// (real, imag)
191+
// }
192+
//}
193193

194194
pub fn min_all(input: &Array) -> (f64, f64) {
195195
unsafe {

src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,9 @@ pub fn fft3(input: &Array, norm_factor: f64, odim0: i64, odim1: i64, odim2: i64)
370370
}
371371
}
372372

373-
pub use algorithm::{sum, sum_nan, product, product_nan, min, max, all_true, any_true, count};
374-
pub use algorithm::{sum_all, sum_nan_all, product_all, product_nan_all, min_all, max_all};
373+
//pub use algorithm::{sum_nan, product_nan, sum_nan_all, product_nan_all};
374+
pub use algorithm::{sum, product, min, max, all_true, any_true, count};
375+
pub use algorithm::{sum_all, product_all, min_all, max_all};
375376
pub use algorithm::{all_true_all, any_true_all, count_all, imin, imax, imin_all, imax_all};
376377
pub use algorithm::{accum, locate, diff1, diff2, sort, sort_index, sort_by_key};
377378
pub use algorithm::{set_unique, set_union, set_intersect};

0 commit comments

Comments
 (0)