rename python-lit feature to cccl-dev (#113)

* rename python-lit to cccl-dev

* rename directory

* rename lit -> cccl_dev in matrix.yaml

* update docs

* rename directory

* fix comparison

Author: trxcllnt

DEVELOP.md

@@ -16,7 +16,7 @@ This repository defines features to install the following dev tools, compilers,
 * [ninja-build](features/src/ninja/)
 * [NVIDIA HPC SDK](features/src/nvhpc/)
 * [Intel OneAPI compilers](features/src/oneapi/)
-* [lit (from pypi)](features/src/python-lit/)
+* [CCCL development utilities](features/src/cccl-dev/)
 * [Rust](features/src/rust/)
 * [sccache](features/src/sccache/)
 * [devcontainer-utils](features/src/utils/)

features/src/python-lit/.bashrc features/src/cccl-dev/.bashrc

@@ -1,10 +1,10 @@
 {
-  "name": "python-lit testing framework",
-  "id": "python-lit",
-  "version": "23.10.1",
-  "description": "A feature to install python-lit",
+  "name": "NVIDIA CCCL development utilities",
+  "id": "cccl-dev",
+  "version": "23.10.0",
+  "description": "A feature to install NVIDIA CCCL development utilities",
   "options": {
-    "version": {
+    "litVersion": {
       "type": "string",
       "proposals": [
         "latest",

features/src/python-lit/README.md features/src/cccl-dev/README.md

@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 set -ex
 
-LIT_VERSION="${VERSION:-latest}";
+LIT_VERSION="${LITVERSION:-latest}";
 
 if [ "$LIT_VERSION" -neq "latest" ]; then
   LIT_VERSION_TO_INSTALL="lit==$LIT_VERSION"
@@ -20,7 +20,7 @@ if ! type python >/dev/null 2>&1; then
   exit 1;
 fi
 
-PKG=("gettext-base");
+PKG=("gettext-base" "libtbb-dev");
 PKG_TO_REMOVE=();
 
 # Install gcc and g++ because we have to build psutil wheel for non-x86
@@ -40,7 +40,7 @@ export LIT_VERSION="$(lit --version | grep -o -e '[0-9].*')";
 append_to_etc_bashrc "$(cat .bashrc | envsubst '$LIT_VERSION')";
 append_to_all_bashrcs "$(cat .bashrc | envsubst '$LIT_VERSION')";
 # export envvars in /etc/profile.d
-add_etc_profile_d_script python-lit "$(cat .bashrc | envsubst '$LIT_VERSION')";
+add_etc_profile_d_script cccl-dev "$(cat .bashrc | envsubst '$LIT_VERSION')";
 
 # Clean up
 # rm -rf /tmp/*;

features/src/python-lit/common/etc/bash.bash_env features/src/cccl-dev/common/etc/bash.bash_env

@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "23.10.2",
+  "version": "23.10.3",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

features/src/python-lit/common/etc/skel/.config/clangd/config.yaml features/src/cccl-dev/common/etc/skel/.config/clangd/config.yaml

@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 find ~/ -maxdepth 1 -exec bash -c "\
-[ \$(stat --format '%U:%G' '{}') != $(id -u):$(id -g) ] \
+[ \$(stat --format '%u:%g' '{}') != $(id -u):$(id -g) ] \
 && sudo chown -R $(id -u):$(id -g) {}" \;
 
 . devcontainer-utils-init-git;

features/src/python-lit/common/install.sh features/src/cccl-dev/common/install.sh

@@ -3,7 +3,7 @@
 # This test can be run with the following command (from the root of this repo)
 # ```
 # npx --package=@devcontainers/cli -c 'devcontainer features test \
-#     --features python-lit \
+#     --features cccl-dev \
 #     --base-image ubuntu:22.04 .'
 # ```
 

features/src/python-lit/common/utilities.sh features/src/cccl-dev/common/utilities.sh

@@ -3,11 +3,11 @@
     "image": "ubuntu:22.04",
     "features": {
       "ghcr.io/devcontainers/features/python:1": {},
-      "python-lit": {}
+      "cccl-dev": {}
     },
     "overrideFeatureInstallOrder": [
       "ghcr.io/devcontainers/features/python",
-      "./python-lit"
+      "./cccl-dev"
     ]
   }
 }

features/src/python-lit/devcontainer-feature.json features/src/cccl-dev/devcontainer-feature.json

@@ -34,44 +34,44 @@ x-rust: &rust { name: "rust" }
 x-mambaforge: &conda { name: "mambaforge" }
 
 x-python: &python { name: "ghcr.io/devcontainers/features/python:1", hide: true }
-x-lit: &lit { name: "python-lit", hide: true }
+x-cccl_dev: &cccl_dev { name: "cccl-dev", hide: true }
 
 include:
 # CCCL devcontainers
 
 - os: "ubuntu:18.04"
   images:
-  - {features: [*gcc_6, *cuda_prev_min, *python, *lit], env: *gcc_env}
-  - {features: [*gcc_7, *cuda_prev_min, *python, *lit], env: *gcc_env}
-  - {features: [*gcc_8, *cuda_prev_min, *python, *lit], env: *gcc_env}
-  - {features: [*gcc_9, *cuda_prev_min, *python, *lit], env: *gcc_env}
-  - {features: [*llvm_9, *cuda_prev_min, *python, *lit], env: *llvm_env}
-  - {features: [*oneapi_2022, *cuda_prev_min, *python, *lit], env: *onapi_env}
+  - {features: [*gcc_6, *cuda_prev_min, *python, *cccl_dev], env: *gcc_env}
+  - {features: [*gcc_7, *cuda_prev_min, *python, *cccl_dev], env: *gcc_env}
+  - {features: [*gcc_8, *cuda_prev_min, *python, *cccl_dev], env: *gcc_env}
+  - {features: [*gcc_9, *cuda_prev_min, *python, *cccl_dev], env: *gcc_env}
+  - {features: [*llvm_9, *cuda_prev_min, *python, *cccl_dev], env: *llvm_env}
+  - {features: [*oneapi_2022, *cuda_prev_min, *python, *cccl_dev], env: *onapi_env}
 
 - os: "ubuntu:20.04"
   images:
-  - {features: [*gcc_7, *cuda_curr_max, *python, *lit], env: *gcc_env}
-  - {features: [*gcc_8, *cuda_curr_max, *python, *lit], env: *gcc_env}
-  - {features: [*gcc_9, *cuda_curr_max, *python, *lit], env: *gcc_env}
-  - {features: [*gcc_10, *cuda_curr_max, *python, *lit], env: *gcc_env}
-  - {features: [*llvm_9, *cuda_curr_max, *python, *lit], env: *llvm_env}
-  - {features: [*llvm_10, *cuda_curr_max, *python, *lit], env: *llvm_env}
-  - {features: [*llvm_11, *cuda_curr_max, *python, *lit], env: *llvm_env}
-  - {features: [*llvm_12, *cuda_curr_max, *python, *lit], env: *llvm_env}
-  - {features: [*llvm_13, *cuda_curr_max, *python, *lit], env: *llvm_env}
-  - {features: [*llvm_14, *cuda_curr_max, *python, *lit], env: *llvm_env}
-  - {features: [*oneapi_2022, *cuda_curr_max, *python, *lit], env: *onapi_env}
+  - {features: [*gcc_7, *cuda_curr_max, *python, *cccl_dev], env: *gcc_env}
+  - {features: [*gcc_8, *cuda_curr_max, *python, *cccl_dev], env: *gcc_env}
+  - {features: [*gcc_9, *cuda_curr_max, *python, *cccl_dev], env: *gcc_env}
+  - {features: [*gcc_10, *cuda_curr_max, *python, *cccl_dev], env: *gcc_env}
+  - {features: [*llvm_9, *cuda_curr_max, *python, *cccl_dev], env: *llvm_env}
+  - {features: [*llvm_10, *cuda_curr_max, *python, *cccl_dev], env: *llvm_env}
+  - {features: [*llvm_11, *cuda_curr_max, *python, *cccl_dev], env: *llvm_env}
+  - {features: [*llvm_12, *cuda_curr_max, *python, *cccl_dev], env: *llvm_env}
+  - {features: [*llvm_13, *cuda_curr_max, *python, *cccl_dev], env: *llvm_env}
+  - {features: [*llvm_14, *cuda_curr_max, *python, *cccl_dev], env: *llvm_env}
+  - {features: [*oneapi_2022, *cuda_curr_max, *python, *cccl_dev], env: *onapi_env}
 
 - os: "ubuntu:22.04"
   images:
-  - {features: [*nvhpc_prev, *python, *lit], env: *nvhpc_env}
-  - {features: [*nvhpc_curr, *python, *lit], env: *nvhpc_env}
-  - {features: [*gcc_11, *cuda_curr_max, *python, *lit], env: *gcc_env}
-  - {features: [*gcc_12, *cuda_curr_max, *python, *lit], env: *gcc_env}
-  - {features: [*llvm_15, *cuda_curr_max, *python, *lit], env: *llvm_env}
-  - {features: [*llvm_prev, *cuda_curr_max, *python, *lit], env: *llvm_env}
-  - {features: [*llvm_curr, *cuda_curr_max, *python, *lit], env: *llvm_env}
-  - {features: [*oneapi_2022, *cuda_curr_max, *python, *lit], env: *onapi_env}
+  - {features: [*nvhpc_prev, *python, *cccl_dev], env: *nvhpc_env}
+  - {features: [*nvhpc_curr, *python, *cccl_dev], env: *nvhpc_env}
+  - {features: [*gcc_11, *cuda_curr_max, *python, *cccl_dev], env: *gcc_env}
+  - {features: [*gcc_12, *cuda_curr_max, *python, *cccl_dev], env: *gcc_env}
+  - {features: [*llvm_15, *cuda_curr_max, *python, *cccl_dev], env: *llvm_env}
+  - {features: [*llvm_prev, *cuda_curr_max, *python, *cccl_dev], env: *llvm_env}
+  - {features: [*llvm_curr, *cuda_curr_max, *python, *cccl_dev], env: *llvm_env}
+  - {features: [*oneapi_2022, *cuda_curr_max, *python, *cccl_dev], env: *onapi_env}
 
 # RAPIDS devcontainers