completed the preprocessor merge
completed the preprocessor merge


Former-commit-id: 61b12e38b35d5549e35c3f6c206fa3c0cca342c1
lstorchi/pca_fit,lstorchi/pca_fit,lstorchi/pca_fit,lstorchi/pca_fit,lstorchi/pca_fit