Merge pull request #342 from ogreen/fix-cmake-strings

[WIP] Fixing cmake to pull from conda env
rapidsai · Nov 8, 2018 · 3505ac7 · 3505ac7
2 parents c469ea6 + 14aa3cb
commit 3505ac7
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 442 deletions.
diff --git a/conda-recipes/cudf/meta.yaml b/conda-recipes/cudf/meta.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION.
 
 # Usage:
-#   conda build -c defaults -c conda-forge -c rapidsai -c numba .
+#   conda build -c rapidsai -c nvidia -c numba -c conda-forge -c defaults .
 {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
 {% set git_revision_count=environ.get('GIT_DESCRIBE_NUMBER', 0) %}
 package:

diff --git a/conda-recipes/libgdf/meta.yaml b/conda-recipes/libgdf/meta.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION.
 
 # Usage:
-#   conda build -c defaults -c conda-forge -c rapidsai .
+#   conda build -c rapidsai -c nvidia -c conda-forge -c defaults .
 {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
 {% set git_revision_count=environ.get('GIT_DESCRIBE_NUMBER', 0) %}
 {% set cuda_version='.'.join(environ.get('CUDA', 'unknown').split('.')[:2]) %}

diff --git a/conda-recipes/libgdf_cffi/meta.yaml b/conda-recipes/libgdf_cffi/meta.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2018, NVIDIA CORPORATION.
 
 # Usage:
-#   conda build -c defaults -c conda-forge .
+#   conda build -c nvidia -c conda-forge -c defaults .
 {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
 {% set git_revision_count=environ.get('GIT_DESCRIBE_NUMBER', 0) %}
 {% set cuda_version='.'.join(environ.get('CUDA', 'unknown').split('.')[:2]) %}

diff --git a/conda_environments/builddocs_py35.yml b/conda_environments/builddocs_py35.yml
@@ -1,5 +1,6 @@
 name: builddocs_py35
 channels:
+- nvidia
 - rapidsai
 - conda-forge
 - numba
@@ -13,6 +14,7 @@ dependencies:
 - libgdf=0.2.0.*
 - libgdf_cffi=0.2.0.*
 - numba>=0.40.0dev
+- nvstrings
 - pandas=0.20.*
 - pyarrow=0.10.*
 - pip:

diff --git a/conda_environments/testing_py35.yml b/conda_environments/testing_py35.yml
@@ -1,5 +1,6 @@
 name: pycudf_testing_py35
 channels:
+- nvidia
 - numba
 - conda-forge
 - rapidsai
@@ -13,3 +14,4 @@ dependencies:
 - notebook>=0.5.0
 - cmake=3.12.*
 - boost
+- nvstrings
diff --git a/libgdf/CMakeLists.txt b/libgdf/CMakeLists.txt
@@ -176,9 +176,8 @@ else()
 endif()
 
 # Find libNVStrings.so, provided by rapidsai conda package
-find_library(NVSTRING_LIBRARY NVStrings HINTS ${CONDA_PREFIX}/lib)
-message(${NVSTRING_LIBRARY})
-
+find_library(NVSTRING_LIBRARY NVStrings HINTS $ENV{CONDA_PREFIX}/lib)
+include_directories(BEFORE SYSTEM $ENV{CONDA_PREFIX}/include)
 target_link_libraries(gdf ${NVSTRING_LIBRARY})
 
 # Command to symlink files into the build directory

diff --git a/libgdf/src/io/csv/csv-reader.cu b/libgdf/src/io/csv/csv-reader.cu
@@ -58,7 +58,7 @@
 
 #include <rmm.h>
 
-#include "custr/NVStrings.h"
+#include "NVStrings.h"
 
 constexpr int32_t HASH_SEED = 33;
 

diff --git a/libgdf/src/io/csv/custr/CUDAStrings.h b/libgdf/src/io/csv/custr/CUDAStrings.h
diff --git a/libgdf/src/io/csv/custr/NVCategory.h b/libgdf/src/io/csv/custr/NVCategory.h