From 123204d50f57935a97c5a2bb4534482ca22fcb3c Mon Sep 17 00:00:00 2001 From: vuule Date: Tue, 27 Jul 2021 00:17:17 -0700 Subject: [PATCH 1/2] fix RLE stream size for timestamp columns; add test --- cpp/src/io/orc/writer_impl.cu | 4 ++-- .../data/orc/TestOrcFile.largeTimestamps.orc | Bin 0 -> 6327 bytes python/cudf/cudf/tests/test_orc.py | 19 ++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 python/cudf/cudf/tests/data/orc/TestOrcFile.largeTimestamps.orc diff --git a/cpp/src/io/orc/writer_impl.cu b/cpp/src/io/orc/writer_impl.cu index 123b636ef9b..d93845530d7 100644 --- a/cpp/src/io/orc/writer_impl.cu +++ b/cpp/src/io/orc/writer_impl.cu @@ -575,8 +575,8 @@ orc_streams writer::impl::create_streams(host_span columns, break; } case TypeKind::TIMESTAMP: - add_RLE_stream(gpu::CI_DATA, DATA, TypeKind::INT); - add_RLE_stream(gpu::CI_DATA2, SECONDARY, TypeKind::INT); + add_RLE_stream(gpu::CI_DATA, DATA, TypeKind::LONG); + add_RLE_stream(gpu::CI_DATA2, SECONDARY, TypeKind::LONG); column.set_orc_encoding(DIRECT_V2); break; case TypeKind::DECIMAL: diff --git a/python/cudf/cudf/tests/data/orc/TestOrcFile.largeTimestamps.orc b/python/cudf/cudf/tests/data/orc/TestOrcFile.largeTimestamps.orc new file mode 100644 index 0000000000000000000000000000000000000000..095b7372c89e8866cb318524d0b7936e44956e8b GIT binary patch literal 6327 zcmZvBX;@QN)b2Sa^Ke4ugiH()WJ;J3kpKb#K>~t+OaW1X2m}EMMQhYjf>Z%56{QN) zTEU4R4pFp5Z~(0e4i#!q)FR**plT3@kjw48|Gw|Xe%?K;wTHFdy`N{Tn79xc0N^oH z6t)7h4DbU08#3Msj|Ujw5-J6I7afUb1J)PEe*bXhW$`lbIsh2WTg)c&N3&^mauzVZ zn*3-st4-!#%wNprNway&M{`%#ta%n;{`$#eHX+QjT@#@B{a=$NvwC)JYS*NBPHJ|` zmbsCSU6A?zw#G3<{3{s13C8ojE2Fp_n$cokGO(;{ z@TO4xvN_V}gQ%;+^3&37Lqhxo@r^YGoZTTSYWB(QJScwPppBA3%1MgSEKH+LU0rL9 zd(=JckWW~2sK?@uQ?Lc%EO z9jW@$44(a0*OSKq^BvcbFiA%(M#I|t#vAg-e^a_(d-7KEd^bPHYxLjs08dOYpMUn+ zf99X6XOXCoD`*aYynBF7+lbsAdht4wnz(!Przc4Vf0vVrfsL^N@e1z?n-Z$}kJ~4Y zTu0a9&V;*P2y5>PXLgW+syBjl$e%S1Qd$WzUFXe?t_7UFh zuvgJ(#e_tkqL0C2K1F*AI>NH5J3`MgV9oiF)QGCt&+Fs!+k>LFe$6Bz3$LxHRNA>7 zbINo1)#&5hz0aGcc(WrGi%xp9(n97&FshFF=bf(0T;$qCaQfNLzlb z<+zvc+OMiwrp}{fm2guQ$HVrer>)ran-Mdh*pl#?XR8fSRWH4}^YA-z{JYIb8BAl1 z+x(Mh#r;6Q=VQxW z=a^Iaebz1jNx{5jMUn?Z_Z3ISh07IdA7&p_R6gV0U1OT%xg-7(GhCW_qDX81+A*=t z>Tz^HXs~Nklx44zq|o|9lb^$y$FYx_VYu!(S*(x#iwIL3CdJF4BAy(lc{%$ya(S?;maiKSszakQRBW~hD7Mb?(aLH0=)2hG&GP)0! zZ)h%X_@}8N`on&6aAAi8Xk4EWFu&FQbIT2m)4$(*J!8}EKA4!b=gID3_XCd#Y6VB! z(2t!3_qvY-D1)zETK{$E1Qn0#K^<7TW1FzszvO&SJMp(4hNeN2yG;rC_e_IZs%1Rv z!5%#)eW?gQ+c;nrmMv_Lc}#s+8{aTlx-aeNwV(V84vxMU^svWl8qZ|8QVv>3I}hDO zt{Axg)(wAnU4WQ6gxG`J{i`Vp8nD*+6x+q>suk?0)WO)@?Dwr9U-D}!sRe^}BR)sg zR!+cF>iul*%fV0Xud&$qlI?B&zIt=v-cu#{qV3<5yi0*5oI99Dq9!Z()t?;vWK{;Y zazG+H5|R-W-BFdf^1C%>lXW~zA^)-6^CNzL|MOrrjnWgliPOBYo@g)5t(^(~JLu}5 zj3V;A2^@{!n&)e`yVI!+x@$`oe?0WUi&fm!>5>@oHLxvuUOnnTYKCh0l>P4X#ZcirzS;6T&R~IV3zOtCvkr#sINKiQ zx{frJXnc;Z^W3TZ-YZR!Ja079O+M^Xw7o8R&=UKXDH>aMaGEY%QZ*5}&a~=A+3E#F zP;H^u)N+b!bPMz4j4Oh|!uBBE*3El#{^5m)d(sCJ7F#a+fABOE!VODKJk<%}+`*Xu z?yD!$ZHwvU^&b{)8$0C|6mjF^5VuL>9OO}-w{cIw;sx&PA7s=LMbZQ@tM)y=4(tmT;Qwicw zbk38FZxic_;-(i|A8;(RzR)l3aQ*=hH>3T?KVKBaHQ%qsoJi}2cq(Z^4o{|vtc#(B z>!Vk({7&{#X5MeRem%5avb;7e=5XA5|0Rv^kK>+%v?;tb)njBv zxkX=?B~tJ0IRj_k5yZvFT9968+mWh=!Dmkd?~dCf&kq30Q?mThS~pxedu*^xKI@cW#aXwo>NeG>n zxVXHcyfAJ@H$JL3GX1VV`0EPSX*DFEAR}#_%;+5if{><9y_!xG@_eZ;M0+?tmax9nlu!UAP6 zpVEfweM67R8~@HZxa5AtyH=&|%aOD4yqhm_3){p6rLmp&Kdp?J%5t=Gp3Ey;=GM`% zZP)s@r)X7C>)A21YyYeMj#E!>S0mLcxkjAH*B+?TYX-Zavw^G}nVO z7L@7p1!#hMpr3W~+S2mWqJwWjS1Sr+a-sX8_sHL#335ox zCX(%KIH%ULu{(CWu$}j$aobkRL9!mXG`6kJE6%;)M4bCo(rTW=e1D9GBJ;%F&;LC# zHe!iGi6c~T>d1n(+&m`0@2f7%7C$U)Gg9dM zA)k2B?b|{D_%||kA~NVt6~Nl}zQ`|9^>qt5ZM>wet>n<{A2t%VR$K4GJl}BqnJ4Yz z5u$I47=2faI(>g;{%+5lq18)P#eDYMjEu02YYzXRGeviB(aNP~H?AIv7+qggGVgv_ zy1=ty>9>z5w3mbBg}U>rk=TOJn+I1U_T;)b?AojCfQ}vBmS}OswE^k1zqG-cdVI^n z+~CY#Dxs3Jw{CG8Vp9LG{hXgJ7KX=#6ic-o$&+M+pNA#mHL!L(6yhEz*q8MJ&_0Qt@j005oU*OHR(#7-5l<1_)rGO7v3Wzzzf7GWqO2-PhEgU6 zsvk$=OCTRcX6%o3UJoM|+eTM@&rh^|a>FXF;MdEJNh}nY{nBPSwWJQCU&f(AJ?V|T zUcrM)JxX5AkS=C_x$|N)C7080x9*nu?`bboSK%o1#d9S!f7bO2TAYxaJxbdN3z<3h z)-aoaA3evfrtJK)ORU%=#x^Gvi}qh}l6UADV$&1DNql59bFP3H?eeAIAK zWJJ*)nz$^v@b;;tf4Tj6QC_}||ByNql}U6w_u~6>RAutsl*l55Yzb}cjxBey>odM_ zin!&N+nQE;a;2RsOxkn6^Ij@g9I@T%hbY4ALDC%ZErSGor;~cItN!RZHg8MYs5Lz> zaYyK)kBF+mqepOf660OhI2FII5G`36f7k`R=G%8yY`Axk{f?u9iQULvyW_=(SO3sB zZsjA%4dl0q%zUwRK=pK_p>*@jQ2jvj<3}r56sQ zV{b#u6;tWQ>{1RZdf98Q@7o$jcfA_9v1I?EG5X@SLS`#;?#GHjhF3yzyw@awbilV~ z?YVp#qs_ub#;sPj33P@B%P;3UmtQ))ijO|4ExI?Q}>-zIMf_ zPm(O`7fMoAUd!=CJ0ITjZAVh$8uqAvh>CM1Z=!akwP)L|vd#PfW$84OxGm=`b3uMl-W0~#9i?dZX5cIwmRM+n;i2Z&8mFvhM+ygB{;?ozv z0ch)TH9BkirK*0;x539QIr=`FpA__V<5sT}*GEC(V0h=7c;@Bl3S06b$@b5X`h91p4}G5c zvkVbcuj8;bZ2}B+Z-}q6i~o5#J@q2B(_`~~>1 z)}5&g`}T*~fTd@zhUFwT9`AgX7`g~wE4yI-XKi5Un+4SlpEu+U0u2$SNh{}&)Zm!N zVAVzV*Lzl1f+w{5?HZl@FPrg4d( zt**77kKgdB6JVL%t8x`3**nL9iu2RfHo9+(+G58KDd;Feann6Zm%c3eep6`4 z8^0j;r<7O4q~TT-D_q0f4t;> zcY10x<=JJpoKE16PnR_K@8}GtHp{~NS21r@lSP-lk`%PEjcExZsMVi~j^3Raa@4)) z3I*K`91mkSoGdJ`)N^($D?G0gUs=2;JZZ`z@AZasf7H@0 z=aF!6mm8}bG9%5l@w0i7w^r}FZuo`3D?*v*j^-gA!NZm&uojZi_3Qyo3%(xUiB<0x5DPy;G~KBff4z{@#JI3-Dj zk+O^kDP9g5dG(|oNQO|74O9_b18RsSY7?gi3FAZp2ET==XBg;uOdqR{SdXp&3wRPR zo1*}SA$xi~G)_^{V7fPMm@GsN^OYnam<}{UKujwa|x|dYX}O_myl5M%-XLPwR5`~dX$#Jx2WfsEMfE< zqo716z(P$Efwf3uMhs#YuO}*rDv-&PffINUn2lCj^w5-07&Hx(a`_|!)<~+i7+^Iq z5|9a88Cs4}p_F(nP7Sm(VJmpK|%X*9uu)=CAVTuaH2b6P6>xTm9O{_7DilZZ` zIeN4Pr{|$i3XT>y3+d+AXfMzpB`hWAgRFtHR4t(8i5Lt_0#1(<@>{qDav$7BuK_o+ zr3^hXfnorB1bU8yt(o&oJ=>c%CSXv;crru+t%<3i$cUmjt@`V<9ww^4N&O;=siF>U_}z46OePe0ee_d z9*j0wYN0Sp0>;RcvlQe$NP;p5B!V7LFt?kz6JdvOCVmYufu$kn>0_1yY$@2ztjFp( za=^!e0o4+F&;|+$?nBgIQTznx2}Q-%0t>9XQ6_;1r{>83z)}JB;Kl^PIrc~hJzSlj z2HixMyFo+?SBV_Ps;#_Pb5=ptU}|`JhKj3()vN)kj^mAyubYeKqp@f*z$X5OAlrHl z0W!$W#$&MH9PYK5tDxp8hhZv&1?CFGK_tY71kOqF@&7LqfT#bD;D6E~*GB+=MUZRU zIK(+{VIOj}_H(Gf*y6E7DhP5A8LQoFAuP_x2G3qsyhfZ^n7KMfAzojYS)3;>RTQsZ zyRLwW@)Wy^-Q6lMe*Zt^@V_n;v@3cEkOX22$q;+%R Date: Wed, 28 Jul 2021 20:21:37 +0800 Subject: [PATCH 2/2] fix cufilejni build w/ c++17 (#8877) Signed-off-by: Peixin Li cufilejni was not specified CXX standard, so if `ENABLE_GDS=ON`, it will fail w/ ``` error: 'is_same_v' is not a member of 'std'; did you mean 'is_same' ``` Authors: - pxLi (https://github.com/pxLi) Approvers: - MithunR (https://github.com/mythrocks) URL: https://github.com/rapidsai/cudf/pull/8877 --- java/src/main/native/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/java/src/main/native/CMakeLists.txt b/java/src/main/native/CMakeLists.txt index 1b0b747f92b..c018c0aa742 100755 --- a/java/src/main/native/CMakeLists.txt +++ b/java/src/main/native/CMakeLists.txt @@ -293,6 +293,14 @@ target_compile_definitions(cudfjni if(USE_GDS) add_library(cufilejni SHARED "src/CuFileJni.cpp") + SET_TARGET_PROPERTIES(cufilejni + PROPERTIES BUILD_RPATH "\$ORIGIN" + # set target compile options + CXX_STANDARD 17 + CXX_STANDARD_REQUIRED ON + CUDA_STANDARD 17 + CUDA_STANDARD_REQUIRED ON + ) target_include_directories(cufilejni PRIVATE "${cuFile_INCLUDE_DIRS}") target_link_libraries(cufilejni PRIVATE cudfjni "${cuFile_LIBRARIES}") endif(USE_GDS)