Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Fixing cmake to pull from conda env #342

Merged
merged 13 commits into from Nov 8, 2018
Merged

[WIP] Fixing cmake to pull from conda env #342

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1bf9189
Fixing cmake to pull from conda env
Nov 6, 2018
a73446d
changed path to nvstrings.h
Nov 7, 2018
58b63dc
FIX Add retry for repo key download
mike-wendt Nov 7, 2018
6bba44b
FIX Add travis_retry to conda builds
mike-wendt Nov 7, 2018
a1d9c9e
FIX Add travis_retry for uploads
mike-wendt Nov 7, 2018
2f2b9f8
BLD Add nvidia channel for new home of nvstrings
mike-wendt Nov 7, 2018
25eb00d
BLD Update conda envs to include nvstrings
mike-wendt Nov 7, 2018
bcb5e48
Update conda-recipes/cudf/meta.yaml
kkraus14 Nov 7, 2018
72a23b7
Update conda-recipes/libgdf/meta.yaml
kkraus14 Nov 7, 2018
6724745
Update conda-recipes/libgdf_cffi/meta.yaml
kkraus14 Nov 7, 2018
9623216
Update travisci/build_cudf.sh
kkraus14 Nov 7, 2018
2e96915
Update travisci/libgdf/build_libgdf.sh
kkraus14 Nov 7, 2018
14aa3cb
Update travisci/libgdf/build_libgdf_cffi.sh
kkraus14 Nov 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion conda-recipes/cudf/meta.yaml
View file
Open in desktop
@@ -1,7 +1,7 @@
# Copyright (c) 2018, NVIDIA CORPORATION.

# Usage:
# conda build -c defaults -c conda-forge -c rapidsai -c numba .
# conda build -c defaults -c conda-forge -c nvidia -c rapidsai -c numba .
ogreen marked this conversation as resolved.
Show resolved Hide resolved
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
{% set git_revision_count=environ.get('GIT_DESCRIBE_NUMBER', 0) %}
package:
Expand Down
2 changes: 1 addition & 1 deletion conda-recipes/libgdf/meta.yaml
View file
Open in desktop
@@ -1,7 +1,7 @@
# Copyright (c) 2018, NVIDIA CORPORATION.

# Usage:
# conda build -c defaults -c conda-forge -c rapidsai .
# conda build -c defaults -c conda-forge -c nvidia -c rapidsai .
ogreen marked this conversation as resolved.
Show resolved Hide resolved
{% 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]) %}
Expand Down
2 changes: 1 addition & 1 deletion conda-recipes/libgdf_cffi/meta.yaml
View file
Open in desktop
@@ -1,7 +1,7 @@
# Copyright (c) 2018, NVIDIA CORPORATION.

# Usage:
# conda build -c defaults -c conda-forge .
# conda build -c defaults -c conda-forge -c nvidia .
ogreen marked this conversation as resolved.
Show resolved Hide resolved
{% 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]) %}
Expand Down
2 changes: 2 additions & 0 deletions conda_environments/builddocs_py35.yml
View file
Open in desktop
@@ -1,5 +1,6 @@
name: builddocs_py35
channels:
- nvidia
- rapidsai
- conda-forge
- numba
Expand All @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions conda_environments/testing_py35.yml
View file
Open in desktop
@@ -1,5 +1,6 @@
name: pycudf_testing_py35
channels:
- nvidia
- numba
- conda-forge
- rapidsai
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest moving rapidsai above conda-forge in case someone starts repackaging rapids libraries in conda-forge.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why didn't this comment get incorporated in the final PR?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's moreso nitpicking and can be addressed in the future.

Expand All @@ -13,3 +14,4 @@ dependencies:
- notebook>=0.5.0
- cmake=3.12.*
- boost
- nvstrings
5 changes: 2 additions & 3 deletions libgdf/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libgdf/src/io/csv/csv-reader.cu
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@

#include <rmm.h>

#include "custr/NVStrings.h"
#include "NVStrings.h"

constexpr int32_t HASH_SEED = 33;

Expand Down
138 changes: 0 additions & 138 deletions libgdf/src/io/csv/custr/CUDAStrings.h
View file
Open in desktop

This file was deleted.

95 changes: 0 additions & 95 deletions libgdf/src/io/csv/custr/NVCategory.h
View file
Open in desktop

This file was deleted.