python3 migration, will tag as 3.0

DL4Jets · Mar 28, 2020 · 21daf26 · 21daf26
1 parent 1e60b43
commit 21daf26
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 244 deletions.
diff --git a/docker/Dockerfile_base b/docker/Dockerfile_base
@@ -63,6 +63,13 @@ RUN pip3 install opencv-python easydict tqdm Cython numba
 RUN pip3 install gpustat setGPU
 
 ## torch/jupyter stuff 
-RUN pip3 install torch future gensim jupyter prompt-toolkit 
+RUN pip3 install torch future gensim jupyter prompt-toolkit torch_geometric
 EXPOSE 8888
 
+#for singularity panic
+RUN adduser  --disabled-password --gecos ""  dummyuser
+
+
+
+
+
diff --git a/environment/activateROOT.sh b/environment/activateROOT.sh
diff --git a/environment/djcenv.conda b/environment/djcenv.conda
diff --git a/environment/djcenv.pip b/environment/djcenv.pip
diff --git a/environment/djcenv_gpu.pip b/environment/djcenv_gpu.pip
diff --git a/environment/setup_djcenv.sh b/environment/setup_djcenv.sh
diff --git a/modeltools.py b/modeltools.py
@@ -1,31 +1,6 @@
-import imp
-try:
-    imp.find_module('Losses')
-    from Losses import *
-except ImportError:
-    print 'No Losses module found, ignoring at your own risk'
-    global_loss_list = {}
-
-try:
-    imp.find_module('Layers')
-    from Layers import *
-except ImportError:
-    print 'No Layers module found, ignoring at your own risk'
-    global_layers_list = {}
-
-try:
-    imp.find_module('Metrics')
-    from Metrics import *
-except ImportError:
-    print 'No metrics module found, ignoring at your own risk'
-    global_metrics_list = {}
-
-
-
-custom_objs = {}
-custom_objs.update(global_loss_list)
-custom_objs.update(global_layers_list)
-custom_objs.update(global_metrics_list)
+from DeepJetCore.customObjects import *
+
+custom_objs = get_custom_objects()
 
 
 def getLayer(model, name):
@@ -35,7 +10,6 @@ def getLayer(model, name):
 
 
 
-
 def printLayerInfosAndWeights(model, noweights=False):
     for layer in model.layers:
         g=layer.get_config()