Update

CHANGELOG.md

@@ -187,6 +187,11 @@
 - PR #3002 Fix CUDA invalid configuration errors reported after loading an ORC file without data
 - PR #3035 Update update-version.sh for new docs locations
 - PR #3038 Fix uninitialized stream parameter in device_table deleter
+- PR #3064 Fixes groupby performance issue
+- PR #3061 Add rmmInitialize to nvstrings gtests
+- PR #3058 Fix UDF doc markdown formatting
+- PR #3059 Add nvstrings python build instructions to contributing.md
+
 
 # cuDF 0.9.0 (21 Aug 2019)
 

CONTRIBUTING.md

@@ -189,6 +189,12 @@ $ ./build.sh libcudf                   # compile the cuDF libraries and install
 $ make test
 ```
 
+- Build the `nvstrings` python packages, in the `python/nvstrings` folder:
+```bash
+$ cd $CUDF_HOME/python/nvstrings
+$ python setup.py install
+```
+
 - Build the `cudf` python package, in the `python/cudf` folder:
 ```bash
 $ cd $CUDF_HOME/python/cudf
@@ -214,12 +220,6 @@ $ cd $CUDF_HOME
 $ ./build.sh dask_cudf
 ```
 
-- You will also need the following environment variables, including `$CUDA_HOME`.
-```bash
-NUMBAPRO_NVVM=$CUDA_HOME/nvvm/lib64/libnvvm.so
-NUMBAPRO_LIBDEVICE=$CUDA_HOME/nvvm/libdevice
-```
-
 - To run Python tests (Optional):
 ```bash
 $ cd $CUDF_HOME/python

conda/recipes/nvstrings/meta.yaml

@@ -30,8 +30,10 @@ requirements:
     - setuptools
     - cmake_setuptools 0.1.3.*
     - libnvstrings {{ version }}
+    - rmm {{ minor_version }}.*
   run:
     - python
+    - rmm {{ minor_version }}.*
 
 test:
   commands:

cpp/custrings/tests/test_array.cu

@@ -6,9 +6,11 @@
 
 #include "./utils.h"
 
+struct TestArray : public GdfTest{};
+
 std::vector<const char*> hstrs{ "John Smith", "Joe Blow", "Jane Smith", nullptr, "" };
 
-TEST(TestArray, Sublist)
+TEST_F(TestArray, Sublist)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
 
@@ -21,7 +23,7 @@ TEST(TestArray, Sublist)
     NVStrings::destroy(strs);
 }
 
-TEST(TestArray, Gather)
+TEST_F(TestArray, Gather)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
 
@@ -38,7 +40,7 @@ TEST(TestArray, Gather)
     NVStrings::destroy(strs);
 }
 
-TEST(TestArray, GatherBool)
+TEST_F(TestArray, GatherBool)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
 
@@ -57,7 +59,7 @@ TEST(TestArray, GatherBool)
     NVStrings::destroy(strs);
 }
 
-TEST(TestArray, Scatter)
+TEST_F(TestArray, Scatter)
 {
     NVStrings* strs1 = NVStrings::create_from_array(hstrs.data(),hstrs.size());
     const char* h2[] = { "", "Joe Schmoe" };
@@ -84,7 +86,7 @@ TEST(TestArray, Scatter)
     NVStrings::destroy(strs2);
 }
 
-TEST(TestArray, RemoveStrings)
+TEST_F(TestArray, RemoveStrings)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
 
@@ -101,7 +103,7 @@ TEST(TestArray, RemoveStrings)
     NVStrings::destroy(strs);
 }
 
-TEST(TestArray, SortLength)
+TEST_F(TestArray, SortLength)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
 
@@ -113,7 +115,7 @@ TEST(TestArray, SortLength)
     NVStrings::destroy(strs);
 }
 
-TEST(TestArray, SortName)
+TEST_F(TestArray, SortName)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
 
@@ -125,7 +127,7 @@ TEST(TestArray, SortName)
     NVStrings::destroy(strs);
 }
 
-TEST(TestArray, OrderLength)
+TEST_F(TestArray, OrderLength)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
 
@@ -139,7 +141,7 @@ TEST(TestArray, OrderLength)
     NVStrings::destroy(strs);
 }
 
-TEST(TestArray, OrderName)
+TEST_F(TestArray, OrderName)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
 
@@ -152,9 +154,3 @@ TEST(TestArray, OrderName)
 
     NVStrings::destroy(strs);
 }
-
-int main( int argc, char** argv )
-{
-    testing::InitGoogleTest(&argc,argv);
-    return RUN_ALL_TESTS();
-}

cpp/custrings/tests/test_attrs.cu

@@ -4,12 +4,16 @@
 
 #include "nvstrings/NVStrings.h"
 
+#include "./utils.h"
+
+struct TestAttrs : public GdfTest{};
+
 std::vector<const char*> hstrs{
         "Héllo", "thesé", nullptr, "ARE THE", "tést strings", "",
         "1.75", "-34", "+9.8", "17¼", "x³", "2³", " 12⅝",
         "1234567890", "de", "\t\r\n\f "};
 
-TEST(TestAttrs, CharCounts)
+TEST_F(TestAttrs, CharCounts)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(), hstrs.size());
 
@@ -23,7 +27,7 @@ TEST(TestAttrs, CharCounts)
     NVStrings::destroy(strs);
 }
 
-TEST(TestAttrs, ByteCounts)
+TEST_F(TestAttrs, ByteCounts)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(), hstrs.size());
 
@@ -37,7 +41,7 @@ TEST(TestAttrs, ByteCounts)
     NVStrings::destroy(strs);
 }
 
-TEST(TestAttrs, IsAlpha)
+TEST_F(TestAttrs, IsAlpha)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(), hstrs.size());
 
@@ -72,7 +76,7 @@ TEST(TestAttrs, IsAlpha)
     NVStrings::destroy(strs);
 }
 
-TEST(TestAttrs, IsNumeric)
+TEST_F(TestAttrs, IsNumeric)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(), hstrs.size());
 
@@ -107,7 +111,7 @@ TEST(TestAttrs, IsNumeric)
     NVStrings::destroy(strs);
 }
 
-TEST(TestAttrs, IsSpace)
+TEST_F(TestAttrs, IsSpace)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(), hstrs.size());
 
@@ -134,7 +138,7 @@ TEST(TestAttrs, IsSpace)
     NVStrings::destroy(strs);
 }
 
-TEST(TestAttrs, IsUpperLower)
+TEST_F(TestAttrs, IsUpperLower)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(), hstrs.size());
 
@@ -160,7 +164,7 @@ TEST(TestAttrs, IsUpperLower)
     NVStrings::destroy(strs);
 }
 
-TEST(TestAttrs, CodePoints)
+TEST_F(TestAttrs, CodePoints)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(), 2);
     thrust::device_vector<unsigned int> results(10,0);
@@ -169,9 +173,3 @@ TEST(TestAttrs, CodePoints)
     for( int idx = 0; idx < 10; ++idx )
         EXPECT_EQ(results[idx],expected[idx]);
 }
-
-int main( int argc, char** argv )
-{
-    testing::InitGoogleTest(&argc,argv);
-    return RUN_ALL_TESTS();
-}

cpp/custrings/tests/test_case.cpp

@@ -5,9 +5,11 @@
 
 #include "./utils.h"
 
+struct TestCase : public GdfTest{};
+
 std::vector<const char*> hstrs{ "Examples aBc", "thesé", nullptr, "ARE THE", "tést strings", "" };
 
-TEST(TestCase, ToLower)
+TEST_F(TestCase, ToLower)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
     NVStrings* got = strs->lower();
@@ -17,7 +19,7 @@ TEST(TestCase, ToLower)
     NVStrings::destroy(strs);
 }
 
-TEST(TestCase, ToUpper)
+TEST_F(TestCase, ToUpper)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
     NVStrings* got = strs->upper();
@@ -27,7 +29,7 @@ TEST(TestCase, ToUpper)
     NVStrings::destroy(strs);
 }
 
-TEST(TestCase, Swapcase)
+TEST_F(TestCase, Swapcase)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
     NVStrings* got = strs->swapcase();
@@ -37,7 +39,7 @@ TEST(TestCase, Swapcase)
     NVStrings::destroy(strs);
 }
 
-TEST(TestCase, Capitalize)
+TEST_F(TestCase, Capitalize)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
     NVStrings* got = strs->capitalize();
@@ -47,7 +49,7 @@ TEST(TestCase, Capitalize)
     NVStrings::destroy(strs);
 }
 
-TEST(TestCase, Title)
+TEST_F(TestCase, Title)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs.data(),hstrs.size());
     NVStrings* got = strs->title();
@@ -56,9 +58,3 @@ TEST(TestCase, Title)
     NVStrings::destroy(got);
     NVStrings::destroy(strs);
 }
-
-int main( int argc, char** argv )
-{
-    testing::InitGoogleTest(&argc,argv);
-    return RUN_ALL_TESTS();
-}

cpp/custrings/tests/test_combine.cpp

@@ -5,12 +5,14 @@
 
 #include "./utils.h"
 
+struct TestCombine : public GdfTest{};
+
 std::vector<const char*> hstrs1{ "thesé", nullptr, "are", "the",
                                  "tést", "strings", "" };
 std::vector<const char*> hstrs2{ "1234", "accénted", "", nullptr, 
                                  "5678", "othér", "9" };
 
-TEST(TestCombine, Concatenate)
+TEST_F(TestCombine, Concatenate)
 {
     NVStrings* strs1 = NVStrings::create_from_array(hstrs1.data(),hstrs1.size());
     NVStrings* strs2 = NVStrings::create_from_array(hstrs2.data(),hstrs2.size());
@@ -46,7 +48,7 @@ TEST(TestCombine, Concatenate)
 std::vector<const char*> hstrs3{ "abcdéf", "", nullptr, "ghijkl",
                                  "mnop", "éach", "xyz" };
 
-TEST(TestCombine, ConcatenateMultiple)
+TEST_F(TestCombine, ConcatenateMultiple)
 {
     NVStrings* strs1 = NVStrings::create_from_array(hstrs1.data(),hstrs1.size());
     NVStrings* strs2 = NVStrings::create_from_array(hstrs2.data(),hstrs2.size());
@@ -84,7 +86,7 @@ TEST(TestCombine, ConcatenateMultiple)
     NVStrings::destroy(strs3);
 }
 
-TEST(TestCombine, Join)
+TEST_F(TestCombine, Join)
 {
     NVStrings* strs = NVStrings::create_from_array(hstrs1.data(),hstrs1.size());
 
@@ -111,9 +113,3 @@ TEST(TestCombine, Join)
 
     NVStrings::destroy(strs);
 }
-
-int main( int argc, char** argv )
-{
-    testing::InitGoogleTest(&argc,argv);
-    return RUN_ALL_TESTS();
-}