diff --git a/DJCLosses.py b/DJCLosses.py index 5500d4e..a01bf4f 100644 --- a/DJCLosses.py +++ b/DJCLosses.py @@ -6,6 +6,6 @@ def dummy_loss(truth, pred): #t = tf.Print(truth,[truth],'truth ') #p = tf.Print(pred,[pred],'pred ') - return tf.reduce_mean(truth)+tf.reduce_mean(pred) + return (tf.reduce_mean(truth)-tf.reduce_mean(pred))**2 djc_global_loss_list['dummy_loss']=dummy_loss \ No newline at end of file diff --git a/docker/Dockerfile_base b/docker/Dockerfile_base index 7c966f4..64f33fd 100644 --- a/docker/Dockerfile_base +++ b/docker/Dockerfile_base @@ -64,11 +64,10 @@ RUN pip3 install gpustat setGPU ## torch/jupyter stuff RUN pip3 install future gensim jupyter prompt-toolkit -RUN export CUDA="cu101" && \ - pip3 install torch-scatter==latest+${CUDA} -f https://pytorch-geometric.com/whl/torch-1.4.0.html && \ - pip3 install torch-sparse==latest+${CUDA} -f https://pytorch-geometric.com/whl/torch-1.4.0.html && \ - pip3 install torch-cluster==latest+${CUDA} -f https://pytorch-geometric.com/whl/torch-1.4.0.html && \ - pip3 install torch-spline-conv==latest+${CUDA} -f https://pytorch-geometric.com/whl/torch-1.4.0.html && \ +RUN pip3 install torch-scatter==latest+cu101 -f https://pytorch-geometric.com/whl/torch-1.6.0.html && \ + pip3 install torch-sparse==latest+cu101 -f https://pytorch-geometric.com/whl/torch-1.6.0.html && \ + pip3 install torch-cluster==latest+cu101 -f https://pytorch-geometric.com/whl/torch-1.6.0.html && \ + pip3 install torch-spline-conv==latest+cu101 -f https://pytorch-geometric.com/whl/torch-1.6.0.html && \ pip3 install torch-geometric @@ -78,6 +77,10 @@ EXPOSE 8888 RUN adduser --disabled-password --gecos "" dummyuser RUN apt-get install -y vim +#some tex things +RUN apt install -y texlive ghostscript dvipng + + diff --git a/docker/Dockerfile_exp b/docker/Dockerfile_exp index 9b77e13..b753111 100644 --- a/docker/Dockerfile_exp +++ b/docker/Dockerfile_exp @@ -1,5 +1,5 @@ -FROM cernml4reco/djcbase:py3 +FROM cernml4reco/djcbase:latest @@ -7,7 +7,7 @@ FROM cernml4reco/djcbase:py3 # Tensorflow RUN export DEBIAN_FRONTEND=noninteractive && \ - pip3 --no-cache-dir install tensorflow-gpu==2.2.0 + pip3 --no-cache-dir install tensorflow-gpu==2.3.0 #2.2.0-rc2