From 76afbd08e1afde20a2ce1743106e540e89d007a2 Mon Sep 17 00:00:00 2001
From: ControlNet <smczx@hotmail.com>
Date: Sun, 31 Oct 2021 05:32:22 +1100
Subject: [PATCH 1/5] add palette

---
 requirements.txt                              |  1 +
 src/tensorneko/visualization/color.py         | 24 +++++++++++++++++++
 src/tensorneko/visualization/seaborn.py       | 12 ++++++++++
 .../visualization/watcher/server.py           |  4 ++--
 src/tensorneko/visualization/watcher/view.py  |  5 +++-
 .../visualization/watcher/web/src/App.vue     |  7 ++++--
 .../visualization/watcher/web/src/main.ts     | 10 --------
 7 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 src/tensorneko/visualization/color.py

diff --git a/requirements.txt b/requirements.txt
index 8dd96d1..4d84a65 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,3 +13,4 @@ clean-fid >= 0.1.12, < 0.1.14
 pandas >= 1.3.1
 ipython >= 7.26.0
 pygments >= 2.9.0
+pysoundfile >= 0.9.0
diff --git a/src/tensorneko/visualization/color.py b/src/tensorneko/visualization/color.py
new file mode 100644
index 0000000..4c8a632
--- /dev/null
+++ b/src/tensorneko/visualization/color.py
@@ -0,0 +1,24 @@
+from enum import Enum
+
+
+class Colors(Enum):
+    GREEN = "#C3E88D"
+    YELLOW = "#FFCB6B"
+    RED = "#F07178"
+    BLUE = "#82AAFF"
+    PURPLE = "#C792EA"
+    ORANGE = "#F78C6C"
+    AZURE = "#467CDA"
+    SKY = "#89DDFF"
+    BLACK = "#2B2B2B"
+    GRAY = "#616161"
+    WHITE = "#EEFFFF"
+    BLANK = "#FFFFFF"
+
+
+class ContinuousColors(Enum):
+    RED = "#d11141",
+    YELLOW = "#ffc425",
+    GREEN = "#00b159",
+    BLACK = "#2B2B2B",
+    WHITE = "#EEFFFF"
diff --git a/src/tensorneko/visualization/seaborn.py b/src/tensorneko/visualization/seaborn.py
index edaab05..60ae6b1 100644
--- a/src/tensorneko/visualization/seaborn.py
+++ b/src/tensorneko/visualization/seaborn.py
@@ -1,4 +1,16 @@
 import seaborn as sns
 
+from .color import Colors
+
+palette = sns.color_palette([
+    Colors.BLUE.value,
+    Colors.ORANGE.value,
+    Colors.GREEN.value,
+    Colors.RED.value,
+    Colors.PURPLE.value,
+    Colors.AZURE.value,
+    Colors.GRAY.value,
+    Colors.YELLOW.value
+])
 
 barplot = sns.barplot
diff --git a/src/tensorneko/visualization/watcher/server.py b/src/tensorneko/visualization/watcher/server.py
index a026d21..27dbabe 100644
--- a/src/tensorneko/visualization/watcher/server.py
+++ b/src/tensorneko/visualization/watcher/server.py
@@ -108,12 +108,12 @@ def _run(self) -> None:
             stdout=subprocess.DEVNULL,
             stderr=subprocess.STDOUT
         )
-        print(f"Server started at port {self.port}, view \"{self.view_name}\".")
+        print(f"Server started at http://127.0.0.1:{self.port}/, view \"{self.view_name}\".")
 
     def _run_blocking(self):
         self.process = subprocess.run(["python", "-m", "http.server", "--directory",
             os.path.join("watcher", self.view_name), str(self.port)])
-        print(f"Server started at port {self.port}, view \"{self.view_name}\".")
+        print(f"Server started at http://127.0.0.1:{self.port}/, view \"{self.view_name}\".")
 
     def stop(self) -> None:
         """
diff --git a/src/tensorneko/visualization/watcher/view.py b/src/tensorneko/visualization/watcher/view.py
index c03d2ae..f6cb72e 100644
--- a/src/tensorneko/visualization/watcher/view.py
+++ b/src/tensorneko/visualization/watcher/view.py
@@ -51,7 +51,10 @@ def _to_json(self) -> None:
             os.mkdir(view_path)
 
         write.text.to_json(os.path.join("watcher", self.name, "data.json"),
-            list(map(lambda comp: comp.to_dict(), self.components))
+            {
+                "view": self.name,
+                "data": list(map(lambda comp: comp.to_dict(), self.components))
+            }
         )
 
     def add(self, *components: Component) -> View:
diff --git a/src/tensorneko/visualization/watcher/web/src/App.vue b/src/tensorneko/visualization/watcher/web/src/App.vue
index 4520b0b..e9aa135 100644
--- a/src/tensorneko/visualization/watcher/web/src/App.vue
+++ b/src/tensorneko/visualization/watcher/web/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <h2 class="display-2">Tensorneko Web Watcher</h2>
+  <h2 class="display-2">Tensorneko Web Watcher::{{view}}</h2>
   <div class="row mb-3">
     <label class="col-sm-2 col-form-label" style="width: 200px">Update Rate (ms)</label>
     <div class="col-sm-10" style="width: 200px;"><input type="number" class="form-control" placeholder="1000"
@@ -40,6 +40,7 @@ export default class App extends Vue {
   readonly logs = logs
   readonly lineCharts = lineCharts
   updateDuration = 5000
+  view: string = null
 
   $refs!: {
     progressbar: ProgressBarTable,
@@ -65,7 +66,9 @@ export default class App extends Vue {
             }
           }
 
-          json.forEach((d: ComponentData) => {
+          this.view = json.view;
+
+          json.data.forEach((d: ComponentData) => {
             if (d.type === "Variable") {
               updateArray(d, this.variables);
             } else if (d.type === "ProgressBar") {
diff --git a/src/tensorneko/visualization/watcher/web/src/main.ts b/src/tensorneko/visualization/watcher/web/src/main.ts
index 4bdcc2b..de43d3b 100644
--- a/src/tensorneko/visualization/watcher/web/src/main.ts
+++ b/src/tensorneko/visualization/watcher/web/src/main.ts
@@ -2,20 +2,10 @@ import { createApp } from 'vue'
 import BootstrapVue3 from "bootstrap-vue-3";
 import App from './App.vue'
 import { App as AppRuntime } from "vue"
-import { ComponentData, ProgressBarData, progressbars, VariableData, variables } from "@/data";
 import "../node_modules/bootstrap/dist/css/bootstrap.min.css";
 
 
 async function initApp(): Promise<AppRuntime<Element>> {
-    const response = await fetch(`data.json`);
-    const json = await response.json().catch(() => []);
-    json.forEach((d: ComponentData) => {
-        if (d.type === "Variable") {
-            variables[d.name] = d as VariableData;
-        } else if (d.type === "ProgressBar") {
-            progressbars[d.name] = d as ProgressBarData;
-        }
-    })
     return createApp(App)
 }
 

From ff5582084799affab5e5c238086ac3d8a76a1ee6 Mon Sep 17 00:00:00 2001
From: ControlNet <smczx@hotmail.com>
Date: Fri, 5 Nov 2021 14:40:05 +1100
Subject: [PATCH 2/5] add fast implementation for `resize_video`

---
 requirements.txt                  |  2 +-
 src/tensorneko/preprocess/func.py | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4d84a65..b974ae2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,4 +13,4 @@ clean-fid >= 0.1.12, < 0.1.14
 pandas >= 1.3.1
 ipython >= 7.26.0
 pygments >= 2.9.0
-pysoundfile >= 0.9.0
+pysoundfile >= 0.9.0; platform_system == "Windows"
diff --git a/src/tensorneko/preprocess/func.py b/src/tensorneko/preprocess/func.py
index 1062fc5..359bc02 100644
--- a/src/tensorneko/preprocess/func.py
+++ b/src/tensorneko/preprocess/func.py
@@ -71,7 +71,8 @@ def resize_image(tensor: Tensor, size: Tuple[int, int], resize_method: Union[Res
     return f(tensor)
 
 
-def resize_video(tensor: Tensor, size: Tuple[int, int], resize_method: Union[ResizeMethod, str] = ResizeMethod.BICUBIC
+def resize_video(tensor: Tensor, size: Tuple[int, int], resize_method: Union[ResizeMethod, str] = ResizeMethod.BICUBIC,
+    fast = False
 ) -> Tensor:
     """
     Resizing a video to determined size.
@@ -80,17 +81,21 @@ def resize_video(tensor: Tensor, size: Tuple[int, int], resize_method: Union[Res
         tensor (:class:`~torch.Tensor`): Video tensor (T, C, H, W)
         size ((``int``, ``int``)): Target size (H, W)
         resize_method (:class:`ResizeMethod`, optional): Resize method. Default bicubic.
+        fast (bool, optional): If True, use fast mode (pytorch F.interpolate). Default False.
 
     Returns:
         :class:`~torch.Tensor`: The resized video.
     """
-    resize_method = _get_enum_value(resize_method, ResizeMethod)
-    image_resizer = F(resize_image, size=size, resize_method=resize_method) \
-                    >> F(rearrange, pattern="c h w -> 1 c h w")
-    f = F(map, image_resizer) \
-        >> list \
-        >> torch.vstack
-    return f(tensor)
+    if not fast:
+        resize_method = _get_enum_value(resize_method, ResizeMethod)
+        image_resizer = F(resize_image, size=size, resize_method=resize_method) \
+                        >> F(rearrange, pattern="c h w -> 1 c h w")
+        f = F(map, image_resizer) \
+            >> list \
+            >> torch.vstack
+        return f(tensor)
+    else:
+        return func.interpolate(tensor, size, mode=_get_enum_value(resize_method, ResizeMethod), align_corners=False)
 
 
 def _get_padding_pair(padding_size: int, padding_position: Union[PaddingPosition, str]) -> List[int]:

From e0705b778eb6ca09ea06eb66dc60348b1048f34d Mon Sep 17 00:00:00 2001
From: ControlNet <smczx@hotmail.com>
Date: Fri, 5 Nov 2021 14:40:30 +1100
Subject: [PATCH 3/5] fix line breaks in LineChart tooltips

---
 .../watcher/web/src/components/plot/LineChartCard.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tensorneko/visualization/watcher/web/src/components/plot/LineChartCard.vue b/src/tensorneko/visualization/watcher/web/src/components/plot/LineChartCard.vue
index 56700bf..130a0d1 100644
--- a/src/tensorneko/visualization/watcher/web/src/components/plot/LineChartCard.vue
+++ b/src/tensorneko/visualization/watcher/web/src/components/plot/LineChartCard.vue
@@ -74,7 +74,7 @@ export default class LineChartCard extends Vue {
         type: "line"
       },
       formatter: (params: CallbackDataParams) => {
-        return `${this.xLabel}: ${Math.round(params[0].data[0] * 10000) / 10000}\n` +
+        return `${this.xLabel}: ${Math.round(params[0].data[0] * 10000) / 10000}<br/>` +
             `${this.yLabel}: ${Math.round(params[0].data[1] * 10000) / 10000}`
       }
     };

From a80f1e7d66cc2c8700a4e4e486be4be8e3a62789 Mon Sep 17 00:00:00 2001
From: ControlNet <smczx@hotmail.com>
Date: Sat, 6 Nov 2021 08:42:34 +1100
Subject: [PATCH 4/5] fix import for pytorch_lightning 1.5.0

---
 src/tensorneko/neko_trainer.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/tensorneko/neko_trainer.py b/src/tensorneko/neko_trainer.py
index c0527f1..4aa581f 100644
--- a/src/tensorneko/neko_trainer.py
+++ b/src/tensorneko/neko_trainer.py
@@ -12,7 +12,11 @@
 from pytorch_lightning.accelerators import Accelerator
 from pytorch_lightning.callbacks import ModelCheckpoint
 from pytorch_lightning.loggers import TensorBoardLogger
-from pytorch_lightning.plugins import Plugin
+try:
+    from pytorch_lightning.plugins import Plugin  # for pytorch_lightning < 1.5.x
+except ImportError:
+    from pytorch_lightning.plugins import PLUGIN as Plugin  # for pytorch_lightning >= 1.5.x
+
 from pytorch_lightning.plugins.environments import ClusterEnvironment
 from pytorch_lightning.profiler import BaseProfiler
 

From 574de3a506899b604f62e57131a76a7b31ca4848 Mon Sep 17 00:00:00 2001
From: ControlNet <smczx@hotmail.com>
Date: Sat, 6 Nov 2021 08:44:52 +1100
Subject: [PATCH 5/5] update version

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index 6cd3286..915812e 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.1.21
\ No newline at end of file
+0.1.22
\ No newline at end of file