@@ -8,13 +8,13 @@ use ndarray::Order;
8
8
fn reshape ( ) {
9
9
let data = [ 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 ] ;
10
10
let v = aview1 ( & data) ;
11
- let u = v. into_shape ( ( 3 , 3 ) ) ;
11
+ let u = v. coerce_shape ( ( 3 , 3 ) ) ;
12
12
assert ! ( u. is_err( ) ) ;
13
- let u = v. into_shape ( ( 2 , 2 , 2 ) ) ;
13
+ let u = v. coerce_shape ( ( 2 , 2 , 2 ) ) ;
14
14
assert ! ( u. is_ok( ) ) ;
15
15
let u = u. unwrap ( ) ;
16
16
assert_eq ! ( u. shape( ) , & [ 2 , 2 , 2 ] ) ;
17
- let s = u. into_shape ( ( 4 , 2 ) ) . unwrap ( ) ;
17
+ let s = u. coerce_shape ( ( 4 , 2 ) ) . unwrap ( ) ;
18
18
assert_eq ! ( s. shape( ) , & [ 4 , 2 ] ) ;
19
19
assert_eq ! ( s, aview2( & [ [ 1 , 2 ] , [ 3 , 4 ] , [ 5 , 6 ] , [ 7 , 8 ] ] ) ) ;
20
20
}
@@ -24,17 +24,17 @@ fn reshape() {
24
24
fn reshape_error1 ( ) {
25
25
let data = [ 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 ] ;
26
26
let v = aview1 ( & data) ;
27
- let _u = v. into_shape ( ( 2 , 5 ) ) . unwrap ( ) ;
27
+ let _u = v. coerce_shape ( ( 2 , 5 ) ) . unwrap ( ) ;
28
28
}
29
29
30
30
#[ test]
31
31
#[ should_panic( expected = "IncompatibleLayout" ) ]
32
32
fn reshape_error2 ( ) {
33
33
let data = [ 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 ] ;
34
34
let v = aview1 ( & data) ;
35
- let mut u = v. into_shape ( ( 2 , 2 , 2 ) ) . unwrap ( ) ;
35
+ let mut u = v. coerce_shape ( ( 2 , 2 , 2 ) ) . unwrap ( ) ;
36
36
u. swap_axes ( 0 , 1 ) ;
37
- let _s = u. into_shape ( ( 2 , 4 ) ) . unwrap ( ) ;
37
+ let _s = u. coerce_shape ( ( 2 , 4 ) ) . unwrap ( ) ;
38
38
}
39
39
40
40
#[ test]
@@ -47,16 +47,16 @@ fn reshape_f() {
47
47
println ! ( "{:?}" , v) ;
48
48
49
49
// noop ok
50
- let v2 = v. into_shape ( ( 3 , 4 ) ) ;
50
+ let v2 = v. coerce_shape ( ( ( 3 , 4 ) , Order :: F ) ) ;
51
51
assert ! ( v2. is_ok( ) ) ;
52
52
assert_eq ! ( v, v2. unwrap( ) ) ;
53
53
54
- let u = v. into_shape ( ( 3 , 2 , 2 ) ) ;
54
+ let u = v. coerce_shape ( ( ( 3 , 2 , 2 ) , Order :: F ) ) ;
55
55
assert ! ( u. is_ok( ) ) ;
56
56
let u = u. unwrap ( ) ;
57
57
println ! ( "{:?}" , u) ;
58
58
assert_eq ! ( u. shape( ) , & [ 3 , 2 , 2 ] ) ;
59
- let s = u. into_shape ( ( 4 , 3 ) ) . unwrap ( ) ;
59
+ let s = u. coerce_shape ( ( ( 4 , 3 ) , Order :: F ) ) . unwrap ( ) ;
60
60
println ! ( "{:?}" , s) ;
61
61
assert_eq ! ( s. shape( ) , & [ 4 , 3 ] ) ;
62
62
assert_eq ! ( s, aview2( & [ [ 0 , 4 , 8 ] , [ 1 , 5 , 9 ] , [ 2 , 6 , 10 ] , [ 3 , 7 , 11 ] ] ) ) ;
0 commit comments