From b07a53458e02e7128b8d4181c394ed3a27da1d21 Mon Sep 17 00:00:00 2001 From: Jeff Moe Date: Tue, 16 Aug 2022 19:41:49 -0600 Subject: [PATCH] Update to /srv/satnogs paths, open with latest jupyter --- notebooks/wut-predict.ipynb | 14 ++++- notebooks/wut-train.ipynb | 12 ++-- notebooks/wut-web-alpha.ipynb | 2 +- notebooks/wut-web-beta.ipynb | 2 +- notebooks/wut-web.ipynb | 2 +- notebooks/wut.ipynb | 100 +++++++++++++++++++++++----------- 6 files changed, 89 insertions(+), 43 deletions(-) diff --git a/notebooks/wut-predict.ipynb b/notebooks/wut-predict.ipynb index d2a8eab..70e65c2 100644 --- a/notebooks/wut-predict.ipynb +++ b/notebooks/wut-predict.ipynb @@ -149,7 +149,8 @@ "metadata": {}, "outputs": [], "source": [ - "model = load_model('data/models/wut-DUV.tf')" + "#model = load_model('data/models/wut-DUV.tf')\n", + "model = load_model('/srv/satnogs/data/models/CW/wut-CW.h5')" ] }, { @@ -158,7 +159,7 @@ "metadata": {}, "outputs": [], "source": [ - "test_dir = os.path.join('data/', 'test')" + "test_dir = os.path.join('/srv/satnogs/data/', 'test')" ] }, { @@ -363,6 +364,13 @@ "source": [ "# The End" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { @@ -381,7 +389,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.4" + "version": "3.10.6" } }, "nbformat": 4, diff --git a/notebooks/wut-train.ipynb b/notebooks/wut-train.ipynb index 739f460..61270d3 100644 --- a/notebooks/wut-train.ipynb +++ b/notebooks/wut-train.ipynb @@ -89,7 +89,7 @@ "metadata": {}, "outputs": [], "source": [ - "ENCODING='GMSK'\n", + "ENCODING='FM'\n", "batch_size = 64\n", "epochs = 4\n", "# Failing with this now:\n", @@ -445,7 +445,7 @@ "metadata": {}, "outputs": [], "source": [ - "model.save('/srv/satnogs/data/models/GMSK/wut-GMSK-202205.h5')" + "model.save('/srv/satnogs/data/models/FM/wut-FM.h5')" ] }, { @@ -454,7 +454,7 @@ "metadata": {}, "outputs": [], "source": [ - "model.save('/srv/satnogs/data/models/GMSK/wut-GMSK-202205.tf')" + "model.save('/srv/satnogs/data/models/FM/wut-FM.tf')" ] }, { @@ -463,7 +463,7 @@ "metadata": {}, "outputs": [], "source": [ - "plot_model(model, show_shapes=True, show_layer_names=True, expand_nested=True, dpi=72, to_file='/srv/satnogs/data/models/GMSK/plot_model.png')" + "#plot_model(model, show_shapes=True, show_layer_names=True, expand_nested=True, dpi=72, to_file='/srv/satnogs/data/models/FM/plot_model.png')" ] }, { @@ -472,7 +472,7 @@ "metadata": {}, "outputs": [], "source": [ - "SVG(model_to_dot(model).create(prog='dot', format='svg'))" + "#SVG(model_to_dot(model).create(prog='dot', format='svg'))" ] } ], @@ -492,7 +492,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.4" + "version": "3.10.6" } }, "nbformat": 4, diff --git a/notebooks/wut-web-alpha.ipynb b/notebooks/wut-web-alpha.ipynb index d7c069d..8f17b73 100644 --- a/notebooks/wut-web-alpha.ipynb +++ b/notebooks/wut-web-alpha.ipynb @@ -380,7 +380,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.4" + "version": "3.10.6" } }, "nbformat": 4, diff --git a/notebooks/wut-web-beta.ipynb b/notebooks/wut-web-beta.ipynb index 6aaa16d..e0156d3 100644 --- a/notebooks/wut-web-beta.ipynb +++ b/notebooks/wut-web-beta.ipynb @@ -336,7 +336,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.4" + "version": "3.10.6" } }, "nbformat": 4, diff --git a/notebooks/wut-web.ipynb b/notebooks/wut-web.ipynb index f68e147..28f7427 100644 --- a/notebooks/wut-web.ipynb +++ b/notebooks/wut-web.ipynb @@ -216,7 +216,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.4" + "version": "3.10.6" } }, "nbformat": 4, diff --git a/notebooks/wut.ipynb b/notebooks/wut.ipynb index abee6f8..29d7efa 100644 --- a/notebooks/wut.ipynb +++ b/notebooks/wut.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ @@ -13,7 +13,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ @@ -22,7 +22,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "metadata": {}, "outputs": [], "source": [ @@ -31,7 +31,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 4, "metadata": {}, "outputs": [], "source": [ @@ -47,16 +47,24 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 5, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Start\n" + ] + } + ], "source": [ "print(\"Start\")" ] }, { "cell_type": "code", - "execution_count": null, + "execution_count": 6, "metadata": {}, "outputs": [], "source": [ @@ -65,7 +73,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 7, "metadata": {}, "outputs": [], "source": [ @@ -74,7 +82,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 8, "metadata": {}, "outputs": [], "source": [ @@ -83,7 +91,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 9, "metadata": {}, "outputs": [], "source": [ @@ -108,7 +116,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 10, "metadata": {}, "outputs": [], "source": [ @@ -121,7 +129,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 11, "metadata": {}, "outputs": [], "source": [ @@ -131,7 +139,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 12, "metadata": {}, "outputs": [], "source": [ @@ -144,7 +152,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 13, "metadata": {}, "outputs": [], "source": [ @@ -154,27 +162,35 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 14, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Python import done\n" + ] + } + ], "source": [ "print(\"Python import done\")" ] }, { "cell_type": "code", - "execution_count": null, + "execution_count": 19, "metadata": {}, "outputs": [], "source": [ - "train_dir = os.path.join('data/', 'train')\n", - "val_dir = os.path.join('data/', 'val')\n", - "test_dir = os.path.join('data/', 'test')" + "train_dir = os.path.join('/srv/satnogs/data/', 'train')\n", + "val_dir = os.path.join('/srv/satnogs/data/', 'val')\n", + "test_dir = os.path.join('/srv/satnogs/data/', 'test')" ] }, { "cell_type": "code", - "execution_count": null, + "execution_count": 20, "metadata": {}, "outputs": [], "source": [ @@ -184,7 +200,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 21, "metadata": {}, "outputs": [], "source": [ @@ -194,7 +210,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 22, "metadata": {}, "outputs": [], "source": [ @@ -204,7 +220,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 23, "metadata": {}, "outputs": [], "source": [ @@ -214,7 +230,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 24, "metadata": {}, "outputs": [], "source": [ @@ -223,7 +239,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 25, "metadata": {}, "outputs": [], "source": [ @@ -233,9 +249,20 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 26, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "total training good images: 16739\n", + "total training bad images: 3961\n", + "--\n", + "Total training images: 20700\n" + ] + } + ], "source": [ "print('total training good images:', num_train_good)\n", "print('total training bad images:', num_train_bad)\n", @@ -245,9 +272,20 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 27, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "total validation good images: 16716\n", + "total validation bad images: 3934\n", + "--\n", + "Total validation images: 20650\n" + ] + } + ], "source": [ "print('total validation good images:', num_val_good)\n", "print('total validation bad images:', num_val_bad)\n", @@ -755,7 +793,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.4" + "version": "3.10.6" } }, "nbformat": 4,