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

Fix kernel and line info in cmake #3941

Merged
merged 12 commits into from
Jun 9, 2021
Merged

Fix kernel and line info in cmake #3941

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
90b1292
FIX fix kernel and line info in cmake
dantegd Jun 3, 2021
36c80a2
FIX Use ucx-py 0.21
dantegd Jun 3, 2021
8594eda
DBG Try installing xgb 21.06 after the big conda install
dantegd Jun 5, 2021
0402975
DBG Try using mamba to avoid timeouts
dantegd Jun 6, 2021
5a5d184
DBG install xgboost after libcuml artifact
dantegd Jun 6, 2021
e1bca08
DBG Playing with using mamba a little bit more
dantegd Jun 6, 2021
24b3198
DBG Remove xgboost instead of all of the above
dantegd Jun 7, 2021
9692b43
DBG correct ucx-py version
dantegd Jun 7, 2021
0f28f31
FIX Change order of commented code to make the script happy
dantegd Jun 7, 2021
3440b8e
Merge branch 'branch-21.08' into 2108-fix-likerinfo
dantegd Jun 7, 2021
8d20def
FIX Merge main and use dask main
dantegd Jun 7, 2021
71e0685
FIX add back xgboost now that package is published
dantegd Jun 8, 2021
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
7 changes: 5 additions & 2 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ gpuci_conda_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvid
"libcumlprims=${MINOR_VERSION}" \
"dask-cudf=${MINOR_VERSION}" \
"dask-cuda=${MINOR_VERSION}" \
"ucx-py=${MINOR_VERSION}" \
"ucx-py=0.21" \
"ucx-proc=*=gpu" \
"xgboost=1.4.2dev.rapidsai${MINOR_VERSION}" \
"rapids-build-env=${MINOR_VERSION}.*" \
"rapids-notebook-env=${MINOR_VERSION}.*" \
"rapids-doc-env=${MINOR_VERSION}.*" \
Expand All @@ -65,6 +64,10 @@ gpuci_conda_retry install -c conda-forge -c rapidsai -c rapidsai-nightly -c nvid
# gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env
# gpuci_conda_retry install -y "your-pkg=1.0.0"

# Installing xgboost 21.06 in the install above was causing conflicts
gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env
gpuci_conda_retry install -y -c conda-forge -c rapidsai -c rapidsai-nightly -c nvidia "xgboost=1.4.2dev.rapidsai21.06"

gpuci_logger "Install contextvars if needed"
py_ver=$(python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")
if [ "$py_ver" == "3.6" ];then
Expand Down
7 changes: 4 additions & 3 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ option(BUILD_CUML_BENCH "Build cuML C++ benchmark tests" ON)
option(BUILD_CUML_PRIMS_BENCH "Build ml-prims C++ benchmark tests" ON)
option(BUILD_CUML_STD_COMMS "Build the standard NCCL+UCX Communicator" ON)
option(BUILD_CUML_MPI_COMMS "Build the MPI+NCCL Communicator (used for testing)" OFF)
option(CUDA_ENABLE_KERNEL_INFO "Enable kernel resource usage info" OFF)
option(CUDA_ENABLE_LINE_INFO "Enable lineinfo in nvcc" OFF)
option(DETECT_CONDA_ENV "Enable detection of conda environment for dependencies" ON)
option(DISABLE_DEPRECATION_WARNINGS "Disable depreaction warnings " ON)
option(DISABLE_OPENMP "Disable OpenMP" OFF)
option(ENABLE_CUMLPRIMS_MG "Enable algorithms that use libcumlprims_mg" ON)
option(KERNEL_INFO "Enable kernel resource usage info" OFF)
option(LINE_INFO "Enable lineinfo in nvcc" OFF)
option(NVTX "Enable nvtx markers" OFF)
option(SINGLEGPU "Disable all mnmg components and comms libraries" OFF)
option(USE_CCACHE "Cache build artifacts with ccache" OFF)
Expand All @@ -82,7 +82,8 @@ message(VERBOSE "CUML: Enabling detection of conda environment for dependencies:
message(VERBOSE "CUML: Disabling OpenMP: ${DISABLE_OPENMP}")
message(VERBOSE "CUML: Enabling algorithms that use libcumlprims_mg: ${ENABLE_CUMLPRIMS_MG}")
message(VERBOSE "CUML: Enabling kernel resource usage info: ${KERNEL_INFO}")
message(VERBOSE "CUML: Enabling lineinfo in nvcc: ${LINE_INFO}")
message(VERBOSE "CUML: Enabling kernelinfo in nvcc: ${CUDA_ENABLE_KERNEL_INFO}")
message(VERBOSE "CUML: Enabling lineinfo in nvcc: ${CUDA_ENABLE_LINE_INFO}")
message(VERBOSE "CUML: Enabling nvtx markers: ${NVTX}")
message(VERBOSE "CUML: Disabling all mnmg components and comms libraries: ${SINGLEGPU}")
message(VERBOSE "CUML: Cache build artifacts with ccache: ${USE_CCACHE}")
Expand Down
10 changes: 7 additions & 3 deletions cpp/cmake/modules/ConfigureCUDA.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,13 @@ if(DISABLE_DEPRECATION_WARNING)
endif()

# Option to enable line info in CUDA device compilation to allow introspection when profiling / memchecking
if(CUDA_ENABLE_LINEINFO)
list(APPEND CUML_CUDA_FLAGS -lineinfo)
endif()
if(CUDA_ENABLE_LINE_INFO)
list(APPEND CUML_CUDA_FLAGS -lineinfo)
endif(LINE_INFO)
trivialfis marked this conversation as resolved.
Show resolved Hide resolved

if(CUDA_ENABLE_KERNEL_INFO)
list(APPEND CUML_CUDA_FLAGS -Xptxas=-v)
endif(KERNEL_INFO)
trivialfis marked this conversation as resolved.
Show resolved Hide resolved

# Debug options
if(CMAKE_BUILD_TYPE MATCHES Debug)
Expand Down