Commit 462cecdc authored by Liam Healy's avatar Liam Healy

Array copy tests 64-bit conditionalize

Conditionalize the array copy 64-bit tests matrix-copy-to-cl-and-back.lisp
and vector-copy-to-cl-and-back.lisp with #+int64 so they don't run on
32 bit computers.
parent 7fa63f90
...@@ -3,163 +3,165 @@ ...@@ -3,163 +3,165 @@
(in-package :gsl) (in-package :gsl)
(LISP-UNIT:DEFINE-TEST MATRIX-COPY-TO-CL-AND-BACK (LISP-UNIT:DEFINE-TEST MATRIX-COPY-TO-CL-AND-BACK
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST (LIST
#2A((-34.5 8.24 3.29) #2A((-34.5 8.24 3.29)
(-8.93 34.12 -6.15) (-8.93 34.12 -6.15)
(49.27 -13.49 32.5))) (49.27 -13.49 32.5)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS
'((-34.5 8.24 3.29) '((-34.5 8.24 3.29)
(-8.93 34.12 -6.15) (-8.93 34.12 -6.15)
(49.27 -13.49 32.5))) (49.27 -13.49 32.5)))
'ARRAY) 'ARRAY)
'SINGLE-FLOAT)))) 'SINGLE-FLOAT))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST (LIST
#2A((-34.5d0 8.24d0 3.29d0) #2A((-34.5d0 8.24d0 3.29d0)
(-8.93d0 34.12d0 -6.15d0) (-8.93d0 34.12d0 -6.15d0)
(49.27d0 -13.49d0 32.5d0))) (49.27d0 -13.49d0 32.5d0)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS
'((-34.5d0 8.24d0 3.29d0) '((-34.5d0 8.24d0 3.29d0)
(-8.93d0 34.12d0 -6.15d0) (-8.93d0 34.12d0 -6.15d0)
(49.27d0 -13.49d0 32.5d0))) (49.27d0 -13.49d0 32.5d0)))
'ARRAY) 'ARRAY)
'DOUBLE-FLOAT)))) 'DOUBLE-FLOAT))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST (LIST
#2A((#C(-34.5 8.24) #C(3.29 -8.93) #C(34.12 -6.15)) #2A((#C(-34.5 8.24) #C(3.29 -8.93) #C(34.12 -6.15))
(#C(-8.93 34.12) #C(-6.15 49.27) #C(-13.49 32.5)) (#C(-8.93 34.12) #C(-6.15 49.27) #C(-13.49 32.5))
(#C(49.27 -13.49) #C(32.5 42.73) (#C(49.27 -13.49) #C(32.5 42.73)
#C(-17.24 43.31)))) #C(-17.24 43.31))))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT)
:INITIAL-CONTENTS :INITIAL-CONTENTS
'((-34.5 8.24 3.29 -8.93 34.12 -6.15) '((-34.5 8.24 3.29 -8.93 34.12 -6.15)
(-8.93 34.12 -6.15 49.27 -13.49 (-8.93 34.12 -6.15 49.27 -13.49
32.5) 32.5)
(49.27 -13.49 32.5 42.73 -17.24 (49.27 -13.49 32.5 42.73 -17.24
43.31))) 43.31)))
'ARRAY) 'ARRAY)
'(COMPLEX SINGLE-FLOAT))))) '(COMPLEX SINGLE-FLOAT)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST (LIST
#2A((#C(-34.5d0 8.24d0) #C(3.29d0 -8.93d0) #2A((#C(-34.5d0 8.24d0) #C(3.29d0 -8.93d0)
#C(34.12d0 -6.15d0)) #C(34.12d0 -6.15d0))
(#C(-8.93d0 34.12d0) #C(-6.15d0 49.27d0) (#C(-8.93d0 34.12d0) #C(-6.15d0 49.27d0)
#C(-13.49d0 32.5d0)) #C(-13.49d0 32.5d0))
(#C(49.27d0 -13.49d0) #C(32.5d0 42.73d0) (#C(49.27d0 -13.49d0) #C(32.5d0 42.73d0)
#C(-17.24d0 43.31d0)))) #C(-17.24d0 43.31d0))))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT)
:INITIAL-CONTENTS :INITIAL-CONTENTS
'((-34.5d0 8.24d0 3.29d0 -8.93d0 '((-34.5d0 8.24d0 3.29d0 -8.93d0
34.12d0 -6.15d0) 34.12d0 -6.15d0)
(-8.93d0 34.12d0 -6.15d0 49.27d0 (-8.93d0 34.12d0 -6.15d0 49.27d0
-13.49d0 32.5d0) -13.49d0 32.5d0)
(49.27d0 -13.49d0 32.5d0 42.73d0 (49.27d0 -13.49d0 32.5d0 42.73d0
-17.24d0 43.31d0))) -17.24d0 43.31d0)))
'ARRAY) 'ARRAY)
'(COMPLEX DOUBLE-FLOAT))))) '(COMPLEX DOUBLE-FLOAT)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123))) (LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS
'((-64 -68 71) (-91 52 -10) '((-64 -68 71) (-91 52 -10)
(73 -5 123))) (73 -5 123)))
'ARRAY) 'ARRAY)
'(SIGNED-BYTE 8))))) '(SIGNED-BYTE 8)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((67 44 189) (116 163 140) (161 215 98))) (LIST #2A((67 44 189) (116 163 140) (161 215 98)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS (MAKE-MARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS
'((67 44 189) (116 163 140) '((67 44 189) (116 163 140)
(161 215 98))) (161 215 98)))
'ARRAY) 'ARRAY)
'(UNSIGNED-BYTE 8))))) '(UNSIGNED-BYTE 8)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123))) (LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS (MAKE-MARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS
'((-64 -68 71) (-91 52 -10) '((-64 -68 71) (-91 52 -10)
(73 -5 123))) (73 -5 123)))
'ARRAY) 'ARRAY)
'(SIGNED-BYTE 16))))) '(SIGNED-BYTE 16)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((67 44 189) (116 163 140) (161 215 98))) (LIST #2A((67 44 189) (116 163 140) (161 215 98)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS (MAKE-MARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS
'((67 44 189) (116 163 140) '((67 44 189) (116 163 140)
(161 215 98))) (161 215 98)))
'ARRAY) 'ARRAY)
'(UNSIGNED-BYTE 16))))) '(UNSIGNED-BYTE 16)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123))) (LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS (MAKE-MARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS
'((-64 -68 71) (-91 52 -10) '((-64 -68 71) (-91 52 -10)
(73 -5 123))) (73 -5 123)))
'ARRAY) 'ARRAY)
'(SIGNED-BYTE 32))))) '(SIGNED-BYTE 32)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((67 44 189) (116 163 140) (161 215 98))) (LIST #2A((67 44 189) (116 163 140) (161 215 98)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS (MAKE-MARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS
'((67 44 189) (116 163 140) '((67 44 189) (116 163 140)
(161 215 98))) (161 215 98)))
'ARRAY) 'ARRAY)
'(UNSIGNED-BYTE 32))))) '(UNSIGNED-BYTE 32)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL #+int64
(LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(MULTIPLE-VALUE-LIST (LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123)))
(CL-ARRAY (MULTIPLE-VALUE-LIST
(COPY (CL-ARRAY
(COPY (COPY
(MAKE-MARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS (COPY
'((-64 -68 71) (-91 52 -10) (MAKE-MARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS
(73 -5 123))) '((-64 -68 71) (-91 52 -10)
'ARRAY) (73 -5 123)))
'(SIGNED-BYTE 64))))) 'ARRAY)
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL '(SIGNED-BYTE 64)))))
(LIST #2A((67 44 189) (116 163 140) (161 215 98))) #+int64
(MULTIPLE-VALUE-LIST (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(CL-ARRAY (LIST #2A((67 44 189) (116 163 140) (161 215 98)))
(COPY (MULTIPLE-VALUE-LIST
(COPY (CL-ARRAY
(MAKE-MARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS (COPY
'((67 44 189) (116 163 140) (COPY
(161 215 98))) (MAKE-MARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS
'ARRAY) '((67 44 189) (116 163 140)
'(UNSIGNED-BYTE 64)))))) (161 215 98)))
'ARRAY)
'(UNSIGNED-BYTE 64))))))
...@@ -3,152 +3,154 @@ ...@@ -3,152 +3,154 @@
(in-package :gsl) (in-package :gsl)
(LISP-UNIT:DEFINE-TEST VECTOR-COPY-TO-CL-AND-BACK (LISP-UNIT:DEFINE-TEST VECTOR-COPY-TO-CL-AND-BACK
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #(-34.5 8.24 3.29)) (LIST #(-34.5 8.24 3.29))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS
'(-34.5 8.24 3.29)) '(-34.5 8.24 3.29))
'ARRAY) 'ARRAY)
'SINGLE-FLOAT)))) 'SINGLE-FLOAT))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #(-34.5d0 8.24d0 3.29d0)) (LIST #(-34.5d0 8.24d0 3.29d0))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS
'(-34.5d0 8.24d0 3.29d0)) '(-34.5d0 8.24d0 3.29d0))
'ARRAY) 'ARRAY)
'DOUBLE-FLOAT)))) 'DOUBLE-FLOAT))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #(#C(-34.5 8.24) #C(3.29 -8.93) #C(34.12 -6.15))) (LIST #(#C(-34.5 8.24) #C(3.29 -8.93) #C(34.12 -6.15)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT)
:INITIAL-CONTENTS :INITIAL-CONTENTS
'(-34.5 8.24 3.29 -8.93 34.12 -6.15)) '(-34.5 8.24 3.29 -8.93 34.12 -6.15))
'ARRAY) 'ARRAY)
'(COMPLEX SINGLE-FLOAT))))) '(COMPLEX SINGLE-FLOAT)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST (LIST
#(#C(-34.5d0 8.24d0) #C(3.29d0 -8.93d0) #(#C(-34.5d0 8.24d0) #C(3.29d0 -8.93d0)
#C(34.12d0 -6.15d0))) #C(34.12d0 -6.15d0)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT)
:INITIAL-CONTENTS :INITIAL-CONTENTS
'(-34.5d0 8.24d0 3.29d0 -8.93d0 '(-34.5d0 8.24d0 3.29d0 -8.93d0
34.12d0 -6.15d0)) 34.12d0 -6.15d0))
'ARRAY) 'ARRAY)
'(COMPLEX DOUBLE-FLOAT))))) '(COMPLEX DOUBLE-FLOAT)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-64 -68 71)) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-64 -68 71))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY (MAKE-MARRAY
'(SIGNED-BYTE 8) '(SIGNED-BYTE 8)
:INITIAL-CONTENTS :INITIAL-CONTENTS
'(-64 -68 71)) '(-64 -68 71))
'ARRAY) 'ARRAY)
'(SIGNED-BYTE '(SIGNED-BYTE
8))))) 8)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(67 44 189)) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(67 44 189))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY (MAKE-MARRAY
'(UNSIGNED-BYTE '(UNSIGNED-BYTE
8) 8)
:INITIAL-CONTENTS :INITIAL-CONTENTS
'(67 44 189)) '(67 44 189))
'ARRAY) 'ARRAY)
'(UNSIGNED-BYTE '(UNSIGNED-BYTE
8))))) 8)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-64 -68 71)) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-64 -68 71))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY (MAKE-MARRAY
'(SIGNED-BYTE '(SIGNED-BYTE
16) 16)
:INITIAL-CONTENTS :INITIAL-CONTENTS
'(-64 -68 71)) '(-64 -68 71))
'ARRAY) 'ARRAY)
'(SIGNED-BYTE '(SIGNED-BYTE
16))))) 16)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(67 44 189)) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(67 44 189))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY (MAKE-MARRAY
'(UNSIGNED-BYTE '(UNSIGNED-BYTE
16) 16)
:INITIAL-CONTENTS :INITIAL-CONTENTS
'(67 44 189)) '(67 44 189))
'ARRAY) 'ARRAY)
'(UNSIGNED-BYTE '(UNSIGNED-BYTE
16))))) 16)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-64 -68 71)) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-64 -68 71))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY (MAKE-MARRAY
'(SIGNED-BYTE '(SIGNED-BYTE
32) 32)
:INITIAL-CONTENTS :INITIAL-CONTENTS
'(-64 -68 71)) '(-64 -68 71))
'ARRAY) 'ARRAY)
'(SIGNED-BYTE '(SIGNED-BYTE
32))))) 32)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(67 44 189)) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(67 44 189))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(CL-ARRAY (CL-ARRAY
(COPY (COPY
(COPY (COPY
(MAKE-MARRAY (MAKE-MARRAY
'(UNSIGNED-BYTE '(UNSIGNED-BYTE
32) 32)
:INITIAL-CONTENTS :INITIAL-CONTENTS
'(67 44 189)) '(67 44 189))
'ARRAY) 'ARRAY)
'(UNSIGNED-BYTE '(UNSIGNED-BYTE
32))))) 32)))))
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-64 -68 71)) #+int64
(MULTIPLE-VALUE-LIST (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-64 -68 71))
(CL-ARRAY (MULTIPLE-VALUE-LIST
(COPY (CL-ARRAY
(COPY (COPY
(MAKE-MARRAY (COPY
'(SIGNED-BYTE (MAKE-MARRAY
64) '(SIGNED-BYTE
:INITIAL-CONTENTS 64)
'(-64 -68 71)) :INITIAL-CONTENTS
'ARRAY) '(-64 -68 71))
'(SIGNED-BYTE 'ARRAY)
64))))) '(SIGNED-BYTE
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(67 44 189)) 64)))))
(MULTIPLE-VALUE-LIST #+int64
(CL-ARRAY (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(67 44 189))
(COPY (MULTIPLE-VALUE-LIST
(COPY (CL-ARRAY
(MAKE-MARRAY (COPY
'(UNSIGNED-BYTE (COPY
64) (MAKE-MARRAY
:INITIAL-CONTENTS '(UNSIGNED-BYTE
'(67 44 189)) 64)
'ARRAY) :INITIAL-CONTENTS
'(UNSIGNED-BYTE '(67 44 189))
64)))))) 'ARRAY)
'(UNSIGNED-BYTE
64))))))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment