Skip to content

Commit 21daf26

Browse files
committed
python3 migration, will tag as 3.0
1 parent 1e60b43 commit 21daf26

7 files changed

Lines changed: 11 additions & 244 deletions

File tree

docker/Dockerfile_base

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@ RUN pip3 install opencv-python easydict tqdm Cython numba
6363
RUN pip3 install gpustat setGPU
6464

6565
## torch/jupyter stuff
66-
RUN pip3 install torch future gensim jupyter prompt-toolkit
66+
RUN pip3 install torch future gensim jupyter prompt-toolkit torch_geometric
6767
EXPOSE 8888
6868

69+
#for singularity panic
70+
RUN adduser --disabled-password --gecos "" dummyuser
71+
72+
73+
74+
75+

environment/activateROOT.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

environment/djcenv.conda

Lines changed: 0 additions & 59 deletions
This file was deleted.

environment/djcenv.pip

Lines changed: 0 additions & 42 deletions
This file was deleted.

environment/djcenv_gpu.pip

Lines changed: 0 additions & 42 deletions
This file was deleted.

environment/setup_djcenv.sh

Lines changed: 0 additions & 48 deletions
This file was deleted.

modeltools.py

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,6 @@
1-
import imp
2-
try:
3-
imp.find_module('Losses')
4-
from Losses import *
5-
except ImportError:
6-
print 'No Losses module found, ignoring at your own risk'
7-
global_loss_list = {}
8-
9-
try:
10-
imp.find_module('Layers')
11-
from Layers import *
12-
except ImportError:
13-
print 'No Layers module found, ignoring at your own risk'
14-
global_layers_list = {}
15-
16-
try:
17-
imp.find_module('Metrics')
18-
from Metrics import *
19-
except ImportError:
20-
print 'No metrics module found, ignoring at your own risk'
21-
global_metrics_list = {}
22-
23-
24-
25-
custom_objs = {}
26-
custom_objs.update(global_loss_list)
27-
custom_objs.update(global_layers_list)
28-
custom_objs.update(global_metrics_list)
1+
from DeepJetCore.customObjects import *
2+
3+
custom_objs = get_custom_objects()
294

305

316
def getLayer(model, name):
@@ -35,7 +10,6 @@ def getLayer(model, name):
3510

3611

3712

38-
3913
def printLayerInfosAndWeights(model, noweights=False):
4014
for layer in model.layers:
4115
g=layer.get_config()

0 commit comments

Comments
 (0)