Merge ../libgpiv-omp into fft-omp