diff --git a/conda/recipes/cuopt/conda_build_config.yaml b/conda/recipes/cuopt/conda_build_config.yaml index 968bafd88e..02a5582323 100644 --- a/conda/recipes/cuopt/conda_build_config.yaml +++ b/conda/recipes/cuopt/conda_build_config.yaml @@ -1,14 +1,11 @@ c_compiler_version: - - 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] + - 13 cxx_compiler_version: - - 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] + - 13 cuda_compiler: - - cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - - nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] + - cuda-nvcc c_stdlib: - sysroot diff --git a/conda/recipes/cuopt/recipe.yaml b/conda/recipes/cuopt/recipe.yaml index b6d4b74f93..3bd33e056c 100644 --- a/conda/recipes/cuopt/recipe.yaml +++ b/conda/recipes/cuopt/recipe.yaml @@ -66,13 +66,8 @@ requirements: - rapids-build-backend >=0.3.0,<0.4.0.dev0 - rmm =${{ dep_minor_version }} - scikit-build-core >=0.10.0 - - if: cuda_major == "11" - then: - - cudatoolkit - - cuda-python >=11.8.5,<12.0a0 - else: - - cuda-cudart-dev - - cuda-python >=12.6.2,<13.0a0 + - cuda-cudart-dev + - cuda-python >=12.6.2,<13.0a0 run: - ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }} - cudf =${{ dep_minor_version }} @@ -90,22 +85,15 @@ requirements: - raft-dask =${{ dep_minor_version }} - rapids-dask-dependency =${{ dep_minor_version }} - rmm =${{ dep_minor_version }} - - if: cuda_major == "11" - then: - - cudatoolkit - - cuda-python >=11.8.5,<12.0a0 - else: - # Needed by Numba for CUDA support - - cuda-nvcc-impl - # TODO: Add nvjitlink here - # xref: https://github.com/rapidsai/cudf/issues/12822 - - cuda-python >=12.6.2,<13.0a0 + # Needed by Numba for CUDA support + - cuda-nvcc-impl + # TODO: Add nvjitlink here + # xref: https://github.com/rapidsai/cudf/issues/12822 + - cuda-python >=12.6.2,<13.0a0 ignore_run_exports: by_name: - cuda-cudart - cuda-version - - if: cuda_major == "11" - then: cudatoolkit tests: - python: diff --git a/conda/recipes/libcuopt/conda_build_config.yaml b/conda/recipes/libcuopt/conda_build_config.yaml index 411d279565..eddb7ec94d 100644 --- a/conda/recipes/libcuopt/conda_build_config.yaml +++ b/conda/recipes/libcuopt/conda_build_config.yaml @@ -1,14 +1,11 @@ c_compiler_version: - - 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] + - 13 cxx_compiler_version: - - 13 # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - - 11 # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] + - 13 cuda_compiler: - - cuda-nvcc # [not os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] - - nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")] + - cuda-nvcc c_stdlib: - sysroot @@ -21,6 +18,3 @@ cmake_version: gtest_version: - ">=1.13.0" - -cuda11_libcurand_host_version: - - "=10.3.0.86" \ No newline at end of file diff --git a/conda/recipes/libcuopt/recipe.yaml b/conda/recipes/libcuopt/recipe.yaml index 4b8e0b410f..fbdcfd5e8c 100644 --- a/conda/recipes/libcuopt/recipe.yaml +++ b/conda/recipes/libcuopt/recipe.yaml @@ -64,17 +64,10 @@ cache: - libraft-headers =${{ dep_minor_version }} - librmm =${{ dep_minor_version }} - rapids-logger =0.1 - - if: cuda_major == "11" - then: - - cudatoolkit - - libcurand ${{ cuda11_libcurand_host_version }} - - libcurand-dev ${{ cuda11_libcurand_host_version }} - - cuda-nvtx - else: - - cuda-nvtx-dev - - libcurand-dev - - libcusparse-dev - - cuda-cudart-dev + - cuda-nvtx-dev + - libcurand-dev + - libcusparse-dev + - cuda-cudart-dev outputs: - package: @@ -104,8 +97,6 @@ outputs: - libcurand - libcusparse - librmm - - if: cuda_major == "11" - then: cudatoolkit tests: - package_contents: files: @@ -138,19 +129,14 @@ outputs: - cuda-version =${{ cuda_version }} - rapids-logger =0.1 - librmm =${{ dep_minor_version }} - - if: cuda_major == "11" - then: cudatoolkit - else: - - cuda-cudart-dev - - libcublas - - libcusparse-dev + - cuda-cudart-dev + - libcublas + - libcusparse-dev run: - ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }} - ${{ pin_subpackage("libmps-parser", exact=True) }} - librmm =${{ dep_minor_version }} - - if: cuda_major == "11" - then: cudatoolkit - else: cuda-nvrtc + - cuda-nvrtc ignore_run_exports: by_name: - cuda-cudart @@ -160,8 +146,6 @@ outputs: - libcurand - libcusparse - librmm - - if: cuda_major == "11" - then: cudatoolkit tests: - package_contents: files: @@ -191,12 +175,9 @@ outputs: - ${{ pin_subpackage("libmps-parser", exact=True) }} - gmock ${{ gtest_version }} - gtest ${{ gtest_version }} - - if: cuda_major == "11" - then: cudatoolkit - else: - - cuda-cudart-dev - - libcublas - - libcusparse-dev + - cuda-cudart-dev + - libcublas + - libcusparse-dev run: - gmock ${{ gtest_version }} - gtest ${{ gtest_version }} @@ -211,8 +192,6 @@ outputs: - libcurand - libcusparse - librmm - - if: cuda_major == "11" - then: cudatoolkit about: homepage: ${{ load_from_file("python/cuopt/pyproject.toml").project.urls.Homepage }} license: ${{ load_from_file("python/cuopt/pyproject.toml").project.license.text }}