Merge pull request #1269 from BradReesWork/branch-0.17-db

[REVIEW] removing old db code  [skip-ci]

CHANGELOG.md

@@ -5,6 +5,7 @@
 
 ## Improvements
 - PR #1227 Pin cmake policies to cmake 3.17 version
+- PR #1269 Removed old db code that was not being used
 
 ## Bug Fixes
 - PR #1242 Calling gunrock cmake using explicit -D options, re-enabling C++ tests

build.sh

@@ -39,6 +39,7 @@ CUGRAPH_BUILD_DIR=${REPODIR}/python/build
 BUILD_DIRS="${LIBCUGRAPH_BUILD_DIR} ${CUGRAPH_BUILD_DIR}"
 
 # Set defaults for vars modified by flags to this script
+ARG_COUNT=${NUMARGS}
 VERBOSE=""
 BUILD_TYPE=Release
 INSTALL_TARGET=install
@@ -48,7 +49,7 @@ BUILD_DISABLE_DEPRECATION_WARNING=ON
 # FIXME: if PREFIX is not set, check CONDA_PREFIX, but there is no fallback
 # from there!
 INSTALL_PREFIX=${PREFIX:=${CONDA_PREFIX}}
-PARALLEL_LEVEL=${PARALLEL_LEVEL:=""}
+PARALLEL_LEVEL=${PARALLEL_LEVEL:=`nproc`}
 BUILD_ABI=${BUILD_ABI:=ON}
 
 function hasArg {
@@ -73,15 +74,19 @@ fi
 # Process flags
 if hasArg -v; then
  VERBOSE=1
+ ARG_COUNT=$((ARG_COUNT -1))
 fi
 if hasArg -g; then
  BUILD_TYPE=Debug
+ ARG_COUNT=$((ARG_COUNT -1))
 fi
 if hasArg -n; then
  INSTALL_TARGET=""
+ ARG_COUNT=$((ARG_COUNT -1))
 fi
 if hasArg --show_depr_warn; then
  BUILD_DISABLE_DEPRECATION_WARNING=OFF
+ ARG_COUNT=$((ARG_COUNT -1))
 fi
 
 # If clean given, run it prior to any other steps
@@ -100,7 +105,7 @@ fi
 
 ################################################################################
 # Configure, build, and install libcugraph
-if (( ${NUMARGS} == 0 )) || hasArg libcugraph; then
+if (( ${ARG_COUNT} == 0 )) || hasArg libcugraph; then
 
  mkdir -p ${LIBCUGRAPH_BUILD_DIR}
  cd ${LIBCUGRAPH_BUILD_DIR}
@@ -111,7 +116,7 @@ if (( ${NUMARGS} == 0 )) || hasArg libcugraph; then
 fi
 
 # Build and install the cugraph Python package
-if (( ${NUMARGS} == 0 )) || hasArg cugraph; then
+if (( ${ARG_COUNT} == 0 )) || hasArg cugraph; then
 
  cd ${REPODIR}/python
  if [[ ${INSTALL_TARGET} != "" ]]; then
@@ -124,7 +129,7 @@ fi
 
 ################################################################################
 # Build the docs
-if (( ${NUMARGS} == 0 )) || hasArg docs; then
+if (( ${ARG_COUNT} == 0 )) || hasArg docs; then
 
  if [ ! -d ${LIBCUGRAPH_BUILD_DIR} ]; then
  mkdir -p ${LIBCUGRAPH_BUILD_DIR}

cpp/CMakeLists.txt

@@ -158,19 +158,6 @@ if(OpenMP_FOUND)
  set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler=${OpenMP_CXX_FLAGS}")
 endif(OpenMP_FOUND)
 
-###################################################################################################
-# - find libcypher-parser -------------------------------------------------------------------------
-
-find_path(LIBCYPHERPARSER_INCLUDE "cypher-parser.h"
- HINTS "$ENV{CONDA_PREFIX}/include")
-
-find_library(LIBCYPHERPARSER_LIBRARY STATIC "libcypher-parser.a"
- HINTS "$ENV{CONDA_PREFIX}/lib")
-
-add_library(libcypher-parser STATIC IMPORTED ${LIBCYPHERPARSER_LIBRARY})
-if (LIBCYPHERPARSER_INCLUDE AND LIBCYPHERPARSER_LIBRARY)
- set_target_properties(libcypher-parser PROPERTIES IMPORTED_LOCATION ${LIBCYPHERPARSER_LIBRARY})
-endif (LIBCYPHERPARSER_INCLUDE AND LIBCYPHERPARSER_LIBRARY)
 
 ###################################################################################################
 # - find gtest ------------------------------------------------------------------------------------
@@ -359,9 +346,6 @@ link_directories(
  "${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES}")
 
 add_library(cugraph SHARED
- src/db/db_object.cu
- src/db/db_parser_integration_test.cu
- src/db/db_operators.cu
  src/utilities/spmv_1D.cu
  src/utilities/cython.cu
  src/structure/graph.cu
@@ -410,7 +394,6 @@ target_include_directories(cugraph
  "${CUCO_INCLUDE_DIR}"
  "${LIBCUDACXX_INCLUDE_DIR}"
  "${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}"
- "${LIBCYPHERPARSER_INCLUDE}"
  "${Boost_INCLUDE_DIRS}"
  "${RMM_INCLUDE}"
  "${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty"
@@ -430,7 +413,7 @@ target_include_directories(cugraph
 # - link libraries --------------------------------------------------------------------------------
 
 target_link_libraries(cugraph PRIVATE
- gunrock cublas cusparse curand cusolver cudart cuda ${LIBCYPHERPARSER_LIBRARY} ${MPI_CXX_LIBRARIES} ${NCCL_LIBRARIES})
+ gunrock cublas cusparse curand cusolver cudart cuda ${NCCL_LIBRARIES})
 
 if(OpenMP_CXX_FOUND)
 target_link_libraries(cugraph PRIVATE