Skip to content

Commit f9b0ac9

Browse files
committed
Final 1.3.2 pr before merge
-Updated documentation
1 parent bc4f3e0 commit f9b0ac9

File tree

7 files changed

+649
-357
lines changed

7 files changed

+649
-357
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ else()
2626
endif()
2727

2828
option(build_VkFFT_FFTW_precision "Build VkFFT FFTW precision comparison" OFF)
29-
option(VkFFT_use_FP128_Bluestein_RaderFFT "Use FP128 for Bluestein and Rader FFT kernel calculations. Currently requires FP128 FFT library, like FFTWl" OFF)
29+
option(VkFFT_use_FP128_Bluestein_RaderFFT "Use LD for Bluestein and Rader FFT kernel calculations. Currently requires LD FFT library, like FFTWl, will be reworked" OFF)
3030
option(VkFFT_use_FP128_double_double "Build VkFFT quad double-double" OFF)
3131

3232
if (MSVC)

VkFFT_TestSuite.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ int main(int argc, char* argv[])
562562
version_decomposed[0] = version / 10000;
563563
version_decomposed[1] = (version - version_decomposed[0] * 10000) / 100;
564564
version_decomposed[2] = (version - version_decomposed[0] * 10000 - version_decomposed[1] * 100);
565-
printf("VkFFT v%d.%d.%d (22-10-2023). Author: Tolmachev Dmitrii\n", version_decomposed[0], version_decomposed[1], version_decomposed[2]);
565+
printf("VkFFT v%d.%d.%d (23-10-2023). Author: Tolmachev Dmitrii\n", version_decomposed[0], version_decomposed[1], version_decomposed[2]);
566566
#if (VKFFT_BACKEND==0)
567567
printf("Vulkan backend\n");
568568
#elif (VKFFT_BACKEND==1)

benchmark_scripts/vkFFT_scripts/src/sample_52_convolution_VkFFT_single_2d_batched_r2c.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ VkFFTResult sample_52_convolution_VkFFT_single_2d_batched_r2c(VkGPU* vkGPU, uint
208208
convolution_configuration.numberBatches = 1;//one batch - numberKernels convolutions
209209
convolution_configuration.numberKernels = configuration.numberBatches;// number of convolutions on a single input
210210
//Allocate separate buffer for the input data.
211-
uint64_t inputBufferSize = ((uint64_t)convolution_configuration.coordinateFeatures) * sizeof(float) * 2 * (convolution_configuration.size[0] / 2 + 1) * convolution_configuration.size[1] * convolution_configuration.size[2];;
211+
uint64_t inputBufferSize = ((uint64_t)convolution_configuration.coordinateFeatures) * sizeof(float) * (convolution_configuration.size[0]) * convolution_configuration.size[1] * convolution_configuration.size[2];;
212212
uint64_t bufferSize = convolution_configuration.numberKernels * convolution_configuration.coordinateFeatures * sizeof(float) * 2 * (convolution_configuration.size[0] / 2 + 1) * convolution_configuration.size[1] * convolution_configuration.size[2];;
213213
convolution_configuration.isInputFormatted = true; //if input is a different buffer, it doesn't have to be zeropadded/R2C padded
214214

@@ -282,7 +282,7 @@ VkFFTResult sample_52_convolution_VkFFT_single_2d_batched_r2c(VkGPU* vkGPU, uint
282282
for (uint64_t k = 0; k < convolution_configuration.size[2]; k++) {
283283
for (uint64_t j = 0; j < convolution_configuration.size[1]; j++) {
284284
for (uint64_t i = 0; i < convolution_configuration.size[0]; i++) {
285-
buffer_input[i + j * (convolution_configuration.size[0] + 2) + k * (convolution_configuration.size[0] + 2) * convolution_configuration.size[1] + v * (convolution_configuration.size[0] + 2) * convolution_configuration.size[1] * convolution_configuration.size[2]] = 1;
285+
buffer_input[i + j * (convolution_configuration.size[0]) + k * (convolution_configuration.size[0]) * convolution_configuration.size[1] + v * (convolution_configuration.size[0]) * convolution_configuration.size[1] * convolution_configuration.size[2]] = 1;
286286
}
287287
}
288288
}

0 commit comments

Comments
 (0)