From a8bd607ad5558d3e346bf661c8997d546cc3700e Mon Sep 17 00:00:00 2001 From: Tuan Nguyen Date: Wed, 31 Mar 2021 15:40:33 -0400 Subject: [PATCH 1/3] Add batch dim for TF 2.1 --- notebooks/keras_classification.ipynb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/notebooks/keras_classification.ipynb b/notebooks/keras_classification.ipynb index f43f7427e73..5e0432e19fd 100644 --- a/notebooks/keras_classification.ipynb +++ b/notebooks/keras_classification.ipynb @@ -24,7 +24,7 @@ "## Step 1 - Requirements\n", "To run this notebook, you will need the following packages already installed:\n", "* SparseML and SparseZoo;\n", - "* Tensorflow >=2.2, which includes Keras and TensorBoard;\n", + "* Tensorflow >=2.1, which includes Keras and TensorBoard;\n", "* keras2onnx.\n", "\n", "You can install any package that is not already present via `pip`." @@ -122,6 +122,8 @@ "metadata": {}, "outputs": [], "source": [ + "import numpy as np\n", + "\n", "# Number of classes\n", "num_classes = 10\n", "\n", @@ -132,6 +134,10 @@ "x_train = x_train.astype('float32') / 255\n", "x_test = x_test.astype('float32') / 255\n", "\n", + "# Add batch dimension (for older TF versions)\n", + "x_train = np.expand_dims(x_train, -1)\n", + "x_test = np.expand_dims(x_test, -1)\n", + "\n", "y_train = keras.utils.to_categorical(y_train, num_classes)\n", "y_test = keras.utils.to_categorical(y_test, num_classes)\n", "\n", @@ -418,9 +424,9 @@ ], "metadata": { "kernelspec": { - "display_name": "Python (pypi_sparseml)", + "display_name": "Python (keras_pruning)", "language": "python", - "name": "pypi_sparseml" + "name": "keras_pruning" }, "language_info": { "codemirror_mode": { From 13c3dcf13a591a862ba7a23039141f9bf1a3a245 Mon Sep 17 00:00:00 2001 From: Tuan Nguyen Date: Wed, 31 Mar 2021 15:46:23 -0400 Subject: [PATCH 2/3] Clean up --- notebooks/keras_classification.ipynb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/notebooks/keras_classification.ipynb b/notebooks/keras_classification.ipynb index 5e0432e19fd..8fcf990cb9a 100644 --- a/notebooks/keras_classification.ipynb +++ b/notebooks/keras_classification.ipynb @@ -122,7 +122,7 @@ "metadata": {}, "outputs": [], "source": [ - "import numpy as np\n", + "import numpy\n", "\n", "# Number of classes\n", "num_classes = 10\n", @@ -135,8 +135,8 @@ "x_test = x_test.astype('float32') / 255\n", "\n", "# Add batch dimension (for older TF versions)\n", - "x_train = np.expand_dims(x_train, -1)\n", - "x_test = np.expand_dims(x_test, -1)\n", + "x_train = numpy.expand_dims(x_train, -1)\n", + "x_test = numpy.expand_dims(x_test, -1)\n", "\n", "y_train = keras.utils.to_categorical(y_train, num_classes)\n", "y_test = keras.utils.to_categorical(y_test, num_classes)\n", From c3b462ef5a947bbcc9ad4bc4ea62ad48f11c5ba0 Mon Sep 17 00:00:00 2001 From: Tuan Nguyen Date: Wed, 31 Mar 2021 15:59:24 -0400 Subject: [PATCH 3/3] Enable native keras support for notebook --- notebooks/keras_classification.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebooks/keras_classification.ipynb b/notebooks/keras_classification.ipynb index 8fcf990cb9a..2bd18093176 100644 --- a/notebooks/keras_classification.ipynb +++ b/notebooks/keras_classification.ipynb @@ -60,7 +60,7 @@ "outputs": [], "source": [ "import os\n", - "from tensorflow import keras\n", + "from sparseml.keras.utils import keras\n", "from sparsezoo.models import Zoo\n", "\n", "# Root directory for the notebook artifacts\n",