Merge pull request #3183 from ajschmidt8/fix-merge-conflicts

Fix merge conflicts
rapidsai · Jan 25, 2023 · bfe23a7 · bfe23a7
2 parents dc06ef6 + 9f23bb5
commit bfe23a7
Show file tree

Hide file tree

Showing 19 changed files with 97 additions and 273 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -28,7 +28,7 @@ concurrency:
 jobs:
   cpp-build:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-matrix-build.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-118
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
   python-build:
     needs: [cpp-build]
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-matrix-build.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-118
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
   upload-conda:
     needs: [cpp-build, python-build]
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-118
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -19,39 +19,39 @@ jobs:
       - conda-python-build
       - conda-python-tests
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-118
   checks:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-118
   conda-cpp-build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-matrix-build.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-118
     with:
       build_type: pull-request
       node_type: cpu16
   conda-cpp-tests:
     needs: conda-cpp-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-118
     with:
       build_type: pull-request
   conda-python-build:
     needs: conda-cpp-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-matrix-build.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-118
     with:
       build_type: pull-request
   conda-python-tests:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118
     with:
       build_type: pull-request
   conda-notebook-tests:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-118
     with:
       build_type: pull-request
       node_type: "gpu-latest-1"

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -16,15 +16,15 @@ on:
 jobs:
   conda-cpp-tests:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-118
     with:
       build_type: nightly
       branch: ${{ inputs.branch }}
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
   conda-python-tests:
     secrets: inherit
-    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main
+    uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118
     with:
       build_type: nightly
       branch: ${{ inputs.branch }}

diff --git a/...nvironments/all_cuda-115_arch-x86_64.yaml → ...nvironments/all_cuda-118_arch-x86_64.yaml b/...nvironments/all_cuda-115_arch-x86_64.yaml → ...nvironments/all_cuda-118_arch-x86_64.yaml
@@ -11,7 +11,7 @@ dependencies:
 - c-compiler
 - cmake>=3.23.1,!=3.25.0
 - cuda-python>=11.7.1,<12.0
-- cudatoolkit=11.5
+- cudatoolkit=11.8
 - cudf=23.04.*
 - cxx-compiler
 - cython>=0.29,<0.30
@@ -20,6 +20,7 @@ dependencies:
 - dask>=2022.12.0
 - distributed>=2022.12.0
 - doxygen
+- gcc_linux-64=9.*
 - gmock=1.10.0
 - gtest=1.10.0
 - ipython
@@ -34,7 +35,7 @@ dependencies:
 - ninja
 - notebook>=0.5.0
 - numpydoc
-- nvcc_linux-64=11.5
+- nvcc_linux-64=11.8
 - ogb
 - openmpi
 - pip
@@ -59,4 +60,4 @@ dependencies:
 - sphinxcontrib-websupport
 - ucx-proc=*=gpu
 - ucx-py=0.31.*
-name: all_cuda-115_arch-x86_64
+name: all_cuda-118_arch-x86_64
diff --git a/conda/recipes/cugraph/conda_build_config.yaml b/conda/recipes/cugraph/conda_build_config.yaml
@@ -17,16 +17,16 @@ ucx_py_version:
   - "0.31.*"
 
 # The CTK libraries below are missing from the conda-forge::cudatoolkit
-# package. The "*_host_*" version specifiers correspond to `11.5` packages.
+# package. The "*_host_*" version specifiers correspond to `11.8` packages.
 
 libcublas_host_version:
-  - ">=11.7.3.1,<=11.7.4.6"
+  - "=11.11.3.6"
 
 libcurand_host_version:
-  - ">=10.2.6.48,<=10.2.7.107"
+  - "=10.3.0.86"
 
 libcusolver_host_version:
-  - ">=11.2.1.48,<=11.3.2.107"
+  - "=11.4.1.48"
 
 libcusparse_host_version:
-  - ">=11.7.0.31,<=11.7.0.107"
+  - "=11.7.5.86"
diff --git a/conda/recipes/libcugraph/conda_build_config.yaml b/conda/recipes/libcugraph/conda_build_config.yaml
@@ -20,22 +20,22 @@ gtest_version:
   - "=1.10.0"
 
 cuda_profiler_api_version:
-  - ">=11.4.240,<12"
+  - ">=11.8.86,<12"
 
 sysroot_version:
   - "2.17"
 
 # The CTK libraries below are missing from the conda-forge::cudatoolkit
-# package. The "*_host_*" version specifiers correspond to `11.5` packages.
+# package. The "*_host_*" version specifiers correspond to `11.8` packages.
 
 libcublas_host_version:
-  - ">=11.7.3.1,<=11.7.4.6"
+  - "=11.11.3.6"
 
 libcurand_host_version:
-  - ">=10.2.6.48,<=10.2.7.107"
+  - "=10.3.0.86"
 
 libcusolver_host_version:
-  - ">=11.2.1.48,<=11.3.2.107"
+  - "=11.4.1.48"
 
 libcusparse_host_version:
-  - ">=11.7.0.31,<=11.7.0.107"
+  - "=11.7.5.86"
diff --git a/conda/recipes/pylibcugraph/conda_build_config.yaml b/conda/recipes/pylibcugraph/conda_build_config.yaml
@@ -17,16 +17,16 @@ ucx_py_version:
   - "0.31.*"
 
 # The CTK libraries below are missing from the conda-forge::cudatoolkit
-# package. The "*_host_*" version specifiers correspond to `11.5` packages.
+# package. The "*_host_*" version specifiers correspond to `11.8` packages.
 
 libcublas_host_version:
-  - ">=11.7.3.1,<=11.7.4.6"
+  - "=11.11.3.6"
 
 libcurand_host_version:
-  - ">=10.2.6.48,<=10.2.7.107"
+  - "=10.3.0.86"
 
 libcusolver_host_version:
-  - ">=11.2.1.48,<=11.3.2.107"
+  - "=11.4.1.48"
 
 libcusparse_host_version:
-  - ">=11.7.0.31,<=11.7.0.107"
+  - "=11.7.5.86"
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -3,7 +3,7 @@ files:
   all:
     output: [conda]
     matrix:
-      cuda: ["11.5"]
+      cuda: ["11.8"]
       arch: [x86_64]
     includes:
       - checks
@@ -54,6 +54,10 @@ dependencies:
     specific:
       - output_types: [conda]
         matrices:
+          - matrix:
+              cuda: "11.8"
+            packages:
+              - cudatoolkit=11.8
           - matrix:
               cuda: "11.5"
             packages:
@@ -91,14 +95,24 @@ dependencies:
         matrices:
           - matrix:
               arch: x86_64
-              cuda: "11.5"
             packages:
-              - nvcc_linux-64=11.5
+              - gcc_linux-64=9.*
           - matrix:
               arch: aarch64
-              cuda: "11.5"
             packages:
-              - nvcc_linux-aarch64=11.5
+              - gcc_linux-aarch64=9.*
+      - output_types: [conda]
+        matrices:
+          - matrix:
+              arch: x86_64
+              cuda: "11.8"
+            packages:
+              - nvcc_linux-64=11.8
+          - matrix:
+              arch: aarch64
+              cuda: "11.8"
+            packages:
+              - nvcc_linux-aarch64=11.8
   py_version:
     specific:
       - output_types: [conda]
@@ -111,9 +125,13 @@ dependencies:
               py: "3.9"
             packages:
               - python=3.9
+          - matrix:
+              py: "3.10"
+            packages:
+              - python=3.10
           - matrix:
             packages:
-              - python>=3.8,<3.10
+              - python>=3.8,<3.11
   python_build:
     common:
       - output_types: [conda]

diff --git a/python/cugraph-pyg/cugraph_pyg/data/cugraph_store.py b/python/cugraph-pyg/cugraph_pyg/data/cugraph_store.py
@@ -21,24 +21,13 @@
 
 import warnings
 
-# numpy is always available
 import numpy as np
-
-# FIXME remove dependence on cudf
 import cudf
 
-# cuGraph or cuGraph-Service is required; each has its own version of
-# import_optional and we need to select the correct one.
-try:
-    from cugraph_service.client.remote_graph_utils import import_optional, MissingModule
-except ModuleNotFoundError:
-    try:
-        from cugraph.utilities.utils import import_optional, MissingModule
-    except ModuleNotFoundError:
-        raise ModuleNotFoundError(
-            "cuGraph extensions for PyG require cuGraph"
-            " or cuGraph-service-client to be installed."
-        )
+from cugraph.utilities.utils import import_optional, MissingModule
+
+# FIXME remove these imports and replace PG with FeatureStore
+from cugraph.experimental import MGPropertyGraph
 
 # FIXME drop cupy support and make torch the only backend (#2995)
 cupy = import_optional("cupy")
@@ -352,16 +341,12 @@ def __renumber_graph(self, renumber_graph: bool) -> None:
                 f"and {self.__old_edge_col_name}"
             )
 
+        # FIXME Remove all renumbering logic permanently
+        # and require this already be done.
         if renumber_graph:
-            if self.is_remote and self.backend == "torch":
-                self.__vertex_type_offsets = self.__graph.renumber_vertices_by_type(
-                    prev_id_column=self.__old_vertex_col_name,
-                    backend="torch:cuda" if torch.has_cuda else "torch",
-                )
-            else:
-                self.__vertex_type_offsets = self.__graph.renumber_vertices_by_type(
-                    prev_id_column=self.__old_vertex_col_name
-                )
+            self.__vertex_type_offsets = self.__graph.renumber_vertices_by_type(
+                prev_id_column=self.__old_vertex_col_name
+            )
 
             # FIXME: https://github.com/rapidsai/cugraph/issues/3059
             # Currently renumbering edges is required if renumbering vertices or else
@@ -420,27 +405,8 @@ def backend(self) -> str:
         return self.__backend
 
     @cached_property
-    def is_multi_gpu(self) -> bool:
-        """
-        Whether the backing cugraph is a multi-gpu instance.
-        Returns
-        -------
-        bool
-            True if the backing graph is a multi-gpu graph.
-        """
-        return self.__graph.is_multi_gpu()
-
-    @cached_property
-    def is_remote(self) -> bool:
-        pg_types = ["PropertyGraph", "MGPropertyGraph"]
-        if type(self.__graph).__name__ in pg_types:
-            return False
-        else:
-            return self.__graph.is_remote()
-
-    @cached_property
-    def _is_delayed(self) -> bool:
-        return self.is_multi_gpu and not self.is_remote
+    def _is_delayed(self):
+        return isinstance(self.__graph, MGPropertyGraph)
 
     def get_vertex_index(self, vtypes) -> TensorType:
         if isinstance(vtypes, str):