Sync "https://github.com/jakeret/tf_unet/pull/202" with master and resolve conflicts#276

Open

ashahba wants to merge 4 commits intojakeret:masterfrom ashahba:ashahba/unet-hotfix

+20-18

Commits on Jul 30, 2018

fix dropout = 1.0 issue. If dropout = 1.0, it should not run dropout layer
Peng Meng
committed

Commits on Aug 2, 2018

add inter and intra param
Peng Meng
committed

Commits on Jan 24, 2019

fix keep_prob type
Peng Meng
committed

Commits on Jul 9, 2019

Sync with jakeret/tf_unet and resolve conflicts
ashahba
committed