Changeset: 3762d381c1be for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3762d381c1be
Modified Files:
monetdb5/extras/pyapi/Tests/pyapi_numpy_boolean.malC
monetdb5/extras/pyapi/Tests/pyapi_numpy_numeric_nested.malC
monetdb5/extras/pyapi/Tests/pyapi_pandas.malC
monetdb5/extras/pyapi/Tests/pyapi_returntypes.malC
monetdb5/extras/pyapi/Tests/pyapi_types_boolean.malC
monetdb5/extras/pyapi/Tests/pyapi_types_huge.malC
monetdb5/extras/pyapi/Tests/pyapi_types_numeric.malC
monetdb5/extras/pyapi/Tests/pyapi_types_string.malC
Branch: default
Log Message:
Don't specify first (:oid) column.
diffs (truncated from 578 to 300 lines):
diff --git a/monetdb5/extras/pyapi/Tests/pyapi_numpy_boolean.malC
b/monetdb5/extras/pyapi/Tests/pyapi_numpy_boolean.malC
--- a/monetdb5/extras/pyapi/Tests/pyapi_numpy_boolean.malC
+++ b/monetdb5/extras/pyapi/Tests/pyapi_numpy_boolean.malC
@@ -7,13 +7,13 @@ bat.append(bbit,1:bit);
bat.append(bbit,0:bit);
bat.append(bbit,nil:bit);
# any(x)
-rbit:bat[:oid,:int] := pyapi.eval(nil:ptr,"return([[any(arg1)]])",bbit);
+rbit:bat[:int] := pyapi.eval(nil:ptr,"return([[any(arg1)]])",bbit);
io.print(rbit);
# all(x)
-rbit:bat[:oid,:int] := pyapi.eval(nil:ptr,"return([[all(arg1)]])",bbit);
+rbit:bat[:int] := pyapi.eval(nil:ptr,"return([[all(arg1)]])",bbit);
io.print(rbit);
# logical_not(x)
-rbit:bat[:oid,:int] :=
pyapi.eval(nil:ptr,"return([numpy.logical_not(arg1)])",bbit);
+rbit:bat[:int] := pyapi.eval(nil:ptr,"return([numpy.logical_not(arg1)])",bbit);
io.print(rbit);
# boolean operations on two boolean arrays
@@ -24,10 +24,10 @@ bat.append(bbit2,1:bit);
bat.append(bbit2,0:bit);
bat.append(bbit2,nil:bit);
# logical_and(x,y)
-rbit:bat[:oid,:int] := pyapi.eval(nil:ptr,"return(numpy.logical_and(arg1,
arg2))",bbit, bbit2);
+rbit:bat[:int] := pyapi.eval(nil:ptr,"return(numpy.logical_and(arg1,
arg2))",bbit, bbit2);
io.print(rbit);
# logical_or
-rbit:bat[:oid,:int] := pyapi.eval(nil:ptr,"return(numpy.logical_or(arg1,
arg2))",bbit, bbit2);
+rbit:bat[:int] := pyapi.eval(nil:ptr,"return(numpy.logical_or(arg1,
arg2))",bbit, bbit2);
io.print(rbit);
# numerical comparison operations
@@ -46,9 +46,9 @@ bat.append(bint2,nil:int);
bat.append(bint2,9172498714:int);
# greater_equal(x, y)
-rbit:bat[:oid,:int] := pyapi.eval(nil:ptr,"return(numpy.greater_equal(arg1,
arg2))",bint, bint2);
+rbit:bat[:int] := pyapi.eval(nil:ptr,"return(numpy.greater_equal(arg1,
arg2))",bint, bint2);
io.print(rbit);
# isclose(x, y, 10000000)
-rbit:bat[:oid,:int] := pyapi.eval(nil:ptr,"return(numpy.isclose(arg1, arg2,
atol=10000000))",bint, bint2);
+rbit:bat[:int] := pyapi.eval(nil:ptr,"return(numpy.isclose(arg1, arg2,
atol=10000000))",bint, bint2);
io.print(rbit);
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
@@ -29,15 +29,15 @@ bat.append(d, 0.02:dbl);
# square an array
-sqr:bat[:oid,:dbl] := pyapi.eval(nil:ptr, "return(arg1*arg1)", a);
+sqr:bat[:dbl] := pyapi.eval(nil:ptr, "return(arg1*arg1)", a);
io.print(sqr);
# then take the root of that array again
-a:bat[:oid,:dbl] := pyapi.eval(nil:ptr, "return(numpy.sqrt(arg1))", sqr);
+a:bat[:dbl] := pyapi.eval(nil:ptr, "return(numpy.sqrt(arg1))", sqr);
io.print(a);
# do some numpy operations
-x:bat[:oid,:dbl] := pyapi.eval(nil:ptr,
"return(numpy.prod(arg1*arg2*arg3*arg4)*numpy.sum(arg1*arg2*arg3*arg4))", a, b,
c, d);
+x:bat[:dbl] := pyapi.eval(nil:ptr,
"return(numpy.prod(arg1*arg2*arg3*arg4)*numpy.sum(arg1*arg2*arg3*arg4))", a, b,
c, d);
io.print(x);
fib:= bat.new(:oid,:int);
@@ -73,5 +73,5 @@ bat.append(fib, 28:int);
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);
+s:bat[: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);
diff --git a/monetdb5/extras/pyapi/Tests/pyapi_pandas.malC
b/monetdb5/extras/pyapi/Tests/pyapi_pandas.malC
--- a/monetdb5/extras/pyapi/Tests/pyapi_pandas.malC
+++ b/monetdb5/extras/pyapi/Tests/pyapi_pandas.malC
@@ -25,7 +25,7 @@ bat.append(b,1649760492:dbl);
bat.append(b,596516649:dbl);
bat.append(b,1189641421:dbl);
-(r:bat[:oid,:int], s:bat[:oid,:dbl]) := pyapi.eval(nil:ptr,"import pandas as
pd\ndf = pd.DataFrame({\'Group\': arg1, \'Values\': arg2})\ngrouped =
df.groupby('Group')\nreturn([grouped.groups.keys(),grouped.sum().values.flatten()])",
g, b);
+(r:bat[:int], s:bat[:dbl]) := pyapi.eval(nil:ptr,"import pandas as pd\ndf =
pd.DataFrame({\'Group\': arg1, \'Values\': arg2})\ngrouped =
df.groupby('Group')\nreturn([grouped.groups.keys(),grouped.sum().values.flatten()])",
g, b);
io.print(r,s);
@@ -46,8 +46,8 @@ bat.append(c,123:int);
bat.append(c,442:int);
# return a pandas dataframe
-(r2:bat[:oid,:int], s2:bat[:oid,:int]) := pyapi.eval(nil:ptr,"import pandas as
pd\ndf = pd.DataFrame({\'Group\': arg1, \'Values\': arg2})\nreturn(df)", g, c);
+(r2:bat[:int], s2:bat[:int]) := pyapi.eval(nil:ptr,"import pandas as pd\ndf =
pd.DataFrame({\'Group\': arg1, \'Values\': arg2})\nreturn(df)", g, c);
io.print(r2,s2);
# return a pandas dataframe with the incorrect format (return a dataframe with
3 columns when 2 columns are expected)
-#(r3:bat[:oid,:int], s3:bat[:oid,:int]) := pyapi.eval(nil:ptr,"import pandas
as pd\ndf = pd.DataFrame({\'Group\': arg1, \'Values\': arg2, 'Values2':
arg2})\nreturn(df)", g, c);
+#(r3:bat[:int], s3:bat[:int]) := pyapi.eval(nil:ptr,"import pandas as pd\ndf =
pd.DataFrame({\'Group\': arg1, \'Values\': arg2, 'Values2':
arg2})\nreturn(df)", g, c);
diff --git a/monetdb5/extras/pyapi/Tests/pyapi_returntypes.malC
b/monetdb5/extras/pyapi/Tests/pyapi_returntypes.malC
--- a/monetdb5/extras/pyapi/Tests/pyapi_returntypes.malC
+++ b/monetdb5/extras/pyapi/Tests/pyapi_returntypes.malC
@@ -1,36 +1,36 @@
-r0:bat[:oid,:int] := pyapi.eval(nil:ptr,"return(33)");
+r0:bat[:int] := pyapi.eval(nil:ptr,"return(33)");
io.print(r0);
# return a single float value
-r6:bat[:oid,:flt] := pyapi.eval(nil:ptr,"return(12.31)");
+r6:bat[:flt] := pyapi.eval(nil:ptr,"return(12.31)");
io.print(r6);
# return a single string value
-r7:bat[:oid,:str] := pyapi.eval(nil:ptr,"return(\"test\")");
+r7:bat[:str] := pyapi.eval(nil:ptr,"return(\"test\")");
io.print(r7);
#####################
# --PYTHON ARRAYS-- #
#####################
# return an array with a single value
-r1:bat[:oid,:int] := pyapi.eval(nil:ptr,"return([33])");
+r1:bat[:int] := pyapi.eval(nil:ptr,"return([33])");
io.print(r1);
# return an array containing a single array
-r2:bat[:oid,:int] := pyapi.eval(nil:ptr,"return([[33]])");
+r2:bat[:int] := pyapi.eval(nil:ptr,"return([[33]])");
io.print(r2);
# return an array containing two arrays
-(r3:bat[:oid,:int], s3:bat[:oid,:int]) := pyapi.eval(nil:ptr,"return([[33],
[42]])");
+(r3:bat[:int], s3:bat[:int]) := pyapi.eval(nil:ptr,"return([[33], [42]])");
io.print(r3, s3);
# return an array containing three arrays
-(r4:bat[:oid,:int], s4:bat[:oid,:int], t4:bat[:oid,:int]) :=
pyapi.eval(nil:ptr,"return([[33], [42], [66]])");
+(r4:bat[:int], s4:bat[:int], t4:bat[:int]) :=
pyapi.eval(nil:ptr,"return([[33], [42], [66]])");
io.print(r4, s4, t4);
# return an array containing two arrays containing strings
-(r5:bat[:oid,:str], s5:bat[:oid,:str]) :=
pyapi.eval(nil:ptr,"return([[\"Hello\", \"Hello Again\"], [\"Hello Again
Again\",\"That's quite enough.\"]])");
+(r5:bat[:str], s5:bat[:str]) := pyapi.eval(nil:ptr,"return([[\"Hello\",
\"Hello Again\"], [\"Hello Again Again\",\"That's quite enough.\"]])");
io.print(r5,s5);
@@ -38,27 +38,27 @@ io.print(r5,s5);
# --NUMPY ARRAYS-- #
####################
# return a single numpy array
-r8:bat[:oid,:int] :=
pyapi.eval(nil:ptr,"return(numpy.array([33,11,332,51,88]))");
+r8:bat[:int] := pyapi.eval(nil:ptr,"return(numpy.array([33,11,332,51,88]))");
io.print(r8);
# return an array containing two numpy arrays
-(r9:bat[:oid,:int], s9:bat[:oid,:int]) :=
pyapi.eval(nil:ptr,"return([numpy.array([33]), numpy.array([44])])");
+(r9:bat[:int], s9:bat[:int]) := pyapi.eval(nil:ptr,"return([numpy.array([33]),
numpy.array([44])])");
io.print(r9, s9);
# return a numpy array containing two arrays of unequal size
-(r10:bat[:oid,:int], s10:bat[:oid,:int]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[33,24,55], [44,66, 345, 77, 66]]))");
+(r10:bat[:int], s10:bat[:int]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[33,24,55], [44,66, 345, 77, 66]]))");
io.print(s10);
# return a numpy array containing two numpy arrays of unequal size
-(r11:bat[:oid,:int], s11:bat[:oid,:int]) :=
pyapi.eval(nil:ptr,"return(numpy.array([numpy.array([33]), numpy.array([44, 45,
77])]))");
+(r11:bat[:int], s11:bat[:int]) :=
pyapi.eval(nil:ptr,"return(numpy.array([numpy.array([33]), numpy.array([44, 45,
77])]))");
io.print(s11);
# return a multi-dimensional numpy array containing integers
-(r12:bat[:oid,:int], s12:bat[:oid,:int]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[33, 24, 55], [44, 66,345]]))");
+(r12:bat[:int], s12:bat[:int]) := pyapi.eval(nil:ptr,"return(numpy.array([[33,
24, 55], [44, 66,345]]))");
io.print(r12,s12);
# return a multi-dimensional numpy array containing doubles
-(r13:bat[:oid,:flt], s13:bat[:oid,:flt]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[27.42, 18.62, 33.81], [12.55, 41.44,
20.88]]))");
+(r13:bat[:flt], s13:bat[:flt]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[27.42, 18.62, 33.81], [12.55, 41.44,
20.88]]))");
io.print(r13,s13);
# return a multi-dimensional numpy array containing unicode strings
@@ -68,40 +68,40 @@ bat.append(bstr,"héllo":str);
bat.append(bstr,"éáú üüäãö":str);
bat.append(bstr,"幺巾乡ééæµè¯ä¸äºä¸å½ç¬¦å·":str);
bat.append(bstr,"ããã¤ãã®æ¥æ¬ã®ã·ã³ãã«ããã¹ããã¾ã":str);
-(z123:bat[:oid,:str], z234:bat[:oid,:str]) :=
pyapi.eval(nil:ptr,"return(numpy.array([arg1, arg1]))",bstr);
+(z123:bat[:str], z234:bat[:str]) :=
pyapi.eval(nil:ptr,"return(numpy.array([arg1, arg1]))",bstr);
io.print(z123,z234);
# return a multi-dimensional numpy array containing integers, but store them
in a string BAT
-(r14:bat[:oid,:str], s14:bat[:oid,:str]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[33, 24, 55], [44, 66,345]]))");
+(r14:bat[:str], s14:bat[:str]) := pyapi.eval(nil:ptr,"return(numpy.array([[33,
24, 55], [44, 66,345]]))");
io.print(r14,s14);
# return a multi-dimensional python array and load it into different types of
BATs
-(di:bat[:oid,:int],dd:bat[:oid,:flt]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[33.2, 24.7, 55.4], [44.1, 66.3,
2.2]]))");
+(di:bat[:int],dd:bat[:flt]) := pyapi.eval(nil:ptr,"return(numpy.array([[33.2,
24.7, 55.4], [44.1, 66.3, 2.2]]))");
io.print(di,dd);
#####################
# --MASKED ARRAYS-- #
#####################
# return a single masked array
-r15:bat[:oid,:int] := pyapi.eval(nil:ptr,
"return(numpy.ma.masked_array([862,43,24],[1,1,0]))");
+r15:bat[:int] := pyapi.eval(nil:ptr,
"return(numpy.ma.masked_array([862,43,24],[1,1,0]))");
io.print(r15);
# return a single masked array in an array
-r16:bat[:oid,:int] := pyapi.eval(nil:ptr,
"return([numpy.ma.masked_array([862,43,24],[1,1,0])])");
+r16:bat[:int] := pyapi.eval(nil:ptr,
"return([numpy.ma.masked_array([862,43,24],[1,1,0])])");
io.print(r16);
# return a single masked array in a numpy array (this is kind of weird, it
removes the entire masked array so it's a single numpy array)
-r17:bat[:oid,:int] := pyapi.eval(nil:ptr,
"return(numpy.array([numpy.ma.masked_array([862,43,24],[1,1,0])]))");
+r17:bat[:int] := pyapi.eval(nil:ptr,
"return(numpy.array([numpy.ma.masked_array([862,43,24],[1,1,0])]))");
io.print(r17);
# return a single masked array containing strings
-r18:bat[:oid,:str] := pyapi.eval(nil:ptr,
"return(numpy.ma.masked_array([\"Test\",\"Four\",24],[0,0,1]))");
+r18:bat[:str] := pyapi.eval(nil:ptr,
"return(numpy.ma.masked_array([\"Test\",\"Four\",24],[0,0,1]))");
io.print(r18);
# return a multi-dimensional masked array with even dimensions
-(r19:bat[:oid,:int], s19:bat[:oid,:int]) :=
pyapi.eval(nil:ptr,"return(numpy.ma.masked_array([[1, 2, 3], [1,2,3]],
[[0,0,0], [1,0,0]]))");
+(r19:bat[:int], s19:bat[:int]) :=
pyapi.eval(nil:ptr,"return(numpy.ma.masked_array([[1, 2, 3], [1,2,3]],
[[0,0,0], [1,0,0]]))");
io.print(r19,s19);
# return a multi-dimensional masked array with even dimensions
-(r20:bat[:oid,:str], s20:bat[:oid,:str]) :=
pyapi.eval(nil:ptr,"return(numpy.ma.masked_array([['str', 'test', 'k'],
['test','test213','test44']], [[0,0,0], [1,0,0]]))");
+(r20:bat[:str], s20:bat[:str]) :=
pyapi.eval(nil:ptr,"return(numpy.ma.masked_array([['str', 'test', 'k'],
['test','test213','test44']], [[0,0,0], [1,0,0]]))");
io.print(r20,s20);
diff --git a/monetdb5/extras/pyapi/Tests/pyapi_types_boolean.malC
b/monetdb5/extras/pyapi/Tests/pyapi_types_boolean.malC
--- a/monetdb5/extras/pyapi/Tests/pyapi_types_boolean.malC
+++ b/monetdb5/extras/pyapi/Tests/pyapi_types_boolean.malC
@@ -11,5 +11,5 @@ bat.append(bint,846930886:int);
bat.append(bint,1681692777:int);
bat.append(bint,1714636915:int);
bat.append(bint,nil:int);
-rint:bat[:oid,:int] := pyapi.eval(nil:ptr,"return(arg1)",bint);
+rint:bat[:int] := pyapi.eval(nil:ptr,"return(arg1)",bint);
io.print(rint);
diff --git a/monetdb5/extras/pyapi/Tests/pyapi_types_huge.malC
b/monetdb5/extras/pyapi/Tests/pyapi_types_huge.malC
--- a/monetdb5/extras/pyapi/Tests/pyapi_types_huge.malC
+++ b/monetdb5/extras/pyapi/Tests/pyapi_types_huge.malC
@@ -8,23 +8,23 @@ bat.append(bhge,-23:hge);
bat.append(bhge,nil:hge);
# return huge
-rhge:bat[:oid,:hge] := pyapi.eval(nil:ptr,"return(arg1)",bhge);
+rhge:bat[:hge] := pyapi.eval(nil:ptr,"return(arg1)",bhge);
io.print(rhge);
# computation with huge
-rhge:bat[:oid,:hge] := pyapi.eval(nil:ptr,"return(arg1*3)",bhge);
+rhge:bat[:hge] := pyapi.eval(nil:ptr,"return(arg1*3)",bhge);
io.print(rhge);
# convert int to huge
-(rhge:bat[:oid,:hge], shge:bat[:oid,:hge]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[32,12],[44,22]]))",bhge);
+(rhge:bat[:hge], shge:bat[:hge]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[32,12],[44,22]]))",bhge);
io.print(rhge, shge);
# convert double to huge
-(rhge:bat[:oid,:hge], shge:bat[:oid,:hge]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[3200.3,12.7],[44.1,22.8]]))",bhge);
+(rhge:bat[:hge], shge:bat[:hge]) :=
pyapi.eval(nil:ptr,"return(numpy.array([[3200.3,12.7],[44.1,22.8]]))",bhge);
io.print(rhge, shge);
# convert hge to string
-rhge:bat[:oid,:str] := pyapi.eval(nil:ptr,"return(arg1)",bhge);
+rhge:bat[:str] := pyapi.eval(nil:ptr,"return(arg1)",bhge);
io.print(rhge);
# convert string to hge
@@ -32,12 +32,12 @@ bstr:= bat.new(:oid,:str);
bat.append(bstr,"412412":str);
bat.append(bstr,"13231414":str);
bat.append(bstr,"895233278923448975389573895731":str);
-rhge:bat[:oid,:hge] := pyapi.eval(nil:ptr,"return(arg1)", bstr);
+rhge:bat[:hge] := pyapi.eval(nil:ptr,"return(arg1)", bstr);
io.print(rhge);
# return multidimensional huge
-(rhge:bat[:oid,:hge], shge:bat[:oid,:hge]) :=
pyapi.eval(nil:ptr,"return(numpy.ma.masked_array([arg1, arg1],
[arg1.mask,arg1.mask]))",bhge);
+(rhge:bat[:hge], shge:bat[:hge]) :=
pyapi.eval(nil:ptr,"return(numpy.ma.masked_array([arg1, arg1],
[arg1.mask,arg1.mask]))",bhge);
io.print(rhge, shge);
z:= bat.new(:oid,:hge);
@@ -59,14 +59,14 @@ bat.append(z,23:hge);
bat.append(z,23:hge);
# convert huge to int
-rint:bat[:oid,:int] := pyapi.eval(nil:ptr,"return(arg1)",z);
+rint:bat[:int] := pyapi.eval(nil:ptr,"return(arg1)",z);
io.print(rint);
# convert huge to double
-rdbl:bat[:oid,:dbl] := pyapi.eval(nil:ptr,"return(arg1)",z);
+rdbl:bat[:dbl] := pyapi.eval(nil:ptr,"return(arg1)",z);
io.print(rdbl);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
