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

Use NVTX from GitHub #6534

Closed
wants to merge 10 commits into from
Closed

Use NVTX from GitHub #6534

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e9b3bcb
Add CPM.
jrhemstad Oct 14, 2020
958917d
Require cmake 3.18
jrhemstad Oct 14, 2020
1b81dea
Fetch NVTX w/ CPM and link target.
jrhemstad Oct 14, 2020
c0063f2
Remove vendored nvtx3 header.
jrhemstad Oct 14, 2020
b974707
changelog.
jrhemstad Oct 14, 2020
ea5fe0d
shallow clone.
jrhemstad Oct 14, 2020
a418335
Remove the vendored nvtx3 header from the meta.yaml.
jrhemstad Oct 15, 2020
2dcbc80
Update CPM to 0.27.4.
jrhemstad Oct 15, 2020
86bb6a5
Set cmake policy for CUDA_ARCHITECTURES.
jrhemstad Oct 15, 2020
0386816
missin paren.
jrhemstad Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## New Features

-PR #6534 Use NVTX from GitHub instead of vendoring.

## Improvements

- PR #6432 Add dictionary support to `cudf::upper_bound` and `cudf::lower_bound`
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda10.1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- clang-tools=8.0.1
- cupy>7.1.0,<9.0.0a0
- rmm=0.17.*
- cmake>=3.14
- cmake>=3.18
- cmake_setuptools>=0.1.3
- python>=3.6,<3.8
- numba>=0.49.0,!=0.51.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda10.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- clang-tools=8.0.1
- cupy>7.1.0,<9.0.0a0
- rmm=0.17.*
- cmake>=3.14
- cmake>=3.18
- cmake_setuptools>=0.1.3
- python>=3.6,<3.8
- numba>=0.49,!=0.51.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- clang-tools=8.0.1
- cupy>7.1.0,<9.0.0a0
- rmm=0.17.*
- cmake>=3.14
- cmake>=3.18
- cmake_setuptools>=0.1.3
- python>=3.6,<3.8
- numba>=0.49,!=0.51.0
Expand Down
19 changes: 17 additions & 2 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
kkraus14 marked this conversation as resolved.
Show resolved Hide resolved

project(CUDA_DATAFRAME VERSION 0.17.0 LANGUAGES C CXX CUDA)

if(NOT CMAKE_CUDA_COMPILER)
message(SEND_ERROR "CMake cannot locate a CUDA compiler")
endif(NOT CMAKE_CUDA_COMPILER)

include(cmake/CPM.cmake)

###################################################################################################
# - build type ------------------------------------------------------------------------------------

Expand Down Expand Up @@ -788,11 +790,24 @@ message(STATUS "RMM_LOGGING_LEVEL = '${RMM_LOGGING_LEVEL}'.")

target_compile_definitions(cudf PUBLIC SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${RMM_LOGGING_LEVEL})

###################################################################################################
# - nvtx ------------------------------------------------------------------------------------------
CPMAddPackage(
jrhemstad marked this conversation as resolved.
Show resolved Hide resolved
NAME NVTX
GITHUB_REPOSITORY jrhemstad/NVTX # Use NVIDIA/NVTX once cmake overhaul is merged
GIT_TAG cmake-overhaul
SOURCE_SUBDIR cpp
GIT_SHALLOW TRUE
OPTIONS
"BUILD_TESTS Off"
"BUILD_BENCHMARKS Off"
)

###################################################################################################
# - link libraries --------------------------------------------------------------------------------

# link targets for cuDF
target_link_libraries(cudf arrow arrow_cuda nvrtc ${CUDART_LIBRARY} cuda ${ZLIB_LIBRARIES} ${Boost_LIBRARIES})
target_link_libraries(cudf arrow arrow_cuda nvrtc ${CUDART_LIBRARY} cuda ${ZLIB_LIBRARIES} ${Boost_LIBRARIES} nvtx3-cpp)

###################################################################################################
# - install targets -------------------------------------------------------------------------------
Expand Down
19 changes: 19 additions & 0 deletions cpp/cmake/CPM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
set(CPM_DOWNLOAD_VERSION c3c7e2d9a3b890511891ffc415d7ea23c689068a) # 0.27.3
jrhemstad marked this conversation as resolved.
Show resolved Hide resolved

if(CPM_SOURCE_CACHE)
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
elseif(DEFINED ENV{CPM_SOURCE_CACHE})
set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
else()
set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
endif()

if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
message(STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}")
file(DOWNLOAD
https://raw.githubusercontent.com/TheLartians/CPM.cmake/${CPM_DOWNLOAD_VERSION}/cmake/CPM.cmake
${CPM_DOWNLOAD_LOCATION}
)
endif()

include(${CPM_DOWNLOAD_LOCATION})
Loading