Raise the per-tensor norms to norm_type when combining them

Raise the per-tensor norms to norm_type when combining them #3772