renamed 'category' to 'group'

dusty-nv · dusty-nv · commit 2f387c486fd3 · 2023-07-22T17:51:43.000-04:00
diff --git a/jetson_containers/ci.py b/jetson_containers/ci.py
@@ -36,7 +36,7 @@ def generate_package_list(packages, root, repo, filename='docs/packages.md', sim
     txt += f"|{_TABLE_DASH}|{_TABLE_DASH}|\n"
         
     # group packages by category for navigability
-    groups = group_packages(packages, key='category', default='other')
+    groups = group_packages(packages, key='group', default='other')
     
     for group_name in sorted(list(groups.keys())):
         group = groups[group_name]
diff --git a/jetson_containers/packages.py b/jetson_containers/packages.py
@@ -20,8 +20,8 @@
 _PACKAGE_SCAN = False
 _PACKAGE_ROOT = os.path.dirname(os.path.dirname(__file__))
 _PACKAGE_DIRS = [os.path.join(_PACKAGE_ROOT, 'packages/*')]
-_PACKAGE_KEYS = ['alias', 'build_args', 'build_flags', 'category', 'config', 'depends', 
-                 'description', 'disabled', 'dockerfile', 'name', 'notes', 'path', 'test']
+_PACKAGE_KEYS = ['alias', 'build_args', 'build_flags', 'config', 'depends', 'disabled',  
+                 'dockerfile', 'docs', 'group', 'name', 'notes', 'path', 'test']
 
 
 def package_search_dirs(package_dirs, scan=False):
@@ -225,9 +225,10 @@ def skip_packages(packages, skip):
 
 def group_packages(packages, key, default=''):
     """
-    Group packages by one of their keys, for example 'category' will return a dict
-    of all the categories where each category contains the packages belonging to it.
-    If a package doesn't have this key, it won't be added unless a default is specified.
+    Group packages by one of their keys, for example 'group' will return a dict
+    of all the groups where each group contains the packages belonging to it.
+    Or you can group by path, package name, depends, ect. or any other key.
+    If a package doesn't have the key, it won't be added unless a default is specified.
     """
     grouped = {}
     
diff --git a/packages/bazel/Dockerfile b/packages/bazel/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: bazel
-# category: build
+# group: build
 # depends: [build-essential]
 # test: test.sh
 #---
diff --git a/packages/build-essential/Dockerfile b/packages/build-essential/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: build-essential
-# category: build
+# group: build
 # notes: installs compilers and build tools
 #---
 ARG BASE_IMAGE
diff --git a/packages/cmake/cmake_apt/Dockerfile b/packages/cmake/cmake_apt/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: cmake:apt
-# category: build
+# group: build
 # depends: build-essential
 # notes: upgrade cmake with apt
 #---
diff --git a/packages/cmake/cmake_pip/Dockerfile b/packages/cmake/cmake_pip/Dockerfile
@@ -1,7 +1,7 @@
 #---
 # name: cmake:pip
 # alias: cmake
-# category: build
+# group: build
 # depends: [build-essential, python]
 # notes: upgrade cmake with pip
 #---
diff --git a/packages/cuda-python/Dockerfile b/packages/cuda-python/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: cuda-python
-# category: cuda
+# group: cuda
 # config: config.py
 # depends: [build-essential, python, numpy]
 # test: [test_driver.py, test_runtime.py]
diff --git a/packages/cupy/Dockerfile b/packages/cupy/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: cupy
-# category: cuda
+# group: cuda
 # config: config.py
 # depends: [python, numpy]
 # test: test.py
diff --git a/packages/deepstream/Dockerfile b/packages/deepstream/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: deepstream
-# category: ml
+# group: ml
 # config: config.py
 # depends: [cmake, python, gstreamer, tritonserver]
 # test: [test.sh, test.py]
diff --git a/packages/diffusion/small-stable-diffusion/Dockerfile b/packages/diffusion/small-stable-diffusion/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: small-stable-diffusion
-# category: diffusion
+# group: diffusion
 # depends: [pytorch, torchvision, onnxruntime]
 # disabled: true
 # test: test.sh
diff --git a/packages/diffusion/stable-diffusion-webui/Dockerfile b/packages/diffusion/stable-diffusion-webui/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: stable-diffusion-webui
-# category: diffusion
+# group: diffusion
 # depends: [pytorch, torchvision, opencv]
 #---
 ARG BASE_IMAGE
diff --git a/packages/diffusion/stable-diffusion/Dockerfile b/packages/diffusion/stable-diffusion/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: stable-diffusion
-# category: diffusion
+# group: diffusion
 # depends: [pytorch, torchvision]
 # test: test.sh
 #---
diff --git a/packages/gstreamer/Dockerfile b/packages/gstreamer/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: gstreamer
-# category: core
+# group: core
 # depends: opencv
 # test: [test.sh, test.py]
 #---
diff --git a/packages/jupyterlab/Dockerfile b/packages/jupyterlab/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: jupyterlab
-# category: core
+# group: core
 # depends: [python, numpy, rust]
 # notes: will autostart Jupyter server on port 8888 unless container entry CMD is overridden
 #---
diff --git a/packages/l4t/l4t-ml/Dockerfile b/packages/l4t/l4t-ml/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: l4t-ml
-# category: ml
+# group: ml
 # depends: [pytorch, torchvision, torchaudio, tensorflow2, opencv, pycuda, cupy, onnxruntime, numba, jupyterlab]
 # test: [test_pandas.py, test_scipy.py, test_sklearn.py]
 #---
diff --git a/packages/l4t/l4t-pytorch/l4t-pytorch.json b/packages/l4t/l4t-pytorch/l4t-pytorch.json
@@ -1,6 +1,6 @@
 {
     "l4t-pytorch": {
-        "category": "ml",
+        "group": "ml",
         "depends": ["pytorch", "torchvision", "torchaudio", "opencv", "pycuda"]
     }
 }
diff --git a/packages/l4t/l4t-tensorflow/l4t-tensorflow.json b/packages/l4t/l4t-tensorflow/l4t-tensorflow.json
@@ -1,11 +1,11 @@
 {
     "l4t-tensorflow:tf1": {
-        "category": "ml",
+        "group": "ml",
         "depends": ["tensorflow", "opencv", "pycuda"]
     },
     
     "l4t-tensorflow:tf2": {
-        "category": "ml",
+        "group": "ml",
         "depends": ["tensorflow2", "opencv", "pycuda"]
     }
 }
diff --git a/packages/llm/auto-gptq/Dockerfile b/packages/llm/auto-gptq/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: auto-gptq
-# category: llm
+# group: llm
 # depends: [pytorch, bitsandbytes, transformers]
 # test: test.py
 #---
diff --git a/packages/llm/awq/Dockerfile b/packages/llm/awq/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: awq
-# category: llm
+# group: llm
 # config: config.py
 # depends: [pytorch, torchvision, transformers]
 # test: test.sh
diff --git a/packages/llm/bitsandbytes/Dockerfile b/packages/llm/bitsandbytes/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: bitsandbytes
-# category: llm
+# group: llm
 # config: config.py
 # depends: [build-essential, pytorch]
 # test: test.py
diff --git a/packages/llm/exllama/Dockerfile b/packages/llm/exllama/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: exllama
-# category: llm
+# group: llm
 # depends: [pytorch]
 # test: test.sh
 #---
diff --git a/packages/llm/gptq-for-llama/Dockerfile b/packages/llm/gptq-for-llama/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: gptq-for-llama
-# category: llm
+# group: llm
 # depends: [pytorch, bitsandbytes, transformers]
 # test: test.sh
 #---
diff --git a/packages/llm/optimum/Dockerfile b/packages/llm/optimum/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: optimum
-# category: llm
+# group: llm
 # depends: [onnxruntime, transformers]
 # test: test.py
 #---
diff --git a/packages/llm/text-generation-webui/Dockerfile b/packages/llm/text-generation-webui/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: text-generation-webui
-# category: llm
+# group: llm
 # depends: [pytorch, bitsandbytes, transformers, auto-gptq, gptq-for-llama]
 #---
 ARG BASE_IMAGE
diff --git a/packages/llm/transformers/Dockerfile b/packages/llm/transformers/Dockerfile
@@ -1,7 +1,7 @@
 #---
 # name: transformers
 # config: config.py
-# category: llm
+# group: llm
 # depends: [pytorch, torchvision]
 # test: test.py
 # notes: bitsandbytes dependency added on JetPack5 for 4/8-bit
diff --git a/packages/nemo/Dockerfile b/packages/nemo/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: nemo
-# category: ml
+# group: ml
 # depends: [pytorch, torchvision, torchaudio]
 # test: test.py
 # notes: NVIDIA NeMo for ASR/NLP/TTS https://nvidia.github.io/NeMo/
diff --git a/packages/numba/Dockerfile b/packages/numba/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: numba
-# category: cuda
+# group: cuda
 # depends: [build-essential, python, numpy]
 # test: test.py
 #---
diff --git a/packages/numpy/Dockerfile b/packages/numpy/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: numpy
-# category: core
+# group: core
 # depends: [build-essential, python]
 # test: test.py
 #---
diff --git a/packages/onnx/Dockerfile b/packages/onnx/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: onnx
-# category: ml
+# group: ml
 # config: config.py
 # depends: [cmake, python, numpy]
 # test: test.py
diff --git a/packages/onnxruntime/Dockerfile b/packages/onnxruntime/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: onnxruntime
-# category: ml
+# group: ml
 # config: config.py
 # depends: [cmake, python, numpy, onnx]
 # test: test.py
diff --git a/packages/opencv/Dockerfile b/packages/opencv/Dockerfile
@@ -1,7 +1,7 @@
 #---
 # name: opencv
 # alias: opencv_cuda
-# category: core
+# group: core
 # config: config.py
 # depends: [python, numpy]
 # test: test.py
diff --git a/packages/opencv/opencv_builder/config.py b/packages/opencv/opencv_builder/config.py
@@ -16,5 +16,5 @@
     'ENABLE_NEON': ENABLE_NEON
 }
 
-package['category'] = 'core'
+package['group'] = 'core'
 package['depends'] = ['cmake', 'python']
diff --git a/packages/protobuf/protobuf_apt/Dockerfile b/packages/protobuf/protobuf_apt/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: protobuf:apt
-# category: build
+# group: build
 # depends: [python]
 # test: [test.py, test.sh]
 # notes: install protobuf from apt repo
diff --git a/packages/protobuf/protobuf_cpp/Dockerfile b/packages/protobuf/protobuf_cpp/Dockerfile
@@ -1,7 +1,7 @@
 #---
 # name: protobuf:cpp
 # alias: protobuf
-# category: build
+# group: build
 # config: config.py
 # depends: [build-essential, python]
 # test: [test.py, test.sh]
diff --git a/packages/pycuda/Dockerfile b/packages/pycuda/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: pycuda
-# category: cuda
+# group: cuda
 # depends: [build-essential, python]
 # test: test.py
 #---
diff --git a/packages/python/Dockerfile b/packages/python/Dockerfile
@@ -1,7 +1,7 @@
 #---
 # name: python
 # alias: python3
-# category: build
+# group: build
 # depends: build-essential
 # notes: installs core python3 packages and pip
 #---
diff --git a/packages/pytorch/Dockerfile b/packages/pytorch/Dockerfile
@@ -1,7 +1,7 @@
 #---
 # name: pytorch
 # alias: torch
-# category: ml
+# group: ml
 # config: config.py
 # depends: [python, numpy, onnx]
 # test: test.py
diff --git a/packages/pytorch/torch2trt/Dockerfile b/packages/pytorch/torch2trt/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: torch2trt
-# category: ml
+# group: ml
 # depends: [pytorch, torchvision]
 # test: test.py
 #---
diff --git a/packages/pytorch/torch_tensorrt/Dockerfile b/packages/pytorch/torch_tensorrt/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: torch_tensorrt
-# category: ml
+# group: ml
 # config: config.py
 # depends: [pytorch, torchvision, bazel]
 # test: [test.py, test.sh]
diff --git a/packages/pytorch/torchaudio/Dockerfile b/packages/pytorch/torchaudio/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: torchaudio
-# category: ml
+# group: ml
 # config: config.py
 # depends: [cmake, pytorch]
 # test: test.py
diff --git a/packages/pytorch/torchvision/Dockerfile b/packages/pytorch/torchvision/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: torchvision
-# category: ml
+# group: ml
 # config: config.py
 # depends: [cmake, pytorch]
 # test: test.py
diff --git a/packages/pytorch/torchvision/config.py b/packages/pytorch/torchvision/config.py
@@ -13,5 +13,5 @@
     'TORCH_CUDA_ARCH_LIST': ';'.join([f'{x/10:.1f}' for x in CUDA_ARCHITECTURES])
 }
 
-package['depends'] = ['cmake', 'pytorch']
-package['category'] = 'ml'
+package['group'] = 'ml'
+package['depends'] = ['cmake', 'pytorch']
diff --git a/packages/rapids/cudf/Dockerfile b/packages/rapids/cudf/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: cudf
-# category: rapids
+# group: rapids
 # config: config.py
 # depends: [cmake, python, cupy, numba, protobuf:apt]
 # test: [test_cudf.py, test_dask.py]
diff --git a/packages/realsense/Dockerfile b/packages/realsense/Dockerfile
@@ -1,6 +1,6 @@
 #---
 # name: realsense
-# category: sensors
+# group: sensors
 # depends: [python, cmake]
 # test: test.py
 # notes: https://github.com/IntelRealSense/librealsense/blob/master/doc/installation_jetson.md
diff --git a/packages/ros/config.py b/packages/ros/config.py
@@ -11,7 +11,7 @@
 # add permutations of ROS distros/packages as subpackages
 template = package.copy()
 
-template['category'] = 'ros'
+template['group'] = 'ros'
 template['depends'] = ['cmake', 'python', 'opencv']
 
 package = []
diff --git a/packages/rust/Dockerfile b/packages/rust/Dockerfile
diff --git a/packages/tensorflow/Dockerfile b/packages/tensorflow/Dockerfile
diff --git a/packages/tritonserver/Dockerfile b/packages/tritonserver/Dockerfile
diff --git a/packages/zed/Dockerfile b/packages/zed/Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"l4t-pytorch": {`
`3`		`- "category": "ml",`
	`3`	`+ "group": "ml",`
`4`	`4`	`"depends": ["pytorch", "torchvision", "torchaudio", "opencv", "pycuda"]`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"l4t-tensorflow:tf1": {`
`3`		`- "category": "ml",`
	`3`	`+ "group": "ml",`
`4`	`4`	`"depends": ["tensorflow", "opencv", "pycuda"]`
`5`	`5`	`},`
`6`	`6`
`7`	`7`	`"l4t-tensorflow:tf2": {`
`8`		`- "category": "ml",`
	`8`	`+ "group": "ml",`
`9`	`9`	`"depends": ["tensorflow2", "opencv", "pycuda"]`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@`
`16`	`16`	`'ENABLE_NEON': ENABLE_NEON`
`17`	`17`	`}`
`18`	`18`
`19`		`-package['category'] = 'core'`
	`19`	`+package['group'] = 'core'`
`20`	`20`	`package['depends'] = ['cmake', 'python']`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@`
`13`	`13`	`'TORCH_CUDA_ARCH_LIST': ';'.join([f'{x/10:.1f}' for x in CUDA_ARCHITECTURES])`
`14`	`14`	`}`
`15`	`15`
`16`		`-package['depends'] = ['cmake', 'pytorch']`
`17`		`-package['category'] = 'ml'`
	`16`	`+package['group'] = 'ml'`
	`17`	`+package['depends'] = ['cmake', 'pytorch']`