added fftw support to cmakelists, and linux-arm configurations to vscode json files

Author: leomccormack

.vscode/c_cpp_properties.json

@@ -45,6 +45,23 @@
                 "${commonDefs}"
             ],
             "configurationProvider": "ms-vscode.cmake-tools"
+        },
+        {
+            "name": "Linux-arm",
+            "includePath": [
+                "${commonIncludePaths}"
+            ],
+            "defines": [
+                "SAF_USE_OPEN_BLAS_AND_LAPACKE",
+                "SAF_ENABLE_SOFA_READER_MODULE",
+                "SAF_ENABLE_TRACKER_MODULE"
+            ],
+            "macFrameworkPath": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "${default}",
+            "configurationProvider": "ms-vscode.cmake-tools"
         }
     ],
     "version": 4

.vscode/launch.json

@@ -4,19 +4,25 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        
         {
-            "name": "(lldb) Launch", 
+            "name": "(gdb) Launch",
             "type": "cppdbg",
             "request": "launch",
-            "targetArchitecture": "x86_64",
             "program": "${workspaceFolder}/build/test/saf_test",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
+            "cwd": "${fileDirname}",
             "environment": [],
             "externalConsole": false,
-            "MIMode": "lldb",
-            "miDebuggerPath": "/usr/bin/gdb"
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
         }
     ]
 }

CMakeLists.txt

@@ -11,6 +11,7 @@ option(SAF_BUILD_EXTRAS              "Build SAF extras."
 option(SAF_ENABLE_SOFA_READER_MODULE "Enable the SAF SOFA READER module"          OFF)
 option(SAF_ENABLE_TRACKER_MODULE     "Enable the SAF TRACKER module"              OFF)
 option(SAF_USE_INTEL_IPP             "Use Intel IPP for the FFT, resampler, etc." OFF)
+option(SAF_USE_FFTW                  "Use FFTW3 for the FFT."                     OFF)
 option(SAF_ENABLE_SIMD               "Enable the use of SSE3, AVX2, AVX512"       OFF)
 if (NOT SAF_PERFORMANCE_LIB)
     set(SAF_PERFORMANCE_LIB "SAF_USE_INTEL_MKL_LP64" CACHE STRING "Performance library for SAF to use.")

framework/CMakeLists.txt

@@ -213,6 +213,29 @@ if(SAF_USE_INTEL_IPP)
     target_link_libraries(${PROJECT_NAME} PUBLIC ${INTEL_IPP_LIB} )
 endif()
 
+############################################################################
+# Enable/Disable FFTW
+if(SAF_USE_FFTW)
+    # Indicate to saf that the saf_sofa_reader module should be enabled
+    target_compile_definitions(${PROJECT_NAME} PUBLIC SAF_USE_FFTW=${SAF_USE_FFTW})
+        
+    # Header path and libs are platform dependent
+    if(MSVC)
+        message(FATAL_ERROR "Incomplete list")
+    elseif(MSYS OR MINGW)
+        message(FATAL_ERROR "Incomplete list")
+    elseif(APPLE) 
+        message(FATAL_ERROR "Incomplete list")
+    elseif(UNIX AND NOT APPLE) 
+        find_library(FFTW_LIBRARY fftw3f HINTS /usr/local/lib)
+        if (NOT FFTW_LIBRARY)
+            message(FATAL_ERROR "FFTW_LIBRARY not found")
+        endif()
+        target_link_libraries(${PROJECT_NAME} PUBLIC ${FFTW_LIBRARY})
+        message(STATUS "Linking FFTW: ${FFTW_LIBRARY}")
+    endif() 
+endif()
+
 ############################################################################
 # Enable SIMD intrinsics
 if(SAF_ENABLE_SIMD)

framework/include/saf_externals.h

@@ -209,7 +209,7 @@
  * implementations found in Intel IPP, Intel MKL and Apple Accelerate are
  * usually faster options.
  *
- * Note, SAF uses the single-precision version (fftw3f.a), which is built with:
+ * Note, SAF uses the single-precision version (fftw3f), which is built with:
  *   $ ./configure --enable-float
  *   $ make
  *

framework/modules/saf_utilities/saf_utility_veclib.c

@@ -1202,6 +1202,10 @@ void utility_cvvmul
     }
     for(; i<len; i++) /* The residual (if len was not divisable by the step size): */
         c[i] = a[i] * b[i];
+#elif __STDC_VERSION__ >= 199901L 
+    int i;
+    for (i = 0; i < len; i++)
+        c[i] = a[i] * b[i];
 #else
     int i;
     for (i = 0; i < len; i++)