Add ninja & Update CI environment variables (#1155)

This PR removes some environment variables that will now be defined in our CI images once rapidsai/ci-imgs#19 is merged. Additionally, it adds `ninja` to our `build` requirements since `ninja` was removed from our CI images. Depends on rapidsai/ci-imgs#19 and rapidsai/ci-imgs#20. Authors: - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - https://github.com/jakirkham - Robert Maynard (https://github.com/robertmaynard) - Ray Douglass (https://github.com/raydouglass) URL: #1155
rapidsai · Nov 9, 2022 · b94a595 · b94a595
1 parent 637d5fd
commit b94a595
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml
@@ -15,6 +15,7 @@ dependencies:
 - flake8=3.8.3
 - gcovr>=5.0
 - isort=5.10.1
+- ninja
 - numba>=0.49
 - numpy>=1.19
 - pytest

diff --git a/conda/environments/all_cuda-116_arch-x86_64.yaml b/conda/environments/all_cuda-116_arch-x86_64.yaml
@@ -15,6 +15,7 @@ dependencies:
 - flake8=3.8.3
 - gcovr>=5.0
 - isort=5.10.1
+- ninja
 - numba>=0.49
 - numpy>=1.19
 - pytest

diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml
@@ -14,6 +14,7 @@ source:
 requirements:
   build:
     - cmake {{ cmake_version }}
+    - ninja
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - {{ compiler('cuda') }} {{ cuda_version }}
@@ -24,15 +25,15 @@ requirements:
 build:
   script_env:
     - PARALLEL_LEVEL
-    - CMAKE_GENERATOR=Ninja
+    - CMAKE_GENERATOR
     - CMAKE_C_COMPILER_LAUNCHER
     - CMAKE_CXX_COMPILER_LAUNCHER
     - CMAKE_CUDA_COMPILER_LAUNCHER
     - SCCACHE_S3_KEY_PREFIX=librmm-aarch64 # [aarch64]
     - SCCACHE_S3_KEY_PREFIX=librmm-linux64 # [linux64]
-    - SCCACHE_BUCKET=rapids-sccache
-    - SCCACHE_REGION=us-west-2
-    - SCCACHE_IDLE_TIMEOUT=32768
+    - SCCACHE_BUCKET
+    - SCCACHE_REGION
+    - SCCACHE_IDLE_TIMEOUT
     - AWS_ACCESS_KEY_ID
     - AWS_SECRET_ACCESS_KEY
 

diff --git a/conda/recipes/rmm/meta.yaml b/conda/recipes/rmm/meta.yaml
@@ -18,14 +18,15 @@ build:
   script_env:
     - RMM_BUILD_NO_GPU_TEST
     - VERSION_SUFFIX
+    - CMAKE_GENERATOR
     - CMAKE_C_COMPILER_LAUNCHER
     - CMAKE_CXX_COMPILER_LAUNCHER
     - CMAKE_CUDA_COMPILER_LAUNCHER
     - SCCACHE_S3_KEY_PREFIX=rmm-aarch64 # [aarch64]
     - SCCACHE_S3_KEY_PREFIX=rmm-linux64 # [linux64]
-    - SCCACHE_BUCKET=rapids-sccache
-    - SCCACHE_REGION=us-west-2
-    - SCCACHE_IDLE_TIMEOUT=32768
+    - SCCACHE_BUCKET
+    - SCCACHE_REGION
+    - SCCACHE_IDLE_TIMEOUT
     - AWS_ACCESS_KEY_ID
     - AWS_SECRET_ACCESS_KEY
   ignore_run_exports_from:
@@ -34,6 +35,7 @@ build:
 requirements:
   build:
     - cmake>=3.23.1
+    - ninja
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - {{ compiler('cuda') }} {{ cuda_version }}

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -38,6 +38,7 @@ dependencies:
           - cmake>=3.23.1
           - cuda-python>=11.7.1,<12.0
           - cython>=0.29,<0.30
+          - ninja
           - python>=3.8,<3.10
           - scikit-build>=0.13.1
       - output_types: conda