Skip to content

[REVIEW] BUG Calling gunrock cmake using explicit -D options, re-enabling C++ tests #1242

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

Merged
BradReesWork merged 2 commits into from
Oct 23, 2020
Merged

[REVIEW] BUG Calling gunrock cmake using explicit -D options, re-enabling C++ tests #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e5c9f3
Changed CMakeLists.txt to call gunrock cmake using explicit -D option…
rlratzel Oct 23, 2020
3a5ba3f
Added PR 1242 and 0.16 release date to CHANGELOG.
rlratzel Oct 23, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
## Improvements

## Bug Fixes
- PR #1242 Calling gunrock cmake using explicit -D options, re-enabling C++ tests


# cuGraph 0.16.0 (Date TBD)
# cuGraph 0.16.0 (21 Oct 2020)

## New Features
- PR #1098 Add new graph classes to support 2D partitioning
Expand Down
16 changes: 6 additions & 10 deletions ci/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,12 @@ else
cd $WORKSPACE/ci/artifacts/cugraph/cpu/conda_work/cpp/build
fi

# FIXME: temporarily disabling all C++ tests for 0.16 due to intermittent
# failures from what appears to be an issue with Thrust (which does not appear
# to affect the Python API or notebooks). Re-enable once this issue is resolved
# in 0.17.
# for gt in gtests/*; do
# test_name=$(basename $gt)
# echo "Running GoogleTest $test_name"
# ${gt} ${GTEST_FILTER} ${GTEST_ARGS}
# ERRORCODE=$((ERRORCODE | $?))
# done
for gt in gtests/*; do
test_name=$(basename $gt)
echo "Running GoogleTest $test_name"
${gt} ${GTEST_FILTER} ${GTEST_ARGS}
ERRORCODE=$((ERRORCODE | $?))
done

if [[ "$PROJECT_FLASH" == "1" ]]; then
echo "Installing libcugraph..."
Expand Down
32 changes: 23 additions & 9 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,40 +50,48 @@ endif(CMAKE_COMPILER_IS_GNUCXX)

find_package(CUDA)

# Configure GPU arch to build
set(GUNROCK_GENCODE_SM60 "OFF")
set(GUNROCK_GENCODE_SM61 "OFF")
set(GUNROCK_GENCODE_SM70 "OFF")
set(GUNROCK_GENCODE_SM72 "OFF")
set(GUNROCK_GENCODE_SM75 "OFF")
set(GUNROCK_GENCODE_SM80 "OFF")

# Check for aarch64 vs workstation architectures
if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
message(STATUS "CMAKE Detected aarch64 CPU architecture, selecting appropriate gencodes")
# This is being build for Linux4Tegra or SBSA ARM64 CUDA
set(GPU_ARCHS "62") # Default minimum CUDA GenCode - not supported by gunrock
if(CUDA_VERSION_MAJOR GREATER_EQUAL 9)
set(GPU_ARCHS "${GPU_ARCHS};72")
set(GUNROCK_GENCODE "-DGUNROCK_GENCODE_SM72=TRUE")
set(GUNROCK_GENCODE_SM72 "ON")
endif()
if(CUDA_VERSION_MAJOR GREATER_EQUAL 11)
# This is probably for SBSA CUDA, or a next gen Jetson
set(GPU_ARCHS "${GPU_ARCHS};75;80")
set(GUNROCK_GENCODE "${GUNROCK_GENCODE} -DGUNROCK_GENCODE_SM75=TRUE -DGUNROCK_GENCODE_SM80=TRUE ")
set(GUNROCK_GENCODE_SM75 "ON")
set(GUNROCK_GENCODE_SM80 "ON")
endif()

else()
message(STATUS "CMAKE selecting appropriate gencodes for x86 or ppc64 CPU architectures")
# System architecture was not aarch64,
# this is datacenter or workstation class hardware
set(GPU_ARCHS "60") # Default minimum supported CUDA gencode
set(GUNROCK_GENCODE "-DGUNROCK_GENCODE_SM60=TRUE")
set(GUNROCK_GENCODE_SM60 "ON")
if(CUDA_VERSION_MAJOR GREATER_EQUAL 9)
set(GPU_ARCHS "${GPU_ARCHS};70")
set(GUNROCK_GENCODE "${GUNROCK_GENCODE} -DGUNROCK_GENCODE_SM70=TRUE")
set(GUNROCK_GENCODE_SM70 "ON")
endif()
if(CUDA_VERSION_MAJOR GREATER_EQUAL 10)
set(GPU_ARCHS "${GPU_ARCHS};75")
set(GUNROCK_GENCODE "${GUNROCK_GENCODE} -DGUNROCK_GENCODE_SM75=TRUE")
set(GUNROCK_GENCODE_SM75 "ON")
endif()
if(CUDA_VERSION_MAJOR GREATER_EQUAL 11)
set(GPU_ARCHS "${GPU_ARCHS};80")
set(GUNROCK_GENCODE "${GUNROCK_GENCODE} -DGUNROCK_GENCODE_SM80=TRUE")
set(GUNROCK_GENCODE_SM80 "ON")
endif()

endif()

message("-- Building for GPU_ARCHS = ${GPU_ARCHS}")
Expand All @@ -98,6 +106,7 @@ set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-extended-lambda")
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Werror=cross-execution-space-call -Wno-deprecated-declarations -Xptxas --disable-warnings")
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler -Wall,-Wno-error=sign-compare,-Wno-error=unused-but-set-variable")


# Option to enable line info in CUDA device compilation to allow introspection when profiling /
# memchecking
option(CMAKE_CUDA_LINEINFO "Enable the -lineinfo option for nvcc (useful for cuda-memcheck / profiler" OFF)
Expand Down Expand Up @@ -248,7 +257,6 @@ set(LIBCUDACXX_INCLUDE_DIR "${libcudacxx_SOURCE_DIR}/include")
message("set LIBCUDACXX_INCLUDE_DIR to: ${LIBCUDACXX_INCLUDE_DIR}")



###################################################################################################
# - External Projects -----------------------------------------------------------------------------

Expand Down Expand Up @@ -280,7 +288,13 @@ ExternalProject_Add(cugunrock
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DGUNROCK_BUILD_SHARED_LIBS=OFF
-DGUNROCK_BUILD_TESTS=OFF
-DCUDA_AUTODETECT_GENCODE=FALSE
-DCUDA_AUTODETECT_GENCODE=OFF
-DGUNROCK_GENCODE_SM60=${GUNROCK_GENCODE_SM60}
-DGUNROCK_GENCODE_SM61=${GUNROCK_GENCODE_SM61}
-DGUNROCK_GENCODE_SM70=${GUNROCK_GENCODE_SM70}
-DGUNROCK_GENCODE_SM72=${GUNROCK_GENCODE_SM72}
-DGUNROCK_GENCODE_SM75=${GUNROCK_GENCODE_SM75}
-DGUNROCK_GENCODE_SM80=${GUNROCK_GENCODE_SM80}
${GUNROCK_GENCODE}
BUILD_BYPRODUCTS ${CUGUNROCK_DIR}/lib/libgunrock.a
)
Expand Down
5 changes: 1 addition & 4 deletions cpp/tests/traversal/sssp_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,7 @@ TEST_P(Tests_SSSP, CheckFP64_RANDOM_DIST_PREDS)

// --gtest_filter=*simple_test*

// FIXME: Enable this for 0.17. Temporarily disabled due to sporadic error hard
// to reproduce: "transform: failed to synchronize: cudaErrorIllegalAddress: an
// illegal memory access was encountered" thrown in the test body.
INSTANTIATE_TEST_CASE_P(DISABLED_simple_test,
INSTANTIATE_TEST_CASE_P(simple_test,
Tests_SSSP,
::testing::Values(SSSP_Usecase(MTX, "test/datasets/dblp.mtx", 100),
SSSP_Usecase(MTX, "test/datasets/wiki2003.mtx", 100000),
Expand Down