Merge branch 'staging' into 'master'

Reinstall convolutional nn

See merge request !51

.gitmodules

@@ -40,15 +40,9 @@
 [submodule "3rdparty/qmmlpack"]
 	path = 3rdparty/qmmlpack
 	url = https://gitlab.com/qmml/qmmlpack.git
-[submodule "tutorials/analytics-tetradymite-PRM2020"]
-	path = tutorials/analytics-tetradymite-PRM2020
-	url = https://gitlab.mpcdf.mpg.de/nomad-lab/analytics-tetradymite-PRM2020.ipynb.git
 [submodule "tutorials/analytics-decision-tree"]
 	path = tutorials/analytics-decision-tree
 	url = https://gitlab.mpcdf.mpg.de/nomad-lab/analytics-decision-tree.git
-[submodule "tutorials/analytics-krr4mat"]
-	path = tutorials/analytics-krr4mat
-	url = https://gitlab.mpcdf.mpg.de/nomad-lab/analytics-krr4mat.git
 [submodule "tutorials/analytics-clustering-tutorial"]
 	path = tutorials/analytics-clustering-tutorial
 	url = https://gitlab.mpcdf.mpg.de/nomad-lab/analytics-clustering-tutorial.git
@@ -61,3 +55,12 @@
 [submodule "tutorials/analytics-nn-regression"]
 	path = tutorials/analytics-nn-regression
 	url = https://gitlab.mpcdf.mpg.de/nomad-lab/analytics-nn-regression.git
+[submodule "tutorials/analytics-tetradymite-PRM2020"]
+	path = tutorials/analytics-tetradymite-PRM2020
+	url = https://gitlab.mpcdf.mpg.de/nomad-lab/analytics-tetradymite-PRM2020.ipynb.git
+[submodule "tutorials/analytics-arise"]
+	path = tutorials/analytics-arise
+	url = https://gitlab.mpcdf.mpg.de/nomad-lab/analytics-arise.git
+[submodule "tutorials/analytics-krr4mat"]
+	path = tutorials/analytics-krr4mat
+	url = https://gitlab.mpcdf.mpg.de/nomad-lab/analytics-krr4mat.git

Dockerfile

@@ -176,7 +176,7 @@ WORKDIR /opt/tutorials
 COPY tutorials/ .
 
 RUN pip install ./analytics-compressed-sensing
-#RUN pip install ./analytics-convolutional-nn \
+RUN pip install ./analytics-convolutional-nn 
 # && pip install 'git+https://github.com/raghakot/keras-vis.git'
 RUN pip install ./analytics-gap-si-surface
 RUN pip install ./analytics-grain-boundaries
@@ -191,9 +191,10 @@ RUN pip install ./analytics-tetradymite-PRM2020
 RUN pip install ./analytics-krr4mat
 RUN pip install ./analytics-decision-tree
 RUN pip install ./analytics-clustering-tutorial
+RUN pip install ./analytics-arise \ 
+&& pip install 'git+https://github.com/AndreasLeitherer/ARISE.git'   
 RUN pip install ./analytics-exploratory-analysis
 
-
 USER root
 
 RUN fix-permissions /opt/tutorials \

analytics-arise @ 1c6a4ecf

+Subproject commit 1c6a4ecfa8853f28ce3aa327b1ddda6d4a4c7f51

analytics-convolutional-nn @ a450ac85

-Subproject commit 927ab87a71ecd5c97fe42c025e3c50f6ca843e14
+Subproject commit a450ac851528823b952b8512bd065ec148526ecc

analytics-query-nomad-archive @ 76186d84

-Subproject commit 7df76575598a6aa5e4895bde81439071138ca19e
+Subproject commit 76186d844ef68098ec38d3d89732cf5ca72eef6c