Merge branch 'release/1.9.8'

Author: Alex

README.md

@@ -76,11 +76,15 @@ For most of these URL endings, you will probably also find networks in the offic
 
 If you find this code useful please consider citing us:
 
-    @article{bauerle2019net2vis,
-      title={Net2Vis: Transforming Deep Convolutional Networks into Publication-Ready Visualizations},
-      author={B{\"a}uerle, Alex and Ropinski, Timo},
-      journal={arXiv preprint arXiv:1902.04394},
-      year={2019}
+    @article{bauerle2021net2vis,
+      title={Net2vis--a visual grammar for automatically generating publication-tailored cnn architecture visualizations},
+      author={B{\"a}uerle, Alex and Van Onzenoodt, Christian and Ropinski, Timo},
+      journal={IEEE transactions on visualization and computer graphics},
+      volume={27},
+      number={6},
+      pages={2980--2991},
+      year={2021},
+      publisher={IEEE}
     }
 
 ## Acknowlegements

backend/requirements.txt

@@ -20,9 +20,6 @@ gast==0.4.0
 google-auth==1.28.0
 google-auth-oauthlib==0.4.3
 google-pasta==0.2.0
-grpcio==1.36.1
-h5py==3.2.1
-idna==3.1
 importlib-metadata==3.7.3
 isort==5.8.0
 itsdangerous==1.1.0
@@ -33,7 +30,6 @@ lazy-object-proxy==1.5.2
 Markdown==3.3.4
 MarkupSafe==1.1.1
 mccabe==0.6.1
-numpy==1.20.1
 oauthlib==3.1.0
 opt-einsum==3.3.0
 Pillow>=8.2.0
@@ -49,10 +45,7 @@ rsa==4.7.2
 scipy==1.6.1
 six==1.15.0
 structlog==21.1.0
-tensorboard==2.4.1
-tensorboard-plugin-wit==1.8.0
 tensorflow==2.5.1
-tensorflow-estimator==2.4.0
 termcolor==1.1.0
 tinycss2==1.1.0
 toml==0.10.2
@@ -65,4 +58,4 @@ websocket-client==0.58.0
 Werkzeug==1.0.1
 wrapt==1.12.1
 zipp==3.4.1
-onnx==1.10.1
+onnx==1.10.1

backend/server.py

@@ -235,8 +235,7 @@ def upload_model(identifier):
     file_ext = os.path.splitext(filename)[1]
     if file_ext not in app.config['UPLOAD_EXTENSIONS']:
         return "", error_status, text_type
-    file_path = os.path.join(
-        app.config['UPLOAD_PATH'], identifier, f'model{file_ext}')
+    file_path = os.path.join(app.config['UPLOAD_PATH'], identifier, f'model{file_ext}')
     uploaded_file.save(file_path)
     return "No code loaded since model file is present.", ok_status, text_type
 

net2vis/src/components/controls/ControlsComponent.js

@@ -175,7 +175,7 @@ class Controls extends React.Component {
                 <DialogContent>
                   <DialogContentText id="alert-dialog-description">
                     This is a research project. When using these visualizations,
-                    please <a href="https://ieeexplore.ieee.org/abstract/document/9350177">cite us</a>.
+                    please <a href="https://ieeexplore.ieee.org/abstract/document/9350177" target="_blank">cite us</a>.
                   </DialogContentText>
                 </DialogContent>
                 <DialogActions>