Need SDL2_sound!

.gitignore

@@ -1,7 +1,23 @@
 !acbuild/m4
+*.o
+*.a
+*.d
+*.db
+*.wav
 *.ncb
 *.suo
 *.user
+*.dat
+*.so
+*/*.so
+*/*.so*
+*/*/*.so*
+src/*/*.Release
+src/*/*.Debug
+.qmake.*
+err.txt
+*/err.txt
+*/*/err.txt
 Makefile
 Makefile.in
 acbuild/*
@@ -31,6 +47,8 @@ doc/latex
 libtool
 m4/*.m4
 mmd.sh
+cmake-build/*
+build/*
 src/*/*.la
 src/*/*.lo
 src/*/*.o
@@ -56,3 +74,83 @@ src/nmdtool/nmdtool
 stamp-h1
 win32/Setup_openBliSSART/Release
 win32/Setup_openBliSSART/Debug
+cmake-build
+build-cmake
+build
+CMakeCache
+browser
+cmake
+CMake
+.qt
+.qtc*
+Makefile
+CMakeFiles
+auto2cmake.py
+cmake-project.sh
+cmakeblissart.txt
+configure.ac~
+configure_autotools.log
+configure~
+doc/q.log
+make_autotools.log
+make_cublas.txt
+make_install_autotools.log
+openBlis
+src/LibFeature/LibFeature.pro
+src/LibFeature/Makefile.sub_LibFeature
+src/LibFramework/Makefile.Debug
+src/LibFramework/Makefile.Release
+src/LibFramework/Makefile.am
+src/LibFramework/Makefile.sub_LibFramework
+src/LibFramework/cmake_install.cmake
+src/LibFramework/libFramework.so.1.0.0
+src/LibICA/LibICA.pro
+src/LibICA/Makefile.sub_LibICA
+src/LibLinAlg/debug/libLinAlg.so.1
+src/LibLinAlg/debug/libLinAlg.so.1.0
+src/LibLinAlg/debug/libLinAlg.so.1.0.0
+src/LibLinAlg/debug/libLinAlgd.so.1
+src/LibLinAlg/debug/libLinAlgd.so.1.0
+src/LibLinAlg/debug/libLinAlgd.so.1.0.0
+src/LibLinAlg/pro_debug.txt
+src/build-LibFramework-Desktop-Release/Makefile.Debug
+src/build-LibFramework-Desktop-Release/Makefile.Release
+src/build-LibFramework-Desktop-Release/libFramework.so
+src/build-LibFramework-Desktop-Release/libFramework.so.1
+src/build-LibFramework-Desktop-Release/libFramework.so.1.0
+src/build-LibFramework-Desktop-Release/libFramework.so.1.0.0
+build-debug/*.*
+sub_core.pro
+CMakeCache.txt
+build-Lib*
+valgrind*.txt
+openBlis
+src/LibFeature/LibFeature.pro
+src/LibFramework/Makefile.Debug
+src/LibFramework/Makefile.Release
+src/LibFramework/Makefile.am
+src/LibFramework/libFramework.so.1.0.0
+src/LibICA/LibICA.pro
+src/build-LibFramework-Desktop-Release/Makefile.Debug
+src/build-LibFramework-Desktop-Release/Makefile.Release
+src/build-LibFramework-Desktop-Release/libFramework.so
+src/build-LibFramework-Desktop-Release/libFramework.so.1
+src/build-LibFramework-Desktop-Release/libFramework.so.1.0
+src/build-LibFramework-Desktop-Release/libFramework.so.1.0.0
+doc/CMakeLists.bkup
+doc/manual_PDF
+doc/manual.aux
+doc/manual.log
+doc/manual.out
+doc/manual.toc
+doc/manual/manual.synctex.*
+src/LibFramework/build-svm*
+src/LibFramework/libsvm/*.bkup
+src/LibFramework/libsvm/Makefile*
+src/LibFramework/libsvm/release*
+src/LibFramework/libsvm/*copy*
+src/LibFramework/libsvm/test
+src/LibFramework/libsvm/svm-toy
+src/include/libsvm/svm_h.bkup
+src/LibFramework/libsvm/svm.def
+src/LibFramework/libsvm/*.txt

CMakeLists.txt

@@ -1,123 +1,58 @@
-cmake_minimum_required(VERSION 2.8.4)
-
-#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules")
-
-PROJECT(Bliss)
-
-set(Bliss_SOURCES
-./src/LibAudio/audio.cpp
-./src/LibAudio/AudioData.cpp
-./src/LibAudio/MelFilter.cpp
-./src/LibAudio/Sound.cpp
-./src/LibAudio/WaveEncoder.cpp
-./src/LibFeature/mfcc.cpp
-./src/LibFeature/misc.cpp
-./src/LibFeature/peak.cpp
-./src/LibFramework/AnovaFeatureSelector.cpp
-./src/LibFramework/AudioObject.cpp
-./src/LibFramework/BasicApplication.cpp
-./src/LibFramework/BasicTask.cpp
-./src/LibFramework/ClassificationObject.cpp
-./src/LibFramework/ClassificationTask.cpp
-./src/LibFramework/CleanupTask.cpp
-./src/LibFramework/CorrelationFeatureSelector.cpp
-./src/LibFramework/CrossValidator.cpp
-./src/LibFramework/DatabaseEntity.cpp
-./src/LibFramework/DatabaseSubsystem.cpp
-./src/LibFramework/DataDescriptor.cpp
-./src/LibFramework/DataSet.cpp
-./src/LibFramework/exportDataSet.cpp
-./src/LibFramework/Feature.cpp
-./src/LibFramework/FeatureDescriptor.cpp
-./src/LibFramework/FeatureExtractionTask.cpp
-./src/LibFramework/FeatureExtractor.cpp
-./src/LibFramework/FeatureSelector.cpp
-./src/LibFramework/FeatureSet.cpp
-./src/LibFramework/FTTask.cpp
-./src/LibFramework/GnuplotWriter.cpp
-./src/LibFramework/HTKWriter.cpp
-./src/LibFramework/Label.cpp
-./src/LibFramework/libsvm/svm.cpp
-./src/LibFramework/MatrixTransform.cpp
-./src/LibFramework/MelFilterTransform.cpp
-./src/LibFramework/NMDTask.cpp
-./src/LibFramework/PowerTransform.cpp
-./src/LibFramework/Process.cpp
-./src/LibFramework/ProgressInterface.cpp
-./src/LibFramework/QueuedTaskManager.cpp
-./src/LibFramework/Response.cpp
-./src/LibFramework/SeparationTask.cpp
-./src/LibFramework/SlidingWindowTransform.cpp
-./src/LibFramework/SpectralSubtractionTransform.cpp
-./src/LibFramework/StorageSubsystem.cpp
-./src/LibFramework/SVMModel.cpp
-./src/LibFramework/TargetedDeconvolver.cpp
-./src/LibFramework/ThreadedApplication.cpp
-./src/LibFramework/WindowFunctions.cpp
-./src/LibICA/FastICA.cpp
-./src/LibICA/PCA.cpp
-./src/LibLinAlg/ColVector.cpp
-#./src/LibLinAlg/GPUMatrix.cpp
-#./src/LibLinAlg/GPUUtil.cpp
-./src/LibLinAlg/Matrix.cpp
-./src/LibLinAlg/RowVector.cpp
-./src/LibLinAlg/Vector.cpp
-./src/LibNMF/Deconvolver.cpp
-./src/LibNMF/randomGenerator.cpp
-)
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}
-    ./src/benchmark
-    ./src/browser
-    ./src/icatool
-    ./src/include
-    ./src/include/blissart
-    ./src/include/blissart/audio
-    ./src/include/blissart/feature
-    ./src/include/blissart/ica
-    ./src/include/blissart/linalg
-    ./src/include/blissart/nmf
-    ./src/include/blissart/transforms
-    ./src/include/libsvm
-    ./src/LibAudio
-    ./src/LibFramework
-    /usr/local/include
-)
-
-add_library(bliss ${Bliss_SOURCES})
-link_directories("/usr/local/lib")
-
-add_executable(septool ./src/septool/main.cpp)
-#set(link_flags "-L/usr/local/lib")
-target_link_libraries(septool pthread bliss PocoFoundation PocoUtil PocoXML PocoData PocoSQLite SDLmain SDL SDL_sound fftw3)
-
-
-add_executable(testSuite
-	./src/Testsuite/BinaryReaderWriterTest.cpp
-	./src/Testsuite/CNMFTest.cpp
-	./src/Testsuite/DatabaseSubsystemTest.cpp
-	./src/Testsuite/FeatureExtractionTest.cpp
-	./src/Testsuite/FeatureSelectionTest.cpp
-	./src/Testsuite/HTKWriterTest.cpp
-#	./src/Testsuite/ICATest.cpp
-	./src/Testsuite/main.cpp
-	./src/Testsuite/MatrixTest.cpp
-	./src/Testsuite/MelFilterTest.cpp
-	./src/Testsuite/MFCCTest.cpp
-	./src/Testsuite/MinHeapTest.cpp
-	./src/Testsuite/MTrTest.cpp
-	./src/Testsuite/NMDTest.cpp
-	./src/Testsuite/NMFTest.cpp
-	./src/Testsuite/PCATest.cpp
-	./src/Testsuite/ScalingTest.cpp
-	./src/Testsuite/SNMFTest.cpp
-	./src/Testsuite/SpectralAnalysisTest.cpp
-	./src/Testsuite/StorageSubsystemTest.cpp
-	./src/Testsuite/SVMModelTest.cpp
-	./src/Testsuite/TaskDepsTest.cpp
-	./src/Testsuite/Testable.cpp
-	./src/Testsuite/VectorTest.cpp
-	./src/Testsuite/WaveTest.cpp
-	)
-target_link_libraries(testSuite pthread PocoFoundation PocoUtil PocoXML PocoData PocoSQLite SDLmain SDL SDL_sound fftw3 bliss)
+cmake_minimum_required(VERSION 3.20)
+#cmake_policy(SET CMP0042 NEW)
+# set the project name and version
+project(openBliSSART VERSION 1.0)
+
+configure_file(openBliSSARTconfig.h.in openBliSSARTconfig.h)
+
+# specify the C++ standard
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+#SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -Wuninitialized -Wall -Wpedantic -fstack-protector")
+#SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weffc++ -pg -Wuninitialized -Werror -Wall -Wextra -Wpedantic -fstack-protector")
+#print_trace()
+#SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-pie -ggdb3 -O3 -no-pie -rdynamic -pedantic-errors")
+#Backtrace()
+SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -g -fpic -export-dynamic")
+#set(CMAKE_CXX_CPPCHECK "cppcheck")
+find_program(CMAKE_CXX_CPPCHECK NAMES cppcheck)
+if (CMAKE_CXX_CPPCHECK)
+    list(
+        APPEND CMAKE_CXX_CPPCHECK 
+            "--enable=warning"
+            "--inconclusive"
+            "--force" 
+            "--inline-suppr"
+#            "--suppressions-list=${CMAKE_SOURCE_DIR}/CppCheckSuppressions.txt"
+    )
+endif()
+# Option to Enable NO_CUDA
+option( NO_CUDA "Enable NO_CUDA" OFF )
+
+# The lines below will generate the config.h based on the options above
+# The file will be in the ${CMAKE_BINARY_DIR} location
+set(CONFIG_H ${CMAKE_BINARY_DIR}/config.h)
+string(TIMESTAMP CURRENT_TIMESTAMP)
+file(WRITE ${CONFIG_H} "/* WARNING: This file is auto-generated by CMake on ${CURRENT_TIMESTAMP}. DO NOT EDIT!!! */\n\n")
+if( NO_CUDA )
+    message(" NO_CUDA Enabled")
+    file(APPEND ${CONFIG_H} "/* Enable NO_CUDA */\n")
+    file(APPEND ${CONFIG_H} "#define [HAVE_CUDA] \n\n")
+endif( NO_CUDA )
+#findCUDA()
+find_package(CUDAToolkit 11.6 REQUIRED)
+#find_package(CUDA 11.6 REQUIRED)
+message(STATUS "Found CUDA ${CUDA_VERSION_STRING} at ${CUDA_TOOLKIT_ROOT_DIR}")
+#cmake -D CUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda-5.5 ..
+#findSDL2()
+
+## !!! WARNING These are the defines that were defined regardless of an option.
+## !!! Or the script couldn't match them. Match them accordingly, delete them or keep them
+
+# Setting the include directory for the application to find config.h
+include_directories( ${CMAKE_BINARY_DIR} )
+#list(APPEND CMAKE_PREFIX_PATH "~/Qt/6.3.0/gcc_64")
+# Since we have created a config.h add a global define for it
+add_definitions( "-DHAVE_CONFIG_H" )
+add_subdirectory( src )
+add_subdirectory( doc )