[fix rebase] adjust code on top of new tensor descriptor (#670)

[fix rebase] adjust code on top of new tensor descriptor (#670) #1435