Merge pull request rapidsai#32 from afender/refactor-fixes

Refactor fixes
seunghwak · Jan 4, 2019 · ce99b96 · ce99b96
2 parents eff125f + 83cb6d0
commit ce99b96
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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(
@@ -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
@@ -1,6 +1,7 @@
 #include <nvgraph_gdf.h>
 #include <thrust/device_vector.h>
 #include <ctime>
+#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
@@ -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()

diff --git 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")
                                          )
                        );