From f0f6d9bdf9f6fbd41965d619c9359de65c0a7d10 Mon Sep 17 00:00:00 2001
From: oobabooga <112222186+oobabooga@users.noreply.github.com>
Date: Wed, 20 Dec 2023 07:36:33 -0800
Subject: [PATCH] Add HQQ back & update version

This reverts commit 2289e9031e50326ddfae962db6e7f3cc6225077f.
---
 modules/models.py                | 8 ++------
 requirements.txt                 | 1 +
 requirements_amd.txt             | 1 +
 requirements_amd_noavx2.txt      | 1 +
 requirements_apple_intel.txt     | 1 +
 requirements_apple_silicon.txt   | 1 +
 requirements_cpu_only.txt        | 1 +
 requirements_cpu_only_noavx2.txt | 1 +
 requirements_noavx2.txt          | 1 +
 requirements_nowheels.txt        | 1 +
 10 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/models.py b/modules/models.py
index cad6a165..7a1124d1 100644
--- a/modules/models.py
+++ b/modules/models.py
@@ -413,12 +413,8 @@ def ExLlamav2_HF_loader(model_name):
 
 
 def HQQ_loader(model_name):
-    try:
-        from hqq.core.quantize import HQQBackend, HQQLinear
-        from hqq.engine.hf import HQQModelForCausalLM
-    except ModuleNotFoundError:
-        logger.error("HQQ is not installed. You can install it with:\n\npip install hqq")
-        return None
+    from hqq.core.quantize import HQQBackend, HQQLinear
+    from hqq.engine.hf import HQQModelForCausalLM
 
     logger.info(f"Loading HQQ model with backend: {shared.args.hqq_backend}")
 
diff --git a/requirements.txt b/requirements.txt
index 38f8efdb..4843741b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,7 @@ datasets
 einops
 exllamav2==0.0.11; platform_system != "Darwin" and platform_machine != "x86_64"
 gradio==3.50.*
+hqq==0.1.1.post1
 markdown
 numpy==1.24.*
 optimum==1.16.*
diff --git a/requirements_amd.txt b/requirements_amd.txt
index 458d810d..f15014ad 100644
--- a/requirements_amd.txt
+++ b/requirements_amd.txt
@@ -4,6 +4,7 @@ datasets
 einops
 exllamav2==0.0.11; platform_system == "Windows" or python_version < "3.10" or python_version > "3.11" or platform_machine != "x86_64"
 gradio==3.50.*
+hqq==0.1.1.post1
 markdown
 numpy==1.24.*
 optimum==1.16.*
diff --git a/requirements_amd_noavx2.txt b/requirements_amd_noavx2.txt
index a4bb1551..843cbac1 100644
--- a/requirements_amd_noavx2.txt
+++ b/requirements_amd_noavx2.txt
@@ -4,6 +4,7 @@ datasets
 einops
 exllamav2==0.0.11; platform_system == "Windows" or python_version < "3.10" or python_version > "3.11" or platform_machine != "x86_64"
 gradio==3.50.*
+hqq==0.1.1.post1
 markdown
 numpy==1.24.*
 optimum==1.16.*
diff --git a/requirements_apple_intel.txt b/requirements_apple_intel.txt
index 56eccd35..cee6d185 100644
--- a/requirements_apple_intel.txt
+++ b/requirements_apple_intel.txt
@@ -4,6 +4,7 @@ datasets
 einops
 exllamav2==0.0.11
 gradio==3.50.*
+hqq==0.1.1.post1
 markdown
 numpy==1.24.*
 optimum==1.16.*
diff --git a/requirements_apple_silicon.txt b/requirements_apple_silicon.txt
index 54606b01..a3aede26 100644
--- a/requirements_apple_silicon.txt
+++ b/requirements_apple_silicon.txt
@@ -4,6 +4,7 @@ datasets
 einops
 exllamav2==0.0.11
 gradio==3.50.*
+hqq==0.1.1.post1
 markdown
 numpy==1.24.*
 optimum==1.16.*
diff --git a/requirements_cpu_only.txt b/requirements_cpu_only.txt
index 09936b74..af04acf7 100644
--- a/requirements_cpu_only.txt
+++ b/requirements_cpu_only.txt
@@ -4,6 +4,7 @@ datasets
 einops
 exllamav2==0.0.11
 gradio==3.50.*
+hqq==0.1.1.post1
 markdown
 numpy==1.24.*
 optimum==1.16.*
diff --git a/requirements_cpu_only_noavx2.txt b/requirements_cpu_only_noavx2.txt
index 65734de4..1c9d15c0 100644
--- a/requirements_cpu_only_noavx2.txt
+++ b/requirements_cpu_only_noavx2.txt
@@ -4,6 +4,7 @@ datasets
 einops
 exllamav2==0.0.11
 gradio==3.50.*
+hqq==0.1.1.post1
 markdown
 numpy==1.24.*
 optimum==1.16.*
diff --git a/requirements_noavx2.txt b/requirements_noavx2.txt
index 6c8579f3..39751fc5 100644
--- a/requirements_noavx2.txt
+++ b/requirements_noavx2.txt
@@ -4,6 +4,7 @@ datasets
 einops
 exllamav2==0.0.11; platform_system != "Darwin" and platform_machine != "x86_64"
 gradio==3.50.*
+hqq==0.1.1.post1
 markdown
 numpy==1.24.*
 optimum==1.16.*
diff --git a/requirements_nowheels.txt b/requirements_nowheels.txt
index d9a689f9..22e10c6b 100644
--- a/requirements_nowheels.txt
+++ b/requirements_nowheels.txt
@@ -4,6 +4,7 @@ datasets
 einops
 exllamav2==0.0.11
 gradio==3.50.*
+hqq==0.1.1.post1
 markdown
 numpy==1.24.*
 optimum==1.16.*