Remove Tensorflow

utils.py

 
 
 
-
 #-*- coding: utf-8 -*-
 #
 # This file is part of DnCnn4Holo.
@@ -37,7 +36,6 @@ import sys
 import re
 import pathlib
 import numpy as np
-import tensorflow as tf
 from PIL import Image
 from scipy.io import loadmat, savemat
 from glob import glob
@@ -593,20 +591,6 @@ def cal_std_phase(im1, im2):
     return dev
 
 
-<<<<<<< HEAD
-def tf_psnr(im1, im2):
-    '''
-    this function is deprecated
-    '''
-    # assert pixel value range is 0-1
-    #mse = tf.losses.mean_squared_error(labels=im2 * 255.0, predictions=im1 * 255.0)
-    mse = tf.losses.mean_squared_error(labels=im2, predictions=im1)
-    return 10.0 * (tf.log(1 / mse) / tf.log(10.0))
-
-
-=======
->>>>>>> cfbb377a755bc7b5e2b9ead857e01e5576ec3f67
-
 
 
 class NNRegressor(nt.NeuralNetwork):