Fix Forward-Merger Conflicts

.gitignore

@@ -29,11 +29,15 @@ junit-cugraph.xml
 test-results
 
 ## Python build directories & artifacts
+dask-worker-space/
 htmlcov
 dist/
 cugraph.egg-info/
 python/build
 python/cugraph/bindings/*.cpp
+wheels/
+_skbuild/
+cufile.log
 
 ## pylibcugraph build directories & artifacts
 python/pylibcugraph/pylibcugraph.egg-info

MANIFEST.in

@@ -1,4 +1,4 @@
 include python/versioneer.py
 include python/cugraph/_version.py
 include cugraph/experimental/datasets/*.yaml
-include cugraph/experimental/datasets/metadata/*.yaml
+include cugraph/experimental/datasets/metadata/*.yaml

build.sh

@@ -159,6 +159,8 @@ if hasArg clean; then
  pushd ${REPODIR}/python > /dev/null
  rm -rf dist dask-worker-space cugraph/raft *.egg-info
  find . -name "__pycache__" -type d -exec rm -rf {} \; > /dev/null 2>&1
+ find . -type d -name _skbuild -exec rm -rf {} \; > /dev/null 2>&1
+ find . -type d -name dist -exec rm -rf {} \; > /dev/null 2>&1
  find . -name "*.cpp" -type f -delete
  find . -name "*.cpython*.so" -type f -delete
  find . -type d -name _external_repositories -exec rm -rf {} \; > /dev/null 2>&1
@@ -230,7 +232,8 @@ if buildAll || hasArg pylibcugraph; then
  # setup.py references an env var CUGRAPH_BUILD_PATH to find the libcugraph
  # build. If not set by the user, set it to LIBCUGRAPH_BUILD_DIR
  CUGRAPH_BUILD_PATH=${CUGRAPH_BUILD_PATH:=${LIBCUGRAPH_BUILD_DIR}}
- env CUGRAPH_BUILD_PATH=${CUGRAPH_BUILD_PATH} python setup.py build_ext --inplace --library-dir=${LIBCUGRAPH_BUILD_DIR}
+ python setup.py build_ext --inplace -- -DFIND_CUGRAPH_CPP=ON \
+ -Dcugraph_ROOT=${LIBCUGRAPH_BUILD_DIR} -- -j${PARALLEL_LEVEL:-1}
  if [[ ${INSTALL_TARGET} != "" ]]; then
  env CUGRAPH_BUILD_PATH=${CUGRAPH_BUILD_PATH} python setup.py install
  fi
@@ -243,7 +246,8 @@ if buildAll || hasArg cugraph; then
  # setup.py references an env var CUGRAPH_BUILD_PATH to find the libcugraph
  # build. If not set by the user, set it to LIBCUGRAPH_BUILD_DIR
  CUGRAPH_BUILD_PATH=${CUGRAPH_BUILD_PATH:=${LIBCUGRAPH_BUILD_DIR}}
- env CUGRAPH_BUILD_PATH=${CUGRAPH_BUILD_PATH} python setup.py build_ext --inplace --library-dir=${LIBCUGRAPH_BUILD_DIR}
+ python setup.py build_ext --inplace -- -DFIND_CUGRAPH_CPP=ON \
+ -Dcugraph_ROOT=${LIBCUGRAPH_BUILD_DIR} -- -j${PARALLEL_LEVEL:-1}
  if [[ ${INSTALL_TARGET} != "" ]]; then
  env CUGRAPH_BUILD_PATH=${CUGRAPH_BUILD_PATH} python setup.py install
  fi

ci/release/update-version.sh

@@ -39,11 +39,16 @@ function sed_runner() {
  sed -i.bak ''"$1"'' $2 && rm -f ${2}.bak
 }
 
+# rapids-cmake version
+sed_runner 's/'"branch-.*\/RAPIDS.cmake"'/'"branch-${NEXT_SHORT_TAG}\/RAPIDS.cmake"'/g' fetch_rapids.cmake
+
 # CMakeLists update
 sed_runner 's/'"CUGRAPH VERSION .* LANGUAGES C CXX CUDA)"'/'"CUGRAPH VERSION ${NEXT_FULL_TAG} LANGUAGES C CXX CUDA)"'/g' cpp/CMakeLists.txt
 sed_runner 's|'"branch-.*/RAPIDS.cmake"'|'"branch-${NEXT_SHORT_TAG}/RAPIDS.cmake"'|g' cpp/CMakeLists.txt
 sed_runner 's/'"CUGRAPH_ETL VERSION .* LANGUAGES C CXX CUDA)"'/'"CUGRAPH_ETL VERSION ${NEXT_FULL_TAG} LANGUAGES C CXX CUDA)"'/g' cpp/libcugraph_etl/CMakeLists.txt
 sed_runner 's|'"branch-.*/RAPIDS.cmake"'|'"branch-${NEXT_SHORT_TAG}/RAPIDS.cmake"'|g' cpp/libcugraph_etl/CMakeLists.txt
+sed_runner "s/set(pylibcugraph_version .*)/set(pylibcugraph_version ${NEXT_FULL_TAG})/g" python/pylibcugraph/CMakeLists.txt
+sed_runner "s/set(cugraph_version .*)/set(cugraph_version ${NEXT_FULL_TAG})/g" python/cugraph/CMakeLists.txt
 
 # RTD update
 sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/cugraph/source/conf.py

conda/environments/cugraph_dev_cuda11.2.yml

@@ -16,8 +16,8 @@ dependencies:
 - libraft-headers=22.10.*
 - pyraft=22.10.*
 - cuda-python>=11.5,<11.7.1
-- dask>=2022.05.2
-- distributed>=2022.05.2
+- dask==2022.7.1
+- distributed==2022.7.1
 - dask-cuda=22.10.*
 - dask-cudf=22.10.*
 - nccl>=2.9.9
@@ -28,6 +28,7 @@ dependencies:
 - clang=11.1.0
 - clang-tools=11.1.0
 - cmake>=3.20.1,!=3.23.0
+- scikit-build>=0.13.1
 - python>=3.8,<3.10
 - notebook>=0.5.0
 - boost

conda/environments/cugraph_dev_cuda11.4.yml

@@ -16,8 +16,8 @@ dependencies:
 - libraft-headers=22.10.*
 - pyraft=22.10.*
 - cuda-python>=11.5,<11.7.1
-- dask>=2022.05.2
-- distributed>=2022.05.2
+- dask==2022.7.1
+- distributed==2022.7.1
 - dask-cuda=22.10.*
 - dask-cudf=22.10.*
 - nccl>=2.9.9
@@ -28,6 +28,7 @@ dependencies:
 - clang=11.1.0
 - clang-tools=11.1.0
 - cmake>=3.20.1,!=3.23.0
+- scikit-build>=0.13.1
 - python>=3.8,<3.10
 - notebook>=0.5.0
 - boost

conda/environments/cugraph_dev_cuda11.5.yml

@@ -16,8 +16,8 @@ dependencies:
 - libraft-headers=22.10.*
 - pyraft=22.10.*
 - cuda-python>=11.5,<11.7.1
-- dask>=2022.05.2
-- distributed>=2022.05.2
+- dask==2022.7.1
+- distributed==2022.7.1
 - dask-cuda=22.10.*
 - dask-cudf=22.10.*
 - nccl>=2.9.9
@@ -28,6 +28,7 @@ dependencies:
 - clang=11.1.0
 - clang-tools=11.1.0
 - cmake>=3.20.1,!=3.23.0
+- scikit-build>=0.13.1
 - python>=3.8,<3.10
 - notebook>=0.5.0
 - boost

conda/recipes/cugraph/conda_build_config.yaml

@@ -7,5 +7,8 @@ cxx_compiler_version:
 cuda_compiler:
  - nvcc
 
+cmake_version:
+ - ">=3.20.1,!=3.23.0"
+
 sysroot_version:
  - "2.17"

conda/recipes/cugraph/meta.yaml

@@ -25,13 +25,15 @@ build:
 
 requirements:
  build:
+ - cmake {{ cmake_version }}
  - {{ compiler('c') }}
  - {{ compiler('cxx') }}
  - {{ compiler('cuda') }} {{ cuda_version }}
  - sysroot_{{ target_platform }} {{ sysroot_version }}
  host:
  - python x.x
  - cython>=0.29,<0.30
+ - scikit-build>=0.13.1
  - libcugraph={{ version }}
  - libraft-headers {{ minor_version }}
  - pyraft {{ minor_version }}
@@ -49,8 +51,8 @@ requirements:
  - cudf={{ minor_version }}
  - dask-cudf {{ minor_version }}
  - dask-cuda {{ minor_version }}
- - dask>=2022.05.2
- - distributed>=2022.05.2
+ - dask==2022.7.1
+ - distributed==2022.7.1
  - ucx-py {{ ucx_py_version }}
  - ucx-proc=*=gpu
  - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}

conda/recipes/pylibcugraph/conda_build_config.yaml

@@ -7,5 +7,8 @@ cxx_compiler_version:
 cuda_compiler:
  - nvcc
 
+cmake_version:
+ - ">=3.20.1,!=3.23.0"
+
 sysroot_version:
  - "2.17"

conda/recipes/pylibcugraph/meta.yaml

@@ -25,13 +25,15 @@ build:
 
 requirements:
  build:
+ - cmake {{ cmake_version }}
  - {{ compiler('c') }}
  - {{ compiler('cxx') }}
  - {{ compiler('cuda') }} {{ cuda_version }}
  - sysroot_{{ target_platform }} {{ sysroot_version }}
  host:
  - python x.x
  - cython>=0.29,<0.30
+ - scikit-build>=0.13.1
  - libcugraph={{ version }}
  - ucx-py {{ ucx_py_version }}
  - ucx-proc=*=gpu

cpp/CMakeLists.txt

@@ -15,10 +15,8 @@
 #=============================================================================
 
 cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR)
-file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.10/RAPIDS.cmake
- ${CMAKE_BINARY_DIR}/RAPIDS.cmake)
-include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)
 
+include(../fetch_rapids.cmake)
 include(rapids-cmake)
 include(rapids-cpm)
 include(rapids-cuda)

cpp/cmake/thirdparty/get_libcudacxx.cmake

@@ -16,8 +16,7 @@
 function(find_and_configure_libcudacxx)
  include(${rapids-cmake-dir}/cpm/libcudacxx.cmake)
 
- rapids_cpm_libcudacxx(BUILD_EXPORT_SET cugraph-exports
- INSTALL_EXPORT_SET cugraph-exports)
+ rapids_cpm_libcudacxx(BUILD_EXPORT_SET cugraph-exports)
 
 endfunction()