diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 10ee771f675..c80e828b1cf 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -33,7 +33,7 @@ jobs: with: enable_check_generated_files: false conda-cpp-build: - needs: checks + #needs: checks secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.06 with: @@ -96,7 +96,7 @@ jobs: container_image: "rapidsai/ci:latest" run_script: "ci/build_docs.sh" wheel-build-cudf: - needs: checks + #needs: checks secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/wheels-manylinux-build.yml@branch-23.06 with: diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index ec5e421baf9..f5fb6cf8e1e 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -15,8 +15,12 @@ dependencies: - cachetools - cmake>=3.23.1,!=3.25.0 - cubinlinker +- cuda-nvrtc ==11.8.* +- cuda-nvrtc-dev ==11.8.* +- cuda-nvtx ==11.8.* - cuda-python>=11.7.1,<12.0 - cuda-sanitizer-api=11.8.86 +- cudatoolkit ==11.8.* - cudatoolkit=11.8 - cupy>=9.5.0,<12.0.0a0 - cxx-compiler @@ -35,6 +39,7 @@ dependencies: - hypothesis - ipython - libarrow==10.0.1.* +- libcurand-dev - librdkafka=1.7.0 - librmm==23.6.* - mimesis>=4.1.0 diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index 469c25fb673..2d1d83455b0 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -7,6 +7,9 @@ {% set cuda_spec = ">=" + cuda_major ~ ",<" + (cuda_major | int + 1) ~ ".0a0" %} # i.e. >=11,<12.0a0 {% set date_string = environ['RAPIDS_DATE_STRING'] %} +{% set host_118_data = load_file_data("conda/recipes/libcudf/meta_dependencies_host_cuda-118.yaml") %} +{% set build_118_data = load_file_data("conda/recipes/libcudf/meta_dependencies_build.yaml") %} + package: name: libcudf-split @@ -33,26 +36,19 @@ build: requirements: build: - - cmake {{ cmake_version }} - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} {{ cuda_version }} - - ninja - sysroot_{{ target_platform }} {{ sysroot_version }} + {% for r in build_118_data.get("dependencies", {}) %} + - {{ r }} + {% endfor %} host: - - librmm ={{ minor_version }} - - cudatoolkit ={{ cuda_version }} - - cuda-nvrtc ={{ cuda_version }} - - cuda-nvrtc-dev ={{ cuda_version }} - - cuda-nvtx ={{ cuda_version }} - - libcurand-dev - - libarrow {{ libarrow_version }} - - dlpack {{ dlpack_version }} - - librdkafka {{ librdkafka_version }} - - fmt {{ fmt_version }} - - spdlog {{ spdlog_version }} - - gtest {{ gtest_version }} - - gmock {{ gtest_version }} + # Note: For variant (e.g. CUDA) builds we would need to read data from + # multiple files and insert the appropriate data here accordingly. + {% for r in host_118_data.get("dependencies", {}) %} + - {{ r }} + {% endfor %} outputs: - name: libcudf diff --git a/conda/recipes/libcudf/meta_dependencies_build_cuda-118.yaml b/conda/recipes/libcudf/meta_dependencies_build_cuda-118.yaml new file mode 100644 index 00000000000..0ad5d6108d0 --- /dev/null +++ b/conda/recipes/libcudf/meta_dependencies_build_cuda-118.yaml @@ -0,0 +1,5 @@ +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. +dependencies: +- cmake>=3.23.1,!=3.25.0 +- ninja diff --git a/conda/recipes/libcudf/meta_dependencies_host_cuda-118.yaml b/conda/recipes/libcudf/meta_dependencies_host_cuda-118.yaml new file mode 100644 index 00000000000..9d917e36598 --- /dev/null +++ b/conda/recipes/libcudf/meta_dependencies_host_cuda-118.yaml @@ -0,0 +1,16 @@ +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`. +dependencies: +- cuda-nvrtc ==11.8.* +- cuda-nvrtc-dev ==11.8.* +- cuda-nvtx ==11.8.* +- cudatoolkit ==11.8.* +- dlpack>=0.5,<0.6.0a0 +- fmt>=9.1.0,<10 +- gmock==1.10.0.* +- gtest==1.10.0.* +- libarrow==10.0.1.* +- libcurand-dev +- librdkafka=1.7.0 +- librmm==23.6.* +- spdlog>=1.11.0,<1.12 diff --git a/dependencies.yaml b/dependencies.yaml index b7e95115419..dd5628bd2fb 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -6,6 +6,7 @@ files: cuda: ["11.8"] arch: [x86_64] includes: + - build_tools - build_all - build_cpp - build_wheels @@ -43,6 +44,7 @@ files: test_java: output: none includes: + - build_tools - build_all - libarrow_run - cudatoolkit @@ -69,6 +71,7 @@ files: extras: table: build-system includes: + - build_tools - build_all - build_python - build_python_common @@ -160,6 +163,32 @@ files: key: test includes: - test_python_common + libcudf_recipe_build: + output: conda_meta + conda_meta_dir: conda/recipes/libcudf + extras: + section: build + includes: + - build_tools + libcudf_recipe_host: + output: conda_meta + matrix: + cuda: ["11.8"] + conda_meta_dir: conda/recipes/libcudf + extras: + section: host + includes: + - build_all + - build_cpp + libcudf_recipe_build: + output: conda_meta + matrix: + cuda: ["11.8"] + conda_meta_dir: conda/recipes/libcudf + extras: + section: build + includes: + - build_tools channels: - rapidsai - rapidsai-nightly @@ -168,16 +197,20 @@ channels: - conda-forge - nvidia dependencies: - build_all: + build_tools: common: - - output_types: [conda, requirements, pyproject] + - output_types: [conda, requirements, pyproject, conda_meta] packages: - &cmake_ver cmake>=3.23.1,!=3.25.0 - ninja + build_all: + common: - output_types: conda packages: - c-compiler - cxx-compiler + - output_types: [conda, conda_meta] + packages: - dlpack>=0.5,<0.6.0a0 specific: - output_types: conda @@ -206,19 +239,32 @@ dependencies: - nvcc_linux-aarch64=11.8 build_cpp: common: - - output_types: [conda, requirements] + - output_types: [conda, requirements, conda_meta] packages: - librmm==23.6.* - - output_types: conda + - output_types: [conda, conda_meta] packages: - fmt>=9.1.0,<10 - >est gtest==1.10.0.* - &gmock gmock==1.10.0.* - # Hard pin the patch version used during the build. This must be kept - # in sync with the version pinned in get_arrow.cmake. + # Hard pin the patch version of arrow used during the build. This + # must be kept in sync with the version pinned in get_arrow.cmake. - libarrow==10.0.1.* + - libcurand-dev - librdkafka=1.7.0 - spdlog>=1.11.0,<1.12 + specific: + - output_types: conda_meta + matrices: + - matrix: + cuda: "11.8" + packages: + - cudatoolkit ==11.8.* + - cuda-nvrtc ==11.8.* + - cuda-nvrtc-dev ==11.8.* + - cuda-nvtx ==11.8.* + - matrix: + packages: build_wheels: common: - output_types: pyproject