Merge branch 'main' into modifier_refactor_onnx_export

neuralmagic · Oct 19, 2023 · 02fcf74 · 02fcf74
2 parents 3ec671f + cae298c
commit 02fcf74
Show file tree

Hide file tree

Showing 22 changed files with 1,166 additions and 1,026 deletions.
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ ifneq ($(findstring onnx,$(TARGETS)),onnx)
     PYTEST_ARGS := $(PYTEST_ARGS) --ignore tests/sparseml/onnx
 endif
 ifneq ($(findstring pytorch,$(TARGETS)),pytorch)
-    PYTEST_ARGS := $(PYTEST_ARGS) --ignore tests/sparseml/pytorch --ignore tests/sparseml/modifiers
+    PYTEST_ARGS := $(PYTEST_ARGS) --ignore tests/sparseml/pytorch
 endif
 ifneq ($(findstring pytorch_models,$(TARGETS)),pytorch_models)
     PYTEST_ARGS := $(PYTEST_ARGS) --ignore tests/sparseml/pytorch/models

diff --git a/research/information_retrieval/doc2query/requirements.txt b/research/information_retrieval/doc2query/requirements.txt
@@ -127,7 +127,7 @@ traitlets==5.0.5
 transformers==4.7.0
 typer==0.3.2
 typing-extensions==3.10.0.0
-urllib3==1.26.17
+urllib3==1.26.18
 wandb==0.10.32
 wasabi==0.8.2
 wcwidth==0.2.5

diff --git a/src/sparseml/core/__init__.py b/src/sparseml/core/__init__.py
@@ -20,6 +20,7 @@
 from .framework import *
 from .framework_object import *
 from .lifecycle import *
+from .logger import *
 from .model import *
 from .modifier import *
 from .optimizer import *