Merge 4.2 release branch into amd-fftw

amd · Feb 26, 2024 · 5a64feb · 5a64feb
2 parents d18f5f3 + 00141ff
commit 5a64feb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -252,7 +252,7 @@ if (MSVC)
 endif(MSVC)
 
 string(TIMESTAMP TODAY "%Y%m%d")
-add_compile_definitions(AOCL_FFTW_VERSION="AOCL-FFTW 4.1.0 Build ${TODAY}")
+add_compile_definitions(AOCL_FFTW_VERSION="AOCL-FFTW 4.2.0 Build ${TODAY}")
 
 find_library (LIBM_LIBRARY NAMES m)
 if (LIBM_LIBRARY)

diff --git a/configure b/configure
@@ -18385,7 +18385,7 @@ fi
 
 dateVar=`date +"%Y%m%d"`
 
-printf "%s\n" "#define AOCL_FFTW_VERSION \"AOCL-FFTW 4.1.0 Build $dateVar\"" >>confdefs.h
+printf "%s\n" "#define AOCL_FFTW_VERSION \"AOCL-FFTW 4.2.0 Build $dateVar\"" >>confdefs.h
 
 # Check whether --enable-amd-fast-planner was given.
 if test ${enable_amd_fast_planner+y}

diff --git a/configure.ac b/configure.ac
@@ -790,7 +790,7 @@ AC_ARG_ENABLE(openmp, [AC_HELP_STRING([--enable-openmp],[use OpenMP directives f
 AC_ARG_ENABLE(threads, [AC_HELP_STRING([--enable-threads],[compile FFTW SMP threads library])], enable_threads=$enableval, enable_threads=no)
 dnl aocl version number of amd-fftw
 dateVar=`date +"%Y%m%d"`
-AC_DEFINE_UNQUOTED(AOCL_FFTW_VERSION,"AOCL-FFTW 4.1.0 Build $dateVar",[AOCL Version of AMD-FFTW])
+AC_DEFINE_UNQUOTED(AOCL_FFTW_VERSION,"AOCL-FFTW 4.2.0 Build $dateVar",[AOCL Version of AMD-FFTW])
 dnl amd optimization switch to enable AMD Fast Planner for AMD cpus --enable-amd-fast-planner
 AC_ARG_ENABLE(amd-fast-planner, [AC_HELP_STRING([--enable-amd-fast-planner],[enable AMD Fast Planner for a faster planning time on AMD cpus])], have_amd_fast_planner=$enableval, have_amd_fast_planner=no)
 dnl amd optimization switch to enable AMD Top N Planner for AMD cpus --enable-amd-top-n-planner