Add check for FFT_FFTW_THREADS and turn off MKL threads for now (76aaf16c) · Commits · 郑智淋 / lammps

src/KOKKOS/fft3d_kokkos.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -607,7 +607,7 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
		DftiSetValue(plan->handle_fast, DFTI_PLACEMENT,DFTI_INPLACE);
		DftiSetValue(plan->handle_fast, DFTI_INPUT_DISTANCE, (MKL_LONG)nfast);
		DftiSetValue(plan->handle_fast, DFTI_OUTPUT_DISTANCE, (MKL_LONG)nfast);
		DftiSetValue(plan->handle_fast, DFTI_NUMBER_OF_USER_THREADS, nthreads);
		//DftiSetValue(plan->handle_fast, DFTI_NUMBER_OF_USER_THREADS, nthreads);
		DftiCommitDescriptor(plan->handle_fast);

		DftiCreateDescriptor( &(plan->handle_mid), FFT_MKL_PREC, DFTI_COMPLEX, 1,
		@@ -617,7 +617,7 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
		DftiSetValue(plan->handle_mid, DFTI_PLACEMENT,DFTI_INPLACE);
		DftiSetValue(plan->handle_mid, DFTI_INPUT_DISTANCE, (MKL_LONG)nmid);
		DftiSetValue(plan->handle_mid, DFTI_OUTPUT_DISTANCE, (MKL_LONG)nmid);
		DftiSetValue(plan->handle_mid, DFTI_NUMBER_OF_USER_THREADS, nthreads);
		//DftiSetValue(plan->handle_mid, DFTI_NUMBER_OF_USER_THREADS, nthreads);
		DftiCommitDescriptor(plan->handle_mid);

		DftiCreateDescriptor( &(plan->handle_slow), FFT_MKL_PREC, DFTI_COMPLEX, 1,
		@@ -627,7 +627,7 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
		DftiSetValue(plan->handle_slow, DFTI_PLACEMENT,DFTI_INPLACE);
		DftiSetValue(plan->handle_slow, DFTI_INPUT_DISTANCE, (MKL_LONG)nslow);
		DftiSetValue(plan->handle_slow, DFTI_OUTPUT_DISTANCE, (MKL_LONG)nslow);
		DftiSetValue(plan->handle_slow, DFTI_NUMBER_OF_USER_THREADS, nthreads);
		//DftiSetValue(plan->handle_slow, DFTI_NUMBER_OF_USER_THREADS, nthreads);
		DftiCommitDescriptor(plan->handle_slow);

		if (scaled == 0)
		@@ -640,10 +640,13 @@ struct fft_plan_3d_kokkos<DeviceType>* FFT3dKokkos<DeviceType>::fft_3d_create_pl
		}

		#elif defined(FFT_FFTW3)

		#if defined (FFT_FFTW_THREADS)
		if (nthreads > 1) {
		FFTW_API(init_threads)();
		FFTW_API(plan_with_nthreads)(nthreads);
		}
		#endif

		plan->plan_fast_forward =
		FFTW_API(plan_many_dft)(1, &nfast,plan->total1/plan->length1,

Admin message