From 9465aeda9b66269390ea245a045b02661c727034 Mon Sep 17 00:00:00 2001
From: Benjamin <ben@neuralmagic.com>
Date: Thu, 4 Feb 2021 16:44:45 -0500
Subject: [PATCH 1/2] build argument for nightly

---
 Makefile                                     |  5 +++--
 setup.py                                     | 21 ++++++++++++++++----
 src/sparseml/tensorflow_v1/utils/variable.py |  1 +
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 9f471852123..ae8c5a36675 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,8 @@ DOCDIR := docs
 MDCHECKGLOBS := 'docs/**/*.md' 'docs/**/*.rst' 'examples/**/*.md' 'notebooks/**/*.md' 'scripts/**/*.md'
 MDCHECKFILES := CODE_OF_CONDUCT.md CONTRIBUTING.md DEVELOPING.md README.md
 
-TARGETS := ""  # targets for running pytests: keras,onnx,pytorch,pytorch_models,pytorch_datasets,tensorflow_v1,tensorflow_v1_datasets
+BUILD_ARGS :=  # set nightly to build nightly release
+TARGETS := ""  # targets for running pytests: keras,onnx,pytorch,pytorch_models,pytorch_datasets,tensorflow_v1,tensorflow_v1_models,tensorflow_v1_datasets
 PYTEST_ARGS := ""
 ifneq ($(findstring keras,$(TARGETS)),keras)
     PYTEST_ARGS := $(PYTEST_ARGS) --ignore tests/sparseml/keras
@@ -63,7 +64,7 @@ docs:
 
 # creates wheel file
 build:
-	python3 setup.py sdist bdist_wheel
+	python3 setup.py sdist bdist_wheel $(BUILD_ARGS)
 
 # clean package
 clean:
diff --git a/setup.py b/setup.py
index 7de4287e05c..ff529907457 100644
--- a/setup.py
+++ b/setup.py
@@ -12,11 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 from typing import Dict, List, Tuple
 
 from setuptools import find_packages, setup
 
 
+_NIGHTLY = "nightly" in sys.argv
+if _NIGHTLY:
+    # remove nightly param so it does not break bdist_wheel
+    sys.argv.remove("nightly")
+
+
+_PACKAGE_NAME = "sparseml" if not _NIGHTLY else "sparseml-nightly"
+_VERSION = "0.1.0"
+
+
 _deps = [
     "jupyter>=1.0.0",
     "ipywidgets>=7.0.0",
@@ -32,10 +43,12 @@
     "requests>=2.0.0",
     "scikit-image>=0.15.0",
     "scipy>=1.0.0",
-    "sparsezoo>=0.1.0",
     "tqdm>=4.0.0",
     "toposort>=1.0",
 ]
+_nm_deps = [
+    f"sparsezoo~={_VERSION}" if not _NIGHTLY else "sparsezoo-nightly",
+]
 _pytorch_deps = ["torch>=1.1.0", "tensorboard>=1.0", "tensorboardX>=1.0"]
 _pytorch_vision_deps = _pytorch_deps + ["torchvision>=0.3.0"]
 _tensorflow_v1_deps = ["tensorflow<2.0.0", "tensorboard<2.0.0", "tf2onnx>=1.0.0,<1.6"]
@@ -72,7 +85,7 @@ def _setup_package_dir() -> Dict:
 
 
 def _setup_install_requires() -> List:
-    return _deps
+    return _nm_deps + _deps
 
 
 def _setup_extras() -> Dict:
@@ -95,8 +108,8 @@ def _setup_long_description() -> Tuple[str, str]:
 
 
 setup(
-    name="sparseml",
-    version="0.1.0",
+    name=_PACKAGE_NAME,
+    version=_VERSION,
     author="Neuralmagic, Inc.",
     author_email="support@neuralmagic.com",
     description=(
diff --git a/src/sparseml/tensorflow_v1/utils/variable.py b/src/sparseml/tensorflow_v1/utils/variable.py
index d83dd1b12a9..06cca3013cc 100644
--- a/src/sparseml/tensorflow_v1/utils/variable.py
+++ b/src/sparseml/tensorflow_v1/utils/variable.py
@@ -21,6 +21,7 @@
 try:
     import tensorflow.contrib.graph_editor as graph_editor
     from tensorflow.contrib.graph_editor.util import ListView
+
     tf_contrib_err = None
 except Exception as err:
     graph_editor = None

From 09513a30dbb83bc71e34a57dfc20e5932880a484 Mon Sep 17 00:00:00 2001
From: Benjamin <ben@neuralmagic.com>
Date: Thu, 4 Feb 2021 17:13:14 -0500
Subject: [PATCH 2/2] adding dates to nightly build version

---
 setup.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index ff529907457..801965ba953 100644
--- a/setup.py
+++ b/setup.py
@@ -13,21 +13,22 @@
 # limitations under the License.
 
 import sys
+from datetime import date
 from typing import Dict, List, Tuple
 
 from setuptools import find_packages, setup
 
 
+_PACKAGE_NAME = "sparseml"
+_VERSION = "0.1.0"
 _NIGHTLY = "nightly" in sys.argv
+
 if _NIGHTLY:
+    _PACKAGE_NAME += "-nightly"
+    _VERSION += "." + date.today().strftime("%Y%m%d")
     # remove nightly param so it does not break bdist_wheel
     sys.argv.remove("nightly")
 
-
-_PACKAGE_NAME = "sparseml" if not _NIGHTLY else "sparseml-nightly"
-_VERSION = "0.1.0"
-
-
 _deps = [
     "jupyter>=1.0.0",
     "ipywidgets>=7.0.0",
@@ -46,9 +47,7 @@
     "tqdm>=4.0.0",
     "toposort>=1.0",
 ]
-_nm_deps = [
-    f"sparsezoo~={_VERSION}" if not _NIGHTLY else "sparsezoo-nightly",
-]
+_nm_deps = [f"{'sparsezoo-nightly' if _NIGHTLY else 'sparsezoo'}~={_VERSION}"]
 _pytorch_deps = ["torch>=1.1.0", "tensorboard>=1.0", "tensorboardX>=1.0"]
 _pytorch_vision_deps = _pytorch_deps + ["torchvision>=0.3.0"]
 _tensorflow_v1_deps = ["tensorflow<2.0.0", "tensorboard<2.0.0", "tf2onnx>=1.0.0,<1.6"]