From 0e668b312206b4e043b8608b934f43c203e2e5d4 Mon Sep 17 00:00:00 2001 From: afender Date: Fri, 4 Jan 2019 12:11:51 -0600 Subject: [PATCH 1/3] Reduced the size of grmat tests because of timeout issue on Jenkins. We still test it on graphs with more than 2M edges --- src/tests/grmat/grmat_test.cu | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/grmat/grmat_test.cu b/src/tests/grmat/grmat_test.cu index a0700ac2aa6..55db3369da3 100644 --- a/src/tests/grmat/grmat_test.cu +++ b/src/tests/grmat/grmat_test.cu @@ -433,9 +433,9 @@ TEST_P (Tests_Grmat, misc) //--gtest_filter=*simple_test* INSTANTIATE_TEST_CASE_P(simple_test, Tests_Grmat, - ::testing::Values( Grmat_Usecase("grmat --rmat_scale=24 --rmat_edgefactor=16 --device=0 --rmat_undirected --quiet") - ,Grmat_Usecase("grmat --rmat_scale=25 --rmat_edgefactor=22 --device=0 --normalized --quiet") - ,Grmat_Usecase("grmat --rmat_scale=2 --rmat_edgefactor=2 --device=0 --normalized --quiet") + ::testing::Values( Grmat_Usecase("grmat --rmat_scale=16 --rmat_edgefactor=14 --device=0 --normalized --quiet") + ,Grmat_Usecase("grmat --rmat_scale=16 --rmat_edgefactor=16 --device=0 --rmat_undirected --quiet") + ,Grmat_Usecase("grmat --rmat_scale=17 --rmat_edgefactor=22 --device=0 --normalized --quiet") ) ); From a74e09c30630bd778e32adfbe44e4e3a151993f7 Mon Sep 17 00:00:00 2001 From: afender Date: Fri, 4 Jan 2019 12:21:03 -0600 Subject: [PATCH 2/3] Fix tentative for intermitent segfault caused by cudart 9.2 (in __cudaUnregisterBinaryUtil ()), cuda 10 seems to be working without this fix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b49840976fa..be40f040c28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CUDA_STANDARD 14) set(CMAKE_CUDA_STANDARD_REQURIED ON) -set(CUDA_USE_STATIC_CUDA_RUNTIME OFF CACHE INTERNAL "") +#set(CUDA_USE_STATIC_CUDA_RUNTIME OFF CACHE INTERNAL "") find_package(CUDA) set_package_properties( From 83cb6d0944d01ece894e0954236f4a8f7dd29028 Mon Sep 17 00:00:00 2001 From: afender Date: Fri, 4 Jan 2019 12:25:55 -0600 Subject: [PATCH 3/3] Re-enable plugin path after refactor --- CMakeLists.txt | 2 +- src/plugin/nvgraph/nvgraph_gdf.cu | 1 + src/tests/CMakeLists.txt | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be40f040c28..b42a8d079e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,7 +122,7 @@ endif (CUDF_INCLUDE AND CUDF_LIBRARY) ################################################################################################### # - add nvgraph ----------------------------------------------------------------------------------- -if(NOT NVG_PLUGIN) +if(NVG_PLUGIN) find_library(NVGRAPH_LIBRARY "nvgraph_st" HINTS "$ENV{NVGRAPH_ROOT}/lib" "$ENV{CONDA_PREFIX}/lib") diff --git a/src/plugin/nvgraph/nvgraph_gdf.cu b/src/plugin/nvgraph/nvgraph_gdf.cu index f1accde6b2f..ac52fd7de3a 100644 --- a/src/plugin/nvgraph/nvgraph_gdf.cu +++ b/src/plugin/nvgraph/nvgraph_gdf.cu @@ -1,6 +1,7 @@ #include #include #include +#include "utilities/error_utils.h" gdf_error nvgraph2gdf_error(nvgraphStatus_t nvg_stat) { diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 97859208f1f..e5c20829455 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -33,17 +33,16 @@ function(configure_test TEST_NAME Tests_SRCS) if(NVG_PLUGIN) if(NOT TARGET nvgraph) add_library( nvgraph SHARED IMPORTED) - if (NVGRAPH_LIBRARY) set_target_properties( nvgraph PROPERTIES IMPORTED_LOCATION ${NVGRAPH_LIBRARY}) endif (NVGRAPH_LIBRARY) - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../plugin/nvgraph") endif() if (NVGRAPH_INCLUDE) include_directories( "${NVGRAPH_INCLUDE}" ) endif (NVGRAPH_INCLUDE) + include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../plugin/nvgraph") target_link_libraries(${TEST_NAME} nvgraph) target_link_libraries(${TEST_NAME} nvggdf) endif()