add autoawq and bnb to setup.py

- update github workflow files to install autoawq and bnb using setup.py
- "requests" is installed independently because "autoawq@git+https..." requires it to proceed with its installation.

.github/workflows/test_cli_cuda_pytorch.yaml

@@ -53,4 +53,4 @@ jobs:
           --workdir /workspace/optimum-benchmark
           --entrypoint /bin/bash
           opt-bench-cuda:${{ matrix.image.cuda_version }}
-          -c "pip install -e .[testing,diffusers,timm,deepspeed,peft] && pip install bitsandbytes git+https://github.com/casper-hansen/AutoAWQ.git && pytest -k 'cli and cuda and pytorch' -x"
+          -c "pip install requests && pip install -e .[testing,diffusers,timm,deepspeed,peft,bitsandbytes,autoawq] && pytest -k 'cli and cuda and pytorch' -x"

.github/workflows/test_cli_rocm_pytorch.yaml

@@ -51,4 +51,4 @@ jobs:
           --device /dev/dri/renderD129
           --entrypoint /bin/bash
           opt-bench-rocm:${{ matrix.image.rocm_version }}
-          -c "pip install -e .[testing,diffusers,timm,deepspeed,peft] && pip install git+https://github.com/casper-hansen/AutoAWQ.git && pytest -k 'cli and cuda and pytorch and not bnb' -x"
+          -c "pip install requests && pip install -e .[testing,diffusers,timm,deepspeed,peft,autoawq] && pytest -k 'cli and cuda and pytorch and not bnb' -x"

Makefile

@@ -15,9 +15,8 @@ CLI_MISC_REQS := testing
 
 CLI_CUDA_ONNXRUNTIME_REQS := testing,timm,diffusers
 CLI_ROCM_ONNXRUNTIME_REQS := testing,timm,diffusers
-CLI_CUDA_PYTORCH_REQS := testing,timm,diffusers,deepspeed,peft
-CLI_ROCM_PYTORCH_REQS := testing,timm,diffusers,deepspeed,peft
-CLI_CUDA_PYTORCH_QUANTIZATION_REQS := bitsandbytes git+https://github.com/casper-hansen/AutoAWQ.git
+CLI_CUDA_PYTORCH_REQS := testing,timm,diffusers,deepspeed,peft,bitsandbytes,autoawq
+CLI_ROCM_PYTORCH_REQS := testing,timm,diffusers,deepspeed,peft,autoawq
 CLI_CPU_OPENVINO_REQS := testing,openvino,timm,diffusers
 CLI_CPU_PYTORCH_REQS := testing,timm,diffusers,deepspeed,peft
 CLI_CPU_ONNXRUNTIME_REQS := testing,onnxruntime,timm,diffusers
@@ -108,7 +107,7 @@ define test_nvidia
 	--entrypoint /bin/bash \
 	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-$(1):local -c "pip install -e .[$(2)] && pip install $(CLI_CUDA_PYTORCH_QUANTIZATION_REGS) && pytest tests/ -k '$(3)' -x"
+	opt-bench-$(1):local -c "pip install requests && pip install -e .[$(2)] && pytest tests/ -k '$(3)' -x"
 endef
 
 define test_amdgpu
@@ -122,7 +121,7 @@ define test_amdgpu
 	--entrypoint /bin/bash \
 	--volume $(PWD):/workspace \
 	--workdir /workspace \
-	opt-bench-$(1):local -c "pip install -e .[$(2)] && pip install git+https://github.com/casper-hansen/AutoAWQ.git && pytest tests/ -k '$(3)' -x"
+	opt-bench-$(1):local -c "pip install requests && pip install -e .[$(2)] && pytest tests/ -k '$(3)' -x"
 endef
 
 # group the extra

setup.py

@@ -55,6 +55,8 @@
     "diffusers": ["diffusers"],
     "timm": ["timm"],
     "peft": ["peft"],
+    "autoawq": ["autoawq@git+https://github.com/casper-hansen/AutoAWQ.git"],
+    "bitsandbytes": ["bitsandbytes"]
 }