From 79a082f63c2a17b760733d060ff478366e18eaac Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 16 Aug 2022 10:21:57 -0400 Subject: [PATCH] update to reflect latest rapids-dependency-file-generator changes --- .github/workflows/conda-envs.yml | 8 --- .github/workflows/dependency-files.yml | 8 +++ ...64.yaml => all_cuda-11.5_arch-x86_64.yaml} | 4 +- ...64.yaml => all_cuda-11.6_arch-x86_64.yaml} | 4 +- conda/environments/envs.yaml | 43 -------------- dependencies.yaml | 56 +++++++++++++++++++ 6 files changed, 70 insertions(+), 53 deletions(-) delete mode 100644 .github/workflows/conda-envs.yml create mode 100644 .github/workflows/dependency-files.yml rename conda/environments/{full_cuda-11.5_arch-x86_64.yaml => all_cuda-11.5_arch-x86_64.yaml} (60%) rename conda/environments/{full_cuda-11.6_arch-x86_64.yaml => all_cuda-11.6_arch-x86_64.yaml} (60%) delete mode 100644 conda/environments/envs.yaml create mode 100644 dependencies.yaml diff --git a/.github/workflows/conda-envs.yml b/.github/workflows/conda-envs.yml deleted file mode 100644 index 548acfe25..000000000 --- a/.github/workflows/conda-envs.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: conda-env-files - -on: - pull_request: - -jobs: - check_generated_files: - uses: rapidsai/shared-action-workflows/.github/workflows/conda-envs.yaml@main diff --git a/.github/workflows/dependency-files.yml b/.github/workflows/dependency-files.yml new file mode 100644 index 000000000..491f819c7 --- /dev/null +++ b/.github/workflows/dependency-files.yml @@ -0,0 +1,8 @@ +name: dependency-files + +on: + pull_request: + +jobs: + check_generated_files: + uses: rapidsai/shared-action-workflows/.github/workflows/dependency-files.yaml@main diff --git a/conda/environments/full_cuda-11.5_arch-x86_64.yaml b/conda/environments/all_cuda-11.5_arch-x86_64.yaml similarity index 60% rename from conda/environments/full_cuda-11.5_arch-x86_64.yaml rename to conda/environments/all_cuda-11.5_arch-x86_64.yaml index 28977a0d3..bfd9be437 100644 --- a/conda/environments/full_cuda-11.5_arch-x86_64.yaml +++ b/conda/environments/all_cuda-11.5_arch-x86_64.yaml @@ -1,3 +1,5 @@ +# This file was automatically generated by `rapids-dependency-file-generator`. Changes should not be made directly to this file. +# Instead, edit ../../dependencies.yaml and rerun `rapids-dependency-file-generator`. channels: - rapidsai - conda-forge @@ -21,4 +23,4 @@ dependencies: - python>=3.8,<3.10 - scikit-build>=0.13.1 - spdlog>=1.8.5,<1.9 -name: full_cuda-11.5_arch-x86_64 +name: all_cuda-11.5_arch-x86_64 diff --git a/conda/environments/full_cuda-11.6_arch-x86_64.yaml b/conda/environments/all_cuda-11.6_arch-x86_64.yaml similarity index 60% rename from conda/environments/full_cuda-11.6_arch-x86_64.yaml rename to conda/environments/all_cuda-11.6_arch-x86_64.yaml index 5f530bfd9..db1290151 100644 --- a/conda/environments/full_cuda-11.6_arch-x86_64.yaml +++ b/conda/environments/all_cuda-11.6_arch-x86_64.yaml @@ -1,3 +1,5 @@ +# This file was automatically generated by `rapids-dependency-file-generator`. Changes should not be made directly to this file. +# Instead, edit ../../dependencies.yaml and rerun `rapids-dependency-file-generator`. channels: - rapidsai - conda-forge @@ -21,4 +23,4 @@ dependencies: - python>=3.8,<3.10 - scikit-build>=0.13.1 - spdlog>=1.8.5,<1.9 -name: full_cuda-11.6_arch-x86_64 +name: all_cuda-11.6_arch-x86_64 diff --git a/conda/environments/envs.yaml b/conda/environments/envs.yaml deleted file mode 100644 index 8fea3d9ca..000000000 --- a/conda/environments/envs.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# env files to create -envs: - full: - matrix: - cuda_version: ["11.5", "11.6"] - arch: [x86_64] - includes: - - miscellaneous - - test -# arch-cuda specific pkgs -specifics: - x86_64-11.5: - miscellaneous: - - cuda-python>=11.5,<11.7.1 - - cudatoolkit=11.5 - x86_64-11.6: - miscellaneous: - - cuda-python>=11.6,<11.7.1 - - cudatoolkit=11.6 -# channels to add to environment files -channels: - - rapidsai - - conda-forge -# arbitrary dependency lists -miscellaneous: - - black=22.3.0 - - cffi>=1.10.0 - - clang-tools=11.1.0 - - clang=11.1.0 - - cmake>=3.20.1,!=3.23.0 - - cmakelang=0.6.13 - - cython>=0.29,<0.30 - - flake8=3.8.3 - - gcovr>=5.0 - - isort=5.10.1 - - numba>=0.49 - - numpy>=1.19 - - python>=3.8,<3.10 - - scikit-build>=0.13.1 - - spdlog>=1.8.5,<1.9 -test: - - pytest - - pytest-cov diff --git a/dependencies.yaml b/dependencies.yaml new file mode 100644 index 000000000..610b7808f --- /dev/null +++ b/dependencies.yaml @@ -0,0 +1,56 @@ +# dependency files to create +files: + all: + generate: conda + matrix: + cuda_version: ["11.5", "11.6"] + arch: [x86_64] + includes: + - miscellaneous + - test + test: + generate: none + includes: + - test +# channels to add to conda environment files +channels: + - rapidsai + - conda-forge +# dependency lists +dependencies: + conda_and_requirements: + common: + miscellaneous: + - black=22.3.0 + - cffi>=1.10.0 + - clang=11.1.0 + - cmake>=3.20.1,!=3.23.0 + - cmakelang=0.6.13 + - cython>=0.29,<0.30 + - flake8=3.8.3 + - gcovr>=5.0 + - isort=5.10.1 + - numba>=0.49 + - numpy>=1.19 + - python>=3.8,<3.10 + - scikit-build>=0.13.1 + test: + - pytest + - pytest-cov + x86_64-11.5: + miscellaneous: + - cuda-python>=11.5,<11.7.1 + x86_64-11.6: + miscellaneous: + - cuda-python>=11.6,<11.7.1 + conda: + common: + miscellaneous: + - clang-tools=11.1.0 + - spdlog>=1.8.5,<1.9 + x86_64-11.5: + miscellaneous: + - cudatoolkit=11.5 + x86_64-11.6: + miscellaneous: + - cudatoolkit=11.6