new dev

Author: jkiesele

DJCLayers.py

@@ -187,7 +187,7 @@ def __init__(self,
         super(LayerWithMetrics, self).__init__(**kwargs)
         self.record_metrics = record_metrics
         #transparent pass-through
-        from wandb_interface import wandb_wrapper
+        from .wandb_interface import wandb_wrapper
         self.wandb = wandb_wrapper
 
     def get_config(self):
@@ -196,7 +196,7 @@ def get_config(self):
         return dict(list(base_config.items()) + list(config.items())) 
 
     def add_prompt_metric(self, x, name):
-        print(self.name,"uses add_prompt_metric. This function is deprecated, please use wandb_log (pass through to wandb.log).")
+        print(self.name,"uses add_prompt_metric. This function is deprecated, please change your code to use LayerWithMetrics.wandb_log instead (pass through to wandb.log(dict of name: value)).")
         self.wandb_log({name: x})
 
     def wandb_log(self,*args, **kwargs):

docker/Dockerfile

@@ -26,21 +26,25 @@ RUN pip3 install numpy scikit-learn scikit-image \
 
 RUN pip3 install bayesian-optimization mgzip pyyaml wandb hdbscan
 
-#strict dependency
-RUN pip3 install git+https://github.com/jkiesele/djcdata 
 
 # 2.15 has a custom kernel compilation bug that is not being fixed before a patch or something, 2.14 cuda issues...
 RUN export DEBIAN_FRONTEND=noninteractive && \
     pip3 --no-cache-dir install tensorflow==2.13 
 
 
-ARG LALA
+ARG LALALALAALALAL1
+
+#strict dependency
+RUN python3 -m pip install git+https://github.com/jkiesele/djcdata 
+
+ARG LALALALA
 
 ## DEV configuration
 RUN mkdir -p /usr/share/DJC/
 ADD DeepJetCore /usr/share/DJC/DeepJetCore
 ENV DEEPJETCORE /usr/share/DJC/DeepJetCore
 ENV PYTHONPATH="/usr/share/DJC/DeepJetCore/../:${PYTHONPATH}"
+ENV PATH="/usr/share/DJC/DeepJetCore/bin:${PATH}"
 
 
 ADD dotest.sh /dotest.sh

modeltools.py

@@ -1,8 +1,8 @@
-from DeepJetCore.customObjects import *
+from .customObjects import *
 
 custom_objs = get_custom_objects()
 
-    
+
 def getLayer(model, name):
     for layer in model.layers:
         if layer.name == name: