Changeset: d655eb3c4fa5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d655eb3c4fa5 Modified Files: monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.malC monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.stable.out monetdb5/extras/pyapi/Tests/pyapi_types_huge.malC monetdb5/extras/pyapi/Tests/pyapi_types_huge.stable.out monetdb5/extras/pyapi/Tests/pyapi_types_numeric.malC monetdb5/extras/pyapi/Tests/pyapi_types_numeric.stable.out Branch: pythonudf Log Message:
Move all tests involving the hge type to the types_huge test (which uses HAVE_HGE as precondition). diffs (truncated from 397 to 300 lines): diff --git a/monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.malC b/monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.malC --- a/monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.malC +++ b/monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.malC @@ -75,161 +75,3 @@ bat.append(fib, 29:int); # define a function within the main function and map it to a BAT s:bat[:oid,:dbl] := pyapi.eval(nil:ptr, "def fibonacci(nmbr):\n\tif (nmbr == 0): return 0\n\tif (nmbr == 1): return 1\n\ta = 0\n\tb = 1\n\tfor i in range(0, nmbr - 1):\n\t\tc = a + b\n\t\ta = b\n\t\tb = c\n\treturn b\nreturn(list(map(fibonacci, arg1)))", fib); io.print(s); - -indices:= bat.new(:oid,:int); -bat.append(indices, 0:int); -bat.append(indices, 1:int); -bat.append(indices, 2:int); -bat.append(indices, 3:int); -bat.append(indices, 4:int); -bat.append(indices, 5:int); -bat.append(indices, 6:int); -bat.append(indices, 7:int); -bat.append(indices, 8:int); -bat.append(indices, 9:int); -bat.append(indices, 10:int); -bat.append(indices, 11:int); -bat.append(indices, 12:int); -bat.append(indices, 13:int); -bat.append(indices, 14:int); -bat.append(indices, 15:int); -bat.append(indices, 16:int); -bat.append(indices, 17:int); -bat.append(indices, 18:int); -bat.append(indices, 19:int); -bat.append(indices, 20:int); -bat.append(indices, 21:int); -bat.append(indices, 22:int); -bat.append(indices, 23:int); -bat.append(indices, 24:int); -bat.append(indices, 25:int); -bat.append(indices, 26:int); -bat.append(indices, 27:int); -bat.append(indices, 28:int); -bat.append(indices, 29:int); -bat.append(indices, 30:int); -bat.append(indices, 31:int); -bat.append(indices, 32:int); -bat.append(indices, 33:int); -bat.append(indices, 34:int); -bat.append(indices, 35:int); -bat.append(indices, 36:int); -bat.append(indices, 37:int); -bat.append(indices, 38:int); -bat.append(indices, 39:int); -bat.append(indices, 40:int); -bat.append(indices, 41:int); -bat.append(indices, 42:int); -bat.append(indices, 43:int); -bat.append(indices, 44:int); -bat.append(indices, 45:int); -bat.append(indices, 46:int); -bat.append(indices, 47:int); -bat.append(indices, 48:int); -bat.append(indices, 49:int); -bat.append(indices, 50:int); -bat.append(indices, 51:int); -bat.append(indices, 52:int); -bat.append(indices, 53:int); -bat.append(indices, 54:int); -bat.append(indices, 55:int); -bat.append(indices, 56:int); -bat.append(indices, 57:int); -bat.append(indices, 58:int); -bat.append(indices, 59:int); -bat.append(indices, 60:int); -bat.append(indices, 61:int); -bat.append(indices, 62:int); -bat.append(indices, 63:int); -bat.append(indices, 64:int); -bat.append(indices, 65:int); -bat.append(indices, 66:int); -bat.append(indices, 67:int); -bat.append(indices, 68:int); -bat.append(indices, 69:int); -bat.append(indices, 70:int); -bat.append(indices, 71:int); -bat.append(indices, 72:int); -bat.append(indices, 73:int); -bat.append(indices, 74:int); -bat.append(indices, 75:int); -bat.append(indices, 76:int); -bat.append(indices, 77:int); -bat.append(indices, 78:int); -bat.append(indices, 79:int); -bat.append(indices, 80:int); -bat.append(indices, 81:int); -bat.append(indices, 82:int); -bat.append(indices, 83:int); -bat.append(indices, 84:int); -bat.append(indices, 85:int); -bat.append(indices, 86:int); -bat.append(indices, 87:int); -bat.append(indices, 88:int); -bat.append(indices, 89:int); -bat.append(indices, 90:int); -bat.append(indices, 91:int); -bat.append(indices, 92:int); -bat.append(indices, 93:int); -bat.append(indices, 94:int); -bat.append(indices, 95:int); -bat.append(indices, 96:int); -bat.append(indices, 97:int); -bat.append(indices, 98:int); -bat.append(indices, 99:int); -bat.append(indices, 100:int); -bat.append(indices, 101:int); -bat.append(indices, 102:int); -bat.append(indices, 103:int); -bat.append(indices, 104:int); -bat.append(indices, 105:int); -bat.append(indices, 106:int); -bat.append(indices, 107:int); -bat.append(indices, 108:int); -bat.append(indices, 109:int); -bat.append(indices, 110:int); -bat.append(indices, 111:int); -bat.append(indices, 112:int); -bat.append(indices, 113:int); -bat.append(indices, 114:int); -bat.append(indices, 115:int); -bat.append(indices, 116:int); -bat.append(indices, 117:int); -bat.append(indices, 118:int); -bat.append(indices, 119:int); -bat.append(indices, 120:int); -bat.append(indices, 121:int); -bat.append(indices, 122:int); -bat.append(indices, 123:int); -bat.append(indices, 124:int); -bat.append(indices, 125:int); -bat.append(indices, 126:int); -bat.append(indices, 127:int); -bat.append(indices, 128:int); -bat.append(indices, 129:int); -bat.append(indices, 130:int); -bat.append(indices, 131:int); -bat.append(indices, 132:int); -bat.append(indices, 133:int); -bat.append(indices, 134:int); -bat.append(indices, 135:int); -bat.append(indices, 136:int); -bat.append(indices, 137:int); -bat.append(indices, 138:int); -bat.append(indices, 139:int); -bat.append(indices, 140:int); -bat.append(indices, 141:int); -bat.append(indices, 142:int); -bat.append(indices, 143:int); -bat.append(indices, 144:int); -bat.append(indices, 145:int); -bat.append(indices, 146:int); -bat.append(indices, 147:int); -bat.append(indices, 148:int); -bat.append(indices, 149:int); -bat.append(indices, 150:int); - - -# now do it while returning a hge, to test returning very large numbers -s:bat[:oid,:hge] := pyapi.eval(nil:ptr, "def fibonacci(nmbr):\n\tif (nmbr == 0): return 0\n\tif (nmbr == 1): return 1\n\ta = 0\n\tb = 1\n\tfor i in range(0, nmbr - 1):\n\t\tc = a + b\n\t\ta = b\n\t\tb = c\n\treturn b\nreturn(list(map(fibonacci, arg1)))", indices); -io.print(s); diff --git a/monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.stable.out b/monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.stable.out --- a/monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.stable.out +++ b/monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.stable.out @@ -86,162 +86,6 @@ Ready. [ 27@0, 196418 ] [ 28@0, 317811 ] [ 29@0, 514229 ] -#io.print(s); -#--------------------------# -# h t # name -# void hge # type -#--------------------------# -[ 0@0, 0 ] -[ 1@0, 1 ] -[ 2@0, 1 ] -[ 3@0, 2 ] -[ 4@0, 3 ] -[ 5@0, 5 ] -[ 6@0, 8 ] -[ 7@0, 13 ] -[ 8@0, 21 ] -[ 9@0, 34 ] -[ 10@0, 55 ] -[ 11@0, 89 ] -[ 12@0, 144 ] -[ 13@0, 233 ] -[ 14@0, 377 ] -[ 15@0, 610 ] -[ 16@0, 987 ] -[ 17@0, 1597 ] -[ 18@0, 2584 ] -[ 19@0, 4181 ] -[ 20@0, 6765 ] -[ 21@0, 10946 ] -[ 22@0, 17711 ] -[ 23@0, 28657 ] -[ 24@0, 46368 ] -[ 25@0, 75025 ] -[ 26@0, 121393 ] -[ 27@0, 196418 ] -[ 28@0, 317811 ] -[ 29@0, 514229 ] -[ 30@0, 832040 ] -[ 31@0, 1346269 ] -[ 32@0, 2178309 ] -[ 33@0, 3524578 ] -[ 34@0, 5702887 ] -[ 35@0, 9227465 ] -[ 36@0, 14930352 ] -[ 37@0, 24157817 ] -[ 38@0, 39088169 ] -[ 39@0, 63245986 ] -[ 40@0, 102334155 ] -[ 41@0, 165580141 ] -[ 42@0, 267914296 ] -[ 43@0, 433494437 ] -[ 44@0, 701408733 ] -[ 45@0, 1134903170 ] -[ 46@0, 1836311903 ] -[ 47@0, 2971215073 ] -[ 48@0, 4807526976 ] -[ 49@0, 7778742049 ] -[ 50@0, 12586269025 ] -[ 51@0, 20365011074 ] -[ 52@0, 32951280099 ] -[ 53@0, 53316291173 ] -[ 54@0, 86267571272 ] -[ 55@0, 139583862445 ] -[ 56@0, 225851433717 ] -[ 57@0, 365435296162 ] -[ 58@0, 591286729879 ] -[ 59@0, 956722026041 ] -[ 60@0, 1548008755920 ] -[ 61@0, 2504730781961 ] -[ 62@0, 4052739537881 ] -[ 63@0, 6557470319842 ] -[ 64@0, 10610209857723 ] -[ 65@0, 17167680177565 ] -[ 66@0, 27777890035288 ] -[ 67@0, 44945570212853 ] -[ 68@0, 72723460248141 ] -[ 69@0, 117669030460994 ] -[ 70@0, 190392490709135 ] -[ 71@0, 308061521170129 ] -[ 72@0, 498454011879264 ] -[ 73@0, 806515533049393 ] -[ 74@0, 1304969544928657 ] -[ 75@0, 2111485077978050 ] -[ 76@0, 3416454622906707 ] -[ 77@0, 5527939700884757 ] -[ 78@0, 8944394323791464 ] -[ 79@0, 14472334024676221 ] -[ 80@0, 23416728348467685 ] -[ 81@0, 37889062373143906 ] -[ 82@0, 61305790721611591 ] -[ 83@0, 99194853094755497 ] -[ 84@0, 160500643816367088 ] -[ 85@0, 259695496911122585 ] -[ 86@0, 420196140727489673 ] -[ 87@0, 679891637638612258 ] -[ 88@0, 1100087778366101931 ] -[ 89@0, 1779979416004714189 ] -[ 90@0, 2880067194370816120 ] -[ 91@0, 4660046610375530309 ] -[ 92@0, 7540113804746346429 ] -[ 93@0, 12200160415121876738 ] -[ 94@0, 19740274219868223167 ] -[ 95@0, 31940434634990099905 ] -[ 96@0, 51680708854858323072 ] -[ 97@0, 83621143489848422977 ] -[ 98@0, 135301852344706746049 ] -[ 99@0, 218922995834555169026 ] -[ 100@0, 354224848179261915075 ] -[ 101@0, 573147844013817084101 ] -[ 102@0, 927372692193078999176 ] -[ 103@0, 1500520536206896083277 ] -[ 104@0, 2427893228399975082453 ] -[ 105@0, 3928413764606871165730 ] -[ 106@0, 6356306993006846248183 ] -[ 107@0, 10284720757613717413913 ] -[ 108@0, 16641027750620563662096 ] -[ 109@0, 26925748508234281076009 ] -[ 110@0, 43566776258854844738105 ] -[ 111@0, 70492524767089125814114 ] -[ 112@0, 114059301025943970552219 ] -[ 113@0, 184551825793033096366333 ] -[ 114@0, 298611126818977066918552 ] -[ 115@0, 483162952612010163284885 ] -[ 116@0, 781774079430987230203437 ] -[ 117@0, 1264937032042997393488322 ] -[ 118@0, 2046711111473984623691759 ] -[ 119@0, 3311648143516982017180081 ] -[ 120@0, 5358359254990966640871840 ] -[ 121@0, 8670007398507948658051921 ] -[ 122@0, 14028366653498915298923761 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
