more makefile

Makefile

@@ -1,5 +1,9 @@
 # List of targets that are not associated with files
-.PHONY:	quality style install
+.PHONY:	quality style install build_docker_cpu build_docker_cuda build_docker_rocm build_docker_tensorrt test_api_misc test_api_cpu test_api_cuda test_api_rocm test_api_tensorrt test_cli_misc test_cli_cpu_pytorch test_cli_cpu_neural_compressor test_cli_cpu_onnxruntime test_cli_cpu_openvino test_cli_cuda_pytorch test_cli_rocm_pytorch test_cli_tensorrt_onnxruntime test_cli_tensorrt_llm
+
+PWD := $(shell pwd)
+USER_ID := $(shell id -u)
+GROUP_ID := $(shell id -g)
 
 quality:
 	ruff check .
@@ -12,121 +16,156 @@ style:
 install:
 	pip install -e .
 
+## Docker builds
+
 build_docker_cpu:
-	docker build -f docker/cpu.dockerfile  --build-arg USER_ID=$(shell id -u) --build-arg GROUP_ID=$(shell id -g) -t opt-bench-cpu:latest .
+	docker build -f docker/cpu.dockerfile  --build-arg USER_ID=$(USER_ID) --build-arg GROUP_ID=$(GROUP_ID) -t opt-bench-cpu:local .
 
 build_docker_cuda:
-	docker build -f docker/cuda.dockerfile  --build-arg USER_ID=$(shell id -u) --build-arg GROUP_ID=$(shell id -g) -t opt-bench-cuda:latest . 
+	docker build -f docker/cuda.dockerfile  --build-arg USER_ID=$(USER_ID) --build-arg GROUP_ID=$(GROUP_ID) -t opt-bench-cuda:local . 
 
 build_docker_rocm:
-	docker build -f docker/rocm.dockerfile  --build-arg USER_ID=$(shell id -u) --build-arg GROUP_ID=$(shell id -g) -t opt-bench-rocm:latest . 
+	docker build -f docker/rocm.dockerfile  --build-arg USER_ID=$(USER_ID) --build-arg GROUP_ID=$(GROUP_ID) -t opt-bench-rocm:local . 
 
-test_cli_cpu_neural_compressor:
+build_docker_tensorrt:
+	docker build -f docker/tensorrt.dockerfile  --build-arg USER_ID=$(USER_ID) --build-arg GROUP_ID=$(GROUP_ID) -t opt-bench-tensorrt:local .
+
+## API tests
+
+test_api_misc:
 	docker run \
 	--rm \
-	--pid=host \
+	--pid host \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-cpu:latest -c "pip install -e .[testing,neural-compressor,diffusers,timm] && pytest tests/ -k 'cli and cpu and neural_compressor' -x"
+	opt-bench-cpu:local -c "pip install -e .[testing,timm,diffusers] && pytest tests/ -k 'api and not (cpu or cuda or rocm or tensorrt)' -x"
 
-test_cli_cpu_onnxruntime:
+test_api_cpu:
 	docker run \
 	--rm \
-	--pid=host \
+	--pid host \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-cpu:latest -c "pip install -e .[testing,onnxruntime,diffusers,timm] && pytest tests/ -k 'cli and cpu and onnxruntime' -x"
+	opt-bench-cpu:local -c "pip install -e .[testing,timm,diffusers] && pytest tests/ -k 'api and cpu' -x"
 
-test_cli_cpu_openvino:
+test_api_cuda:
 	docker run \
 	--rm \
-	--pid=host \
+	--pid host \
+	--gpus '"device=0,1"' \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-cpu:latest -c "pip install -e .[testing,openvino,diffusers,timm] && pytest tests/ -k 'cli and cpu and openvino' -x"
+	opt-bench-cuda:local -c "pip install -e .[testing,timm,diffusers] && pytest tests/ -k 'api and cuda' -x"
 
-test_cli_cpu_pytorch:
+test_api_rocm:
 	docker run \
 	--rm \
-	--pid=host \
+	--pid host \
+	--shm-size 64G \
+	--device /dev/kfd \
+	--device /dev/dri/renderD128 \
+	--device /dev/dri/renderD129 \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-cpu:latest -c "pip install -e .[testing,diffusers,timm] && pytest tests/ -k 'cli and cpu and pytorch' -x"
+	opt-bench-rocm:local -c "pip install -e .[testing,timm,diffusers] && pytest tests/ -k 'api and cuda' -x"
 
-test_cli_rocm_pytorch:
+## CLI tests
+
+### CLI CPU tests
+
+test_cli_misc:
 	docker run \
 	--rm \
-	--pid=host \
-	--device=/dev/kfd \
-	--device /dev/dri/renderD128 \
-	--device /dev/dri/renderD129 \
-	--group-add video \
+	--pid host \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-rocm:latest -c "pip install -e .[testing,diffusers,timm,deepspeed,peft] && pytest tests/ -k 'cli and cuda and pytorch' -x"
+	opt-bench-cpu:local -c "pip install -e .[testing,diffusers,timm] && pytest tests/ -k 'cli and not (cpu or cuda or rocm or tensorrt)' -x"
 
-test_cli_cuda_pytorch:
+test_cli_cpu_pytorch:
 	docker run \
 	--rm \
-	--pid=host \
-	--gpus '"device=0,1"' \
+	--pid host \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-cuda:latest -c "pip install -e .[testing,diffusers,timm,deepspeed,peft] && pytest tests/ -k 'cli and cuda and pytorch' -x"
+	opt-bench-cpu:local -c "pip install -e .[testing,diffusers,timm] && pytest tests/ -k 'cli and cpu and pytorch' -x"
 
-test_cli_tensorrt_llm:
+test_cli_cpu_neural_compressor:
 	docker run \
 	--rm \
-	--pid=host \
-	--gpus '"device=0,1"' \
+	--pid host \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-tensorrt-llm:latest -c "pip install -e .[testing] && pip uninstall -y nvidia-ml-py && pytest tests/ -k 'cli and tensorrt_llm' -x"
+	opt-bench-cpu:local -c "pip install -e .[testing,neural-compressor,diffusers,timm] && pytest tests/ -k 'cli and cpu and neural_compressor' -x"
 
-test_api_cpu:
+test_cli_cpu_onnxruntime:
 	docker run \
 	--rm \
-	--pid=host \
+	--pid host \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-cpu:latest -c "pip install -e .[testing,timm,diffusers] && pytest tests/ -k 'api and cpu' -x"
+	opt-bench-cpu:local -c "pip install -e .[testing,onnxruntime,diffusers,timm] && pytest tests/ -k 'cli and cpu and onnxruntime' -x"
 
-test_api_cuda:
+test_cli_cpu_openvino:
+	docker run \
+	--rm \
+	--pid host \
+	--entrypoint /bin/bash \
+	--volume $(PWD):/workspace \
+	--workdir /workspace \
+	opt-bench-cpu:local -c "pip install -e .[testing,openvino,diffusers,timm] && pytest tests/ -k 'cli and cpu and openvino' -x"
+
+### CLI GPU tests
+
+test_cli_cuda_pytorch:
 	docker run \
 	--rm \
-	--pid=host \
+	--pid host \
+	--shm-size 64G \
 	--gpus '"device=0,1"' \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-cuda:latest -c "pip install -e .[testing,timm,diffusers] && pytest tests/ -k 'api and cuda' -x"
+	opt-bench-cuda:local -c "pip install -e .[testing,diffusers,timm,deepspeed,peft] && pytest tests/ -k 'cli and cuda and pytorch' -x"
 
-test_api_rocm:
+test_cli_rocm_pytorch:
 	docker run \
 	--rm \
-	--pid=host \
-	--device=/dev/kfd \
+	--pid host \
+	--shm-size 64G \
+	--device /dev/kfd \
 	--device /dev/dri/renderD128 \
 	--device /dev/dri/renderD129 \
-	--group-add video \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-rocm:latest -c "pip install -e .[testing,timm,diffusers] && pytest tests/ -k 'api and cuda' -x"
+	opt-bench-rocm:local -c "pip install -e .[testing,diffusers,timm,deepspeed,peft] && pytest tests/ -k 'cli and cuda and pytorch' -x"
 
-test_api_misc:
+test_cli_tensorrt_onnxruntime:
+	docker run \
+	--rm \
+	--pid host \
+	--shm-size 64G \
+	--gpus '"device=0,1"' \
+	--entrypoint /bin/bash \
+	--volume $(PWD):/workspace \
+	--workdir /workspace \
+	opt-bench-tensorrt:local -c "pip install -e .[testing,onnxruntime-gpu,diffusers,timm] && pytest tests/ -k 'cli and tensorrt and onnxruntime' -x"
+
+test_cli_tensorrt_llm:
 	docker run \
 	--rm \
-	--pid=host \
+	--pid host \
+	--shm-size 64G \
+	--gpus '"device=0,1"' \
 	--entrypoint /bin/bash \
-	--volume $(shell pwd):/workspace \
+	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-cpu:latest -c "pip install -e .[testing,timm,diffusers] && pytest tests/ -k 'api and not (cpu or cuda or rocm or tensorrt)' -x"
+	opt-bench-tensorrt-llm:local -c "pip install -e .[testing] && pip uninstall -y nvidia-ml-py && pytest tests/ -k 'cli and tensorrt and llm' -x"