Fixed reshaping bugs in DiagonalOperator and FFTSmoothingOperator

nifty/operators/diagonal_operator/diagonal_operator.py

@@ -286,7 +286,7 @@ class DiagonalOperator(EndomorphicOperator):
                 distribution_strategy=axes_local_distribution_strategy)
             local_diagonal = redistr_diagonal_val.get_local_data(copy=False)
 
-        reshaper = [x.shape[i] if i in active_axes else 1
+        reshaper = [x.val.data.shape[i] if i in active_axes else 1
                     for i in xrange(len(x.shape))]
         reshaped_local_diagonal = np.reshape(local_diagonal, reshaper)
 

nifty/operators/smoothing_operator/fft_smoothing_operator.py

@@ -46,7 +46,7 @@ class FFTSmoothingOperator(SmoothingOperator):
         local_transformed_x = transformed_x.val.get_local_data(copy=False)
         local_kernel = kernel.get_local_data(copy=False)
 
-        reshaper = [transformed_x.shape[i] if i in coaxes else 1
+        reshaper = [local_transformed_x.shape[i] if i in coaxes else 1
                     for i in xrange(len(transformed_x.shape))]
         local_kernel = np.reshape(local_kernel, reshaper)