From b8165607abd32055e19553017c4ed10167810208 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 25 Jul 2022 17:15:19 -0400 Subject: [PATCH 01/25] rm existing dependency files --- conda/environments/rmm_dev_cuda11.5.yml | 24 ------------------------ conda/environments/rmm_dev_cuda11.6.yml | 24 ------------------------ 2 files changed, 48 deletions(-) delete mode 100644 conda/environments/rmm_dev_cuda11.5.yml delete mode 100644 conda/environments/rmm_dev_cuda11.6.yml diff --git a/conda/environments/rmm_dev_cuda11.5.yml b/conda/environments/rmm_dev_cuda11.5.yml deleted file mode 100644 index 83ae65eaf..000000000 --- a/conda/environments/rmm_dev_cuda11.5.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: rmm_dev -channels: -- rapidsai -- conda-forge -dependencies: -- clang=11.1.0 -- clang-tools=11.1.0 -- cmake>=3.20.1,!=3.23.0 -- cmakelang=0.6.13 -- flake8=3.8.3 -- black=22.3.0 -- isort=5.10.1 -- python>=3.8,<3.10 -- numba>=0.49 -- numpy>=1.19 -- cffi>=1.10.0 -- pytest -- cudatoolkit=11.5 -- scikit-build>=0.13.1 -- spdlog>=1.8.5,<1.9 -- cython>=0.29,<0.30 -- gcovr>=5.0 -- cuda-python>=11.5,<11.7.1 -- sphinx_rtd_theme diff --git a/conda/environments/rmm_dev_cuda11.6.yml b/conda/environments/rmm_dev_cuda11.6.yml deleted file mode 100644 index 46bc60649..000000000 --- a/conda/environments/rmm_dev_cuda11.6.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: rmm_dev -channels: -- rapidsai -- conda-forge -dependencies: -- clang=11.1.0 -- clang-tools=11.1.0 -- cmake>=3.20.1,!=3.23.0 -- cmakelang=0.6.13 -- flake8=3.8.3 -- black=22.3.0 -- isort=5.10.1 -- python>=3.8,<3.10 -- numba>=0.49 -- numpy>=1.19 -- cffi>=1.10.0 -- pytest -- cudatoolkit=11.6 -- scikit-build>=0.13.1 -- spdlog>=1.8.5,<1.9 -- cython>=0.29,<0.30 -- gcovr>=5.0 -- cuda-python>=11.6,11.7.1 -- sphinx_rtd_theme From 65f0da3b8fb0f625b1fd5fec2adfa75fdbd69f37 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 25 Jul 2022 17:20:40 -0400 Subject: [PATCH 02/25] add envs.yaml file --- conda/environments/envs.yaml | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 conda/environments/envs.yaml diff --git a/conda/environments/envs.yaml b/conda/environments/envs.yaml new file mode 100644 index 000000000..8fea3d9ca --- /dev/null +++ b/conda/environments/envs.yaml @@ -0,0 +1,43 @@ +# 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 From efa1b82083ad194857bb313a10c789920064ecb2 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 25 Jul 2022 17:20:50 -0400 Subject: [PATCH 03/25] add generated environment files --- .../full_cuda-11.5_arch-x86_64.yaml | 24 +++++++++++++++++++ .../full_cuda-11.6_arch-x86_64.yaml | 24 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 conda/environments/full_cuda-11.5_arch-x86_64.yaml create mode 100644 conda/environments/full_cuda-11.6_arch-x86_64.yaml diff --git a/conda/environments/full_cuda-11.5_arch-x86_64.yaml b/conda/environments/full_cuda-11.5_arch-x86_64.yaml new file mode 100644 index 000000000..28977a0d3 --- /dev/null +++ b/conda/environments/full_cuda-11.5_arch-x86_64.yaml @@ -0,0 +1,24 @@ +channels: +- rapidsai +- conda-forge +dependencies: +- 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 +- cuda-python>=11.5,<11.7.1 +- cudatoolkit=11.5 +- cython>=0.29,<0.30 +- flake8=3.8.3 +- gcovr>=5.0 +- isort=5.10.1 +- numba>=0.49 +- numpy>=1.19 +- pytest +- pytest-cov +- python>=3.8,<3.10 +- scikit-build>=0.13.1 +- spdlog>=1.8.5,<1.9 +name: full_cuda-11.5_arch-x86_64 diff --git a/conda/environments/full_cuda-11.6_arch-x86_64.yaml b/conda/environments/full_cuda-11.6_arch-x86_64.yaml new file mode 100644 index 000000000..5f530bfd9 --- /dev/null +++ b/conda/environments/full_cuda-11.6_arch-x86_64.yaml @@ -0,0 +1,24 @@ +channels: +- rapidsai +- conda-forge +dependencies: +- 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 +- cuda-python>=11.6,<11.7.1 +- cudatoolkit=11.6 +- cython>=0.29,<0.30 +- flake8=3.8.3 +- gcovr>=5.0 +- isort=5.10.1 +- numba>=0.49 +- numpy>=1.19 +- pytest +- pytest-cov +- python>=3.8,<3.10 +- scikit-build>=0.13.1 +- spdlog>=1.8.5,<1.9 +name: full_cuda-11.6_arch-x86_64 From e2a7f6a2effaef81552db63eb0e5c8f0090ba5ef Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 26 Jul 2022 12:09:44 -0400 Subject: [PATCH 04/25] add GH Action --- .github/workflows/conda-envs.yml | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/conda-envs.yml diff --git a/.github/workflows/conda-envs.yml b/.github/workflows/conda-envs.yml new file mode 100644 index 000000000..d92631dd9 --- /dev/null +++ b/.github/workflows/conda-envs.yml @@ -0,0 +1,45 @@ +name: conda-env-files + +on: + pull_request: + +jobs: + check_generated_files: + name: ensure conda env files are up-to-date + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: "3.10" + - name: Install rapids-env-generator + run: pip install git+https://github.com/rapidsai/rapids-env-generator.git@initial-commit#egg=rapids-env-generator + - name: Run rapids-env-generator + run: | + find conda/environments -type f ! -name envs.yaml -delete # delete existing environment files + reg + - name: Ensure generated environment files are up-to-date + run: | + git diff --exit-code + test -z "$(git status --porcelain conda/environments)" # ensures there are no untracked environment files + - name: Ensure a "full" environment exists + run: | + # ensure .envs.full exists + yq -e '.envs | has("full")' < conda/environments/envs.yaml + + # ensure .envs.full.includes has all dependency lists + export RESERVED_KEYS='["envs", "specifics", "channels"]' + export DEP_LISTS=$( + yq -e -o json \ + 'keys | + . - (strenv(RESERVED_KEYS) | from_json) | + sort' < conda/environments/envs.yaml + ) + export FULL_ENV_INCLUDES=$( + yq -e -o json \ + '.envs.full.includes | + sort' < conda/environments/envs.yaml + ) + yq -ne 'strenv(FULL_ENV_INCLUDES) == strenv(DEP_LISTS)' From 9372991ee01d6d70b99661c8ad7545f3fd6b0e3f Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 26 Jul 2022 12:12:24 -0400 Subject: [PATCH 05/25] TEST - delete generated file --- .../full_cuda-11.6_arch-x86_64.yaml | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 conda/environments/full_cuda-11.6_arch-x86_64.yaml diff --git a/conda/environments/full_cuda-11.6_arch-x86_64.yaml b/conda/environments/full_cuda-11.6_arch-x86_64.yaml deleted file mode 100644 index 5f530bfd9..000000000 --- a/conda/environments/full_cuda-11.6_arch-x86_64.yaml +++ /dev/null @@ -1,24 +0,0 @@ -channels: -- rapidsai -- conda-forge -dependencies: -- 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 -- cuda-python>=11.6,<11.7.1 -- cudatoolkit=11.6 -- cython>=0.29,<0.30 -- flake8=3.8.3 -- gcovr>=5.0 -- isort=5.10.1 -- numba>=0.49 -- numpy>=1.19 -- pytest -- pytest-cov -- python>=3.8,<3.10 -- scikit-build>=0.13.1 -- spdlog>=1.8.5,<1.9 -name: full_cuda-11.6_arch-x86_64 From 8f12bdabec102d86713b946ae9a499b46dd3fc70 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 26 Jul 2022 12:33:01 -0400 Subject: [PATCH 06/25] Revert "TEST - delete generated file" This reverts commit 1caa37f8f190df61b367a53a012e8a091b24f980. --- .../full_cuda-11.6_arch-x86_64.yaml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 conda/environments/full_cuda-11.6_arch-x86_64.yaml diff --git a/conda/environments/full_cuda-11.6_arch-x86_64.yaml b/conda/environments/full_cuda-11.6_arch-x86_64.yaml new file mode 100644 index 000000000..5f530bfd9 --- /dev/null +++ b/conda/environments/full_cuda-11.6_arch-x86_64.yaml @@ -0,0 +1,24 @@ +channels: +- rapidsai +- conda-forge +dependencies: +- 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 +- cuda-python>=11.6,<11.7.1 +- cudatoolkit=11.6 +- cython>=0.29,<0.30 +- flake8=3.8.3 +- gcovr>=5.0 +- isort=5.10.1 +- numba>=0.49 +- numpy>=1.19 +- pytest +- pytest-cov +- python>=3.8,<3.10 +- scikit-build>=0.13.1 +- spdlog>=1.8.5,<1.9 +name: full_cuda-11.6_arch-x86_64 From 68b0caaf882eff9faec9c7a66ef35d62652ba2fe Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 26 Jul 2022 12:33:58 -0400 Subject: [PATCH 07/25] TEST - rename `full` env --- conda/environments/envs.yaml | 2 +- ...a-11.5_arch-x86_64.yaml => fulls_cuda-11.5_arch-x86_64.yaml} | 2 +- ...a-11.6_arch-x86_64.yaml => fulls_cuda-11.6_arch-x86_64.yaml} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename conda/environments/{full_cuda-11.5_arch-x86_64.yaml => fulls_cuda-11.5_arch-x86_64.yaml} (91%) rename conda/environments/{full_cuda-11.6_arch-x86_64.yaml => fulls_cuda-11.6_arch-x86_64.yaml} (91%) diff --git a/conda/environments/envs.yaml b/conda/environments/envs.yaml index 8fea3d9ca..381f4dbf8 100644 --- a/conda/environments/envs.yaml +++ b/conda/environments/envs.yaml @@ -1,6 +1,6 @@ # env files to create envs: - full: + fulls: matrix: cuda_version: ["11.5", "11.6"] arch: [x86_64] diff --git a/conda/environments/full_cuda-11.5_arch-x86_64.yaml b/conda/environments/fulls_cuda-11.5_arch-x86_64.yaml similarity index 91% rename from conda/environments/full_cuda-11.5_arch-x86_64.yaml rename to conda/environments/fulls_cuda-11.5_arch-x86_64.yaml index 28977a0d3..299311990 100644 --- a/conda/environments/full_cuda-11.5_arch-x86_64.yaml +++ b/conda/environments/fulls_cuda-11.5_arch-x86_64.yaml @@ -21,4 +21,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: fulls_cuda-11.5_arch-x86_64 diff --git a/conda/environments/full_cuda-11.6_arch-x86_64.yaml b/conda/environments/fulls_cuda-11.6_arch-x86_64.yaml similarity index 91% rename from conda/environments/full_cuda-11.6_arch-x86_64.yaml rename to conda/environments/fulls_cuda-11.6_arch-x86_64.yaml index 5f530bfd9..5b264fc40 100644 --- a/conda/environments/full_cuda-11.6_arch-x86_64.yaml +++ b/conda/environments/fulls_cuda-11.6_arch-x86_64.yaml @@ -21,4 +21,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: fulls_cuda-11.6_arch-x86_64 From a46fdf493de813d4ea545c981c85ed9ca525e7c2 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 26 Jul 2022 12:40:03 -0400 Subject: [PATCH 08/25] Revert "TEST - rename `full` env" This reverts commit 370d8e6b7d6adb07a46654406f37322cff66cc92. --- conda/environments/envs.yaml | 2 +- ...da-11.5_arch-x86_64.yaml => full_cuda-11.5_arch-x86_64.yaml} | 2 +- ...da-11.6_arch-x86_64.yaml => full_cuda-11.6_arch-x86_64.yaml} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename conda/environments/{fulls_cuda-11.5_arch-x86_64.yaml => full_cuda-11.5_arch-x86_64.yaml} (91%) rename conda/environments/{fulls_cuda-11.6_arch-x86_64.yaml => full_cuda-11.6_arch-x86_64.yaml} (91%) diff --git a/conda/environments/envs.yaml b/conda/environments/envs.yaml index 381f4dbf8..8fea3d9ca 100644 --- a/conda/environments/envs.yaml +++ b/conda/environments/envs.yaml @@ -1,6 +1,6 @@ # env files to create envs: - fulls: + full: matrix: cuda_version: ["11.5", "11.6"] arch: [x86_64] diff --git a/conda/environments/fulls_cuda-11.5_arch-x86_64.yaml b/conda/environments/full_cuda-11.5_arch-x86_64.yaml similarity index 91% rename from conda/environments/fulls_cuda-11.5_arch-x86_64.yaml rename to conda/environments/full_cuda-11.5_arch-x86_64.yaml index 299311990..28977a0d3 100644 --- a/conda/environments/fulls_cuda-11.5_arch-x86_64.yaml +++ b/conda/environments/full_cuda-11.5_arch-x86_64.yaml @@ -21,4 +21,4 @@ dependencies: - python>=3.8,<3.10 - scikit-build>=0.13.1 - spdlog>=1.8.5,<1.9 -name: fulls_cuda-11.5_arch-x86_64 +name: full_cuda-11.5_arch-x86_64 diff --git a/conda/environments/fulls_cuda-11.6_arch-x86_64.yaml b/conda/environments/full_cuda-11.6_arch-x86_64.yaml similarity index 91% rename from conda/environments/fulls_cuda-11.6_arch-x86_64.yaml rename to conda/environments/full_cuda-11.6_arch-x86_64.yaml index 5b264fc40..5f530bfd9 100644 --- a/conda/environments/fulls_cuda-11.6_arch-x86_64.yaml +++ b/conda/environments/full_cuda-11.6_arch-x86_64.yaml @@ -21,4 +21,4 @@ dependencies: - python>=3.8,<3.10 - scikit-build>=0.13.1 - spdlog>=1.8.5,<1.9 -name: fulls_cuda-11.6_arch-x86_64 +name: full_cuda-11.6_arch-x86_64 From 01d593a2daa1fb09f9ca81290db1dda4bec35b8c Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 26 Jul 2022 14:54:27 -0400 Subject: [PATCH 09/25] parameterize config file values --- .github/workflows/conda-envs.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conda-envs.yml b/.github/workflows/conda-envs.yml index d92631dd9..6058884f6 100644 --- a/.github/workflows/conda-envs.yml +++ b/.github/workflows/conda-envs.yml @@ -5,6 +5,8 @@ on: jobs: check_generated_files: + env: + CONFIG_FILE_PATH: conda/environments/envs.yaml name: ensure conda env files are up-to-date runs-on: ubuntu-latest steps: @@ -14,20 +16,24 @@ jobs: uses: actions/setup-python@v4 with: python-version: "3.10" + - name: Compute additional env vars + run: | + echo "CONFIG_FILE_DIR=$(dirname ${{ env.CONFIG_FILE_PATH }})" | tee --append $GITHUB_ENV + echo "CONFIG_FILE_NAME=$(basename ${{ env.CONFIG_FILE_PATH }})" | tee --append $GITHUB_ENV - name: Install rapids-env-generator run: pip install git+https://github.com/rapidsai/rapids-env-generator.git@initial-commit#egg=rapids-env-generator - name: Run rapids-env-generator run: | - find conda/environments -type f ! -name envs.yaml -delete # delete existing environment files - reg + find ${{ env.CONFIG_FILE_DIR }} -type f ! -name ${{ env.CONFIG_FILE_NAME }} -delete # delete existing environment files + reg --config ${{ env.CONFIG_FILE_PATH }} - name: Ensure generated environment files are up-to-date run: | git diff --exit-code - test -z "$(git status --porcelain conda/environments)" # ensures there are no untracked environment files + test -z "$(git status --porcelain ${{ env.CONFIG_FILE_DIR }})" # ensures there are no untracked environment files - name: Ensure a "full" environment exists run: | # ensure .envs.full exists - yq -e '.envs | has("full")' < conda/environments/envs.yaml + yq -e '.envs | has("full")' < ${{ env.CONFIG_FILE_PATH }} # ensure .envs.full.includes has all dependency lists export RESERVED_KEYS='["envs", "specifics", "channels"]' @@ -35,11 +41,11 @@ jobs: yq -e -o json \ 'keys | . - (strenv(RESERVED_KEYS) | from_json) | - sort' < conda/environments/envs.yaml + sort' < ${{ env.CONFIG_FILE_PATH }} ) export FULL_ENV_INCLUDES=$( yq -e -o json \ '.envs.full.includes | - sort' < conda/environments/envs.yaml + sort' < ${{ env.CONFIG_FILE_PATH }} ) yq -ne 'strenv(FULL_ENV_INCLUDES) == strenv(DEP_LISTS)' From 8f71e12ac6c3bffc8c1ce0d23bcd5e90664deab8 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 26 Jul 2022 15:07:47 -0400 Subject: [PATCH 10/25] utilize shared workflow --- .github/workflows/conda-envs.yml | 45 +------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/.github/workflows/conda-envs.yml b/.github/workflows/conda-envs.yml index 6058884f6..548acfe25 100644 --- a/.github/workflows/conda-envs.yml +++ b/.github/workflows/conda-envs.yml @@ -5,47 +5,4 @@ on: jobs: check_generated_files: - env: - CONFIG_FILE_PATH: conda/environments/envs.yaml - name: ensure conda env files are up-to-date - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Compute additional env vars - run: | - echo "CONFIG_FILE_DIR=$(dirname ${{ env.CONFIG_FILE_PATH }})" | tee --append $GITHUB_ENV - echo "CONFIG_FILE_NAME=$(basename ${{ env.CONFIG_FILE_PATH }})" | tee --append $GITHUB_ENV - - name: Install rapids-env-generator - run: pip install git+https://github.com/rapidsai/rapids-env-generator.git@initial-commit#egg=rapids-env-generator - - name: Run rapids-env-generator - run: | - find ${{ env.CONFIG_FILE_DIR }} -type f ! -name ${{ env.CONFIG_FILE_NAME }} -delete # delete existing environment files - reg --config ${{ env.CONFIG_FILE_PATH }} - - name: Ensure generated environment files are up-to-date - run: | - git diff --exit-code - test -z "$(git status --porcelain ${{ env.CONFIG_FILE_DIR }})" # ensures there are no untracked environment files - - name: Ensure a "full" environment exists - run: | - # ensure .envs.full exists - yq -e '.envs | has("full")' < ${{ env.CONFIG_FILE_PATH }} - - # ensure .envs.full.includes has all dependency lists - export RESERVED_KEYS='["envs", "specifics", "channels"]' - export DEP_LISTS=$( - yq -e -o json \ - 'keys | - . - (strenv(RESERVED_KEYS) | from_json) | - sort' < ${{ env.CONFIG_FILE_PATH }} - ) - export FULL_ENV_INCLUDES=$( - yq -e -o json \ - '.envs.full.includes | - sort' < ${{ env.CONFIG_FILE_PATH }} - ) - yq -ne 'strenv(FULL_ENV_INCLUDES) == strenv(DEP_LISTS)' + uses: rapidsai/shared-action-workflows/.github/workflows/conda-envs.yaml@main From 39133ba580cb333e7b43617eac833bff0cbfc480 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 26 Jul 2022 15:13:53 -0400 Subject: [PATCH 11/25] TEST - break things with shared workflow --- conda/environments/envs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/environments/envs.yaml b/conda/environments/envs.yaml index 8fea3d9ca..381f4dbf8 100644 --- a/conda/environments/envs.yaml +++ b/conda/environments/envs.yaml @@ -1,6 +1,6 @@ # env files to create envs: - full: + fulls: matrix: cuda_version: ["11.5", "11.6"] arch: [x86_64] From dc9ead26d87dd6502974d4d7971b7551d414c780 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 26 Jul 2022 15:15:10 -0400 Subject: [PATCH 12/25] Revert "TEST - break things with shared workflow" This reverts commit f54d7f2b1a5b6b162e1c49b9f1c76aef190443f2. --- conda/environments/envs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/environments/envs.yaml b/conda/environments/envs.yaml index 381f4dbf8..8fea3d9ca 100644 --- a/conda/environments/envs.yaml +++ b/conda/environments/envs.yaml @@ -1,6 +1,6 @@ # env files to create envs: - fulls: + full: matrix: cuda_version: ["11.5", "11.6"] arch: [x86_64] From e61a7e0e255c873c247970fdc1eda4377f50d2f0 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 26 Jul 2022 15:20:01 -0400 Subject: [PATCH 13/25] update README.md to reflect new filename --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3aeaa5b24..2f6f6f0fe 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ $ cd rmm - Create the conda development environment `rmm_dev` ```bash # create the conda environment (assuming in base `rmm` directory) -$ conda env create --name rmm_dev --file conda/environments/rmm_dev_cuda11.0.yml +$ conda env create --name rmm_dev --file conda/environments/full_cuda-11.5_arch-$(arch).yaml # activate the environment $ conda activate rmm_dev ``` From 9ae891cb36682407abf8aa0abad17d6bfc04e9cc Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 16 Aug 2022 10:21:57 -0400 Subject: [PATCH 14/25] 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 From d5ba54706d15f548b9a75910edead5dfa1b58505 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 16 Aug 2022 16:58:01 -0400 Subject: [PATCH 15/25] rename "full" to "all" based on latest changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2f6f6f0fe..493b6d731 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ $ cd rmm - Create the conda development environment `rmm_dev` ```bash # create the conda environment (assuming in base `rmm` directory) -$ conda env create --name rmm_dev --file conda/environments/full_cuda-11.5_arch-$(arch).yaml +$ conda env create --name rmm_dev --file conda/environments/all_cuda-11.5_arch-$(arch).yaml # activate the environment $ conda activate rmm_dev ``` From 6e8c1518a6f80fbf5676842df3e0b63f4abd1227 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Thu, 25 Aug 2022 15:32:19 -0400 Subject: [PATCH 16/25] update dependencies.yaml file format --- dependencies.yaml | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 610b7808f..121b59a67 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ files: all: generate: conda matrix: - cuda_version: ["11.5", "11.6"] + cuda: ["11.5", "11.6"] arch: [x86_64] includes: - miscellaneous @@ -37,20 +37,26 @@ dependencies: 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 + specific: + - matrix: + cuda: "11.5" + miscellaneous: + - cuda-python>=11.5,<11.7.1 + - matrix: + cuda: "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 + specific: + - matrix: + cuda: "11.5" + miscellaneous: + - cudatoolkit=11.5 + - matrix: + cuda: "11.6" + miscellaneous: + - cudatoolkit=11.6 From ffa685cd67cccf5dfe0d6066ca40592d3a3583e6 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Thu, 25 Aug 2022 15:32:29 -0400 Subject: [PATCH 17/25] re-generate dependency files --- ...cuda-11.5_arch-x86_64.yaml => all_cuda-115_arch-x86_64.yaml} | 2 +- ...cuda-11.6_arch-x86_64.yaml => all_cuda-116_arch-x86_64.yaml} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename conda/environments/{all_cuda-11.5_arch-x86_64.yaml => all_cuda-115_arch-x86_64.yaml} (94%) rename conda/environments/{all_cuda-11.6_arch-x86_64.yaml => all_cuda-116_arch-x86_64.yaml} (94%) diff --git a/conda/environments/all_cuda-11.5_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml similarity index 94% rename from conda/environments/all_cuda-11.5_arch-x86_64.yaml rename to conda/environments/all_cuda-115_arch-x86_64.yaml index bfd9be437..f6c688fef 100644 --- a/conda/environments/all_cuda-11.5_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -23,4 +23,4 @@ dependencies: - python>=3.8,<3.10 - scikit-build>=0.13.1 - spdlog>=1.8.5,<1.9 -name: all_cuda-11.5_arch-x86_64 +name: all_cuda-115_arch-x86_64 diff --git a/conda/environments/all_cuda-11.6_arch-x86_64.yaml b/conda/environments/all_cuda-116_arch-x86_64.yaml similarity index 94% rename from conda/environments/all_cuda-11.6_arch-x86_64.yaml rename to conda/environments/all_cuda-116_arch-x86_64.yaml index db1290151..1f3e7dadc 100644 --- a/conda/environments/all_cuda-11.6_arch-x86_64.yaml +++ b/conda/environments/all_cuda-116_arch-x86_64.yaml @@ -23,4 +23,4 @@ dependencies: - python>=3.8,<3.10 - scikit-build>=0.13.1 - spdlog>=1.8.5,<1.9 -name: all_cuda-11.6_arch-x86_64 +name: all_cuda-116_arch-x86_64 From 96c53de229a5919e5bb54e8cb21643acbfed62ec Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Thu, 25 Aug 2022 15:35:40 -0400 Subject: [PATCH 18/25] add dependencies.yaml header --- dependencies.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/dependencies.yaml b/dependencies.yaml index 121b59a67..9c3b385a6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,3 +1,4 @@ +# see https://github.com/rapidsai/dependency-file-generator for details # dependency files to create files: all: From cdfccdafb198d0cd183b978fc7a931023af0b7a4 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Thu, 25 Aug 2022 15:39:26 -0400 Subject: [PATCH 19/25] update README.md to reflect new filename --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 493b6d731..7a216c7d4 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ $ cd rmm - Create the conda development environment `rmm_dev` ```bash # create the conda environment (assuming in base `rmm` directory) -$ conda env create --name rmm_dev --file conda/environments/all_cuda-11.5_arch-$(arch).yaml +$ conda env create --name rmm_dev --file conda/environments/all_cuda-115_arch-$(arch).yaml # activate the environment $ conda activate rmm_dev ``` From 179c8ab522cba626d39bafbb374bdcaa5878ef57 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Thu, 25 Aug 2022 15:56:41 -0400 Subject: [PATCH 20/25] bifurcate miscellaneous dependency list --- dependencies.yaml | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 9c3b385a6..6f2c15054 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -7,7 +7,9 @@ files: cuda: ["11.5", "11.6"] arch: [x86_64] includes: - - miscellaneous + - build + - develop + - run - test test: generate: none @@ -21,43 +23,45 @@ channels: dependencies: conda_and_requirements: common: - miscellaneous: + build: + - cmake>=3.20.1,!=3.23.0 + - cython>=0.29,<0.30 + - python>=3.8,<3.10 + - scikit-build>=0.13.1 + run: + - numba>=0.49 + - numpy>=1.19 + develop: - 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 specific: - matrix: cuda: "11.5" - miscellaneous: + build: - cuda-python>=11.5,<11.7.1 - matrix: cuda: "11.6" - miscellaneous: + build: - cuda-python>=11.6,<11.7.1 conda: common: - miscellaneous: - - clang-tools=11.1.0 + build: - spdlog>=1.8.5,<1.9 + develop: + - clang-tools=11.1.0 specific: - matrix: cuda: "11.5" - miscellaneous: + build: - cudatoolkit=11.5 - matrix: cuda: "11.6" - miscellaneous: + build: - cudatoolkit=11.6 From 77b1b74012ff983e32f9f8360909263aebb6dd83 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Thu, 25 Aug 2022 15:59:31 -0400 Subject: [PATCH 21/25] re-generate dependency lists --- conda/environments/all_cuda-115_arch-x86_64.yaml | 1 - conda/environments/all_cuda-116_arch-x86_64.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index f6c688fef..6cc9072fb 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -5,7 +5,6 @@ channels: - conda-forge dependencies: - black=22.3.0 -- cffi>=1.10.0 - clang-tools=11.1.0 - clang=11.1.0 - cmake>=3.20.1,!=3.23.0 diff --git a/conda/environments/all_cuda-116_arch-x86_64.yaml b/conda/environments/all_cuda-116_arch-x86_64.yaml index 1f3e7dadc..bf1e54ff6 100644 --- a/conda/environments/all_cuda-116_arch-x86_64.yaml +++ b/conda/environments/all_cuda-116_arch-x86_64.yaml @@ -5,7 +5,6 @@ channels: - conda-forge dependencies: - black=22.3.0 -- cffi>=1.10.0 - clang-tools=11.1.0 - clang=11.1.0 - cmake>=3.20.1,!=3.23.0 From f67f8f025aff32d4a39d4b26b4209ac544e82eea Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 2 Sep 2022 15:54:44 -0400 Subject: [PATCH 22/25] rm $(arch) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a216c7d4..507c5e325 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ $ cd rmm - Create the conda development environment `rmm_dev` ```bash # create the conda environment (assuming in base `rmm` directory) -$ conda env create --name rmm_dev --file conda/environments/all_cuda-115_arch-$(arch).yaml +$ conda env create --name rmm_dev --file conda/environments/all_cuda-115_arch-x86_64.yaml # activate the environment $ conda activate rmm_dev ``` From 5ad603db8fd439ae6653d4ed132ae65de859417f Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 2 Sep 2022 15:54:56 -0400 Subject: [PATCH 23/25] rm extraneous comments from `dependencies.yaml` --- dependencies.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 6f2c15054..583e9415d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,5 +1,4 @@ -# see https://github.com/rapidsai/dependency-file-generator for details -# dependency files to create +# Dependency list for https://github.com/rapidsai/dependency-file-generator files: all: generate: conda @@ -15,11 +14,9 @@ files: generate: none includes: - test -# channels to add to conda environment files channels: - rapidsai - conda-forge -# dependency lists dependencies: conda_and_requirements: common: From 10f828d316f716939fcaddbda4fe5edd020d4857 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 2 Sep 2022 16:08:00 -0400 Subject: [PATCH 24/25] re-generate files w/ new header --- conda/environments/all_cuda-115_arch-x86_64.yaml | 4 ++-- conda/environments/all_cuda-116_arch-x86_64.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index 6cc9072fb..5efa00959 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -1,5 +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`. +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. channels: - rapidsai - conda-forge diff --git a/conda/environments/all_cuda-116_arch-x86_64.yaml b/conda/environments/all_cuda-116_arch-x86_64.yaml index bf1e54ff6..65ab0e6a0 100644 --- a/conda/environments/all_cuda-116_arch-x86_64.yaml +++ b/conda/environments/all_cuda-116_arch-x86_64.yaml @@ -1,5 +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`. +# This file is generated by `rapids-dependency-file-generator`. +# To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`. channels: - rapidsai - conda-forge From 8375228f7edfbfed3c4d1f0bbd7575e0a0e9cd33 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Tue, 6 Sep 2022 15:01:42 -0400 Subject: [PATCH 25/25] rename job --- .github/workflows/dependency-files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-files.yml b/.github/workflows/dependency-files.yml index 491f819c7..aeda16f41 100644 --- a/.github/workflows/dependency-files.yml +++ b/.github/workflows/dependency-files.yml @@ -4,5 +4,5 @@ on: pull_request: jobs: - check_generated_files: + check-generated-files: uses: rapidsai/shared-action-workflows/.github/workflows/dependency-files.yaml@main