Merge branch 'dev'

CMakeCache.txt

@@ -1,5 +1,5 @@
 # This is the CMakeCache file.
-# For build in directory: /home/artelnics2020/Documentos/opennn
+# For build in directory: /home/iker/Escritorio/API/OPENNN_repositorio/opennn
 # It was generated by CMake: /usr/bin/cmake
 # You can edit this file to change values found and used by cmake.
 # If you do not want to change any of the values, simply exit the editor.
@@ -209,11 +209,125 @@ CMAKE_STRIP:FILEPATH=/usr/bin/strip
 // Studio IDE projects all commands are done without /nologo.
 CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
 
+//Enable to build RPM source packages
+CPACK_SOURCE_RPM:BOOL=OFF
+
+//Enable to build TBZ2 source packages
+CPACK_SOURCE_TBZ2:BOOL=ON
+
+//Enable to build TGZ source packages
+CPACK_SOURCE_TGZ:BOOL=ON
+
+//Enable to build TXZ source packages
+CPACK_SOURCE_TXZ:BOOL=ON
+
+//Enable to build TZ source packages
+CPACK_SOURCE_TZ:BOOL=ON
+
+//Enable to build ZIP source packages
+CPACK_SOURCE_ZIP:BOOL=OFF
+
+//CXX compiler flags for OpenMP parallelization
+OpenMP_CXX_FLAGS:STRING=-fopenmp
+
+//CXX compiler libraries for OpenMP parallelization
+OpenMP_CXX_LIB_NAMES:STRING=gomp;pthread
+
+//C compiler flags for OpenMP parallelization
+OpenMP_C_FLAGS:STRING=-fopenmp
+
+//C compiler libraries for OpenMP parallelization
+OpenMP_C_LIB_NAMES:STRING=gomp;pthread
+
+//Path to the gomp library for OpenMP
+OpenMP_gomp_LIBRARY:FILEPATH=/usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so
+
+//Path to the pthread library for OpenMP
+OpenMP_pthread_LIBRARY:FILEPATH=/usr/lib/x86_64-linux-gnu/libpthread.so
+
+//Build OpenNN blank
+OpenNN_BUILD_BLANK:BOOL=ON
+
+//Build OpenNN examples
+OpenNN_BUILD_EXAMPLES:BOOL=ON
+
+//Build OpenNN tests
+OpenNN_BUILD_TESTS:BOOL=ON
+
+//Use OpenMP
+USE_OpenMP:BOOL=ON
+
+//Value Computed by CMake
+airfoil_self_noise_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/airfoil_self_noise
+
+//Value Computed by CMake
+airfoil_self_noise_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/airfoil_self_noise
+
+//Value Computed by CMake
+blank_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/blank
+
+//Value Computed by CMake
+blank_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/blank
+
+//Value Computed by CMake
+examples_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples
+
+//Value Computed by CMake
+examples_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples
+
+//Value Computed by CMake
+iris_plant_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/iris_plant
+
+//Value Computed by CMake
+iris_plant_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/iris_plant
+
+//Value Computed by CMake
+leukemia_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/leukemia
+
+//Value Computed by CMake
+leukemia_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/leukemia
+
+//Value Computed by CMake
+logical_operations_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/logical_operations
+
+//Value Computed by CMake
+logical_operations_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/logical_operations
+
+//Value Computed by CMake
+mnist_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/outlier_detection
+
+//Value Computed by CMake
+mnist_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/outlier_detection
+
+//Value Computed by CMake
+opennn_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/opennn
+
+//Value Computed by CMake
+opennn_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/opennn
+
+//Value Computed by CMake
+rosenbrock_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/rosenbrock
+
+//Value Computed by CMake
+rosenbrock_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/rosenbrock
+
+//Value Computed by CMake
+simple_approximation_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/simple_approximation
+
+//Value Computed by CMake
+simple_approximation_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/simple_approximation
+
+//Value Computed by CMake
+simple_classification_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/simple_classification
+
+//Value Computed by CMake
+simple_classification_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/examples/simple_classification
+
 //Value Computed by CMake
-opennn_BINARY_DIR:STATIC=/home/artelnics2020/Documentos/opennn
+tests_BINARY_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/tests
 
 //Value Computed by CMake
-opennn_SOURCE_DIR:STATIC=/home/artelnics2020/Documentos/opennn/opennn
+tests_SOURCE_DIR:STATIC=/home/iker/Escritorio/API/OPENNN_repositorio/opennn/tests
 
 
 ########################
@@ -225,7 +339,7 @@ CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_AR
 CMAKE_AR-ADVANCED:INTERNAL=1
 //This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=/home/artelnics2020/Documentos/opennn
+CMAKE_CACHEFILE_DIR:INTERNAL=/home/iker/Escritorio/API/OPENNN_repositorio/opennn
 //Major version of cmake used to create the current loaded cache
 CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
 //Minor version of cmake used to create the current loaded cache
@@ -300,7 +414,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=
 CMAKE_GENERATOR_TOOLSET:INTERNAL=
 //Source directory with the top level CMakeLists.txt file for this
 // project
-CMAKE_HOME_DIRECTORY:INTERNAL=/home/artelnics2020/Documentos/opennn/opennn
+CMAKE_HOME_DIRECTORY:INTERNAL=/home/iker/Escritorio/API/OPENNN_repositorio/opennn
 //Install .so files without execute permission.
 CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
 //ADVANCED property for variable: CMAKE_LINKER
@@ -320,7 +434,7 @@ CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_NM
 CMAKE_NM-ADVANCED:INTERNAL=1
 //number of local generators
-CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
+CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=15
 //ADVANCED property for variable: CMAKE_OBJCOPY
 CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_OBJDUMP
@@ -363,4 +477,46 @@ CMAKE_STRIP-ADVANCED:INTERNAL=1
 CMAKE_UNAME:INTERNAL=/usr/bin/uname
 //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
 CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CPACK_SOURCE_RPM
+CPACK_SOURCE_RPM-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CPACK_SOURCE_TBZ2
+CPACK_SOURCE_TBZ2-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CPACK_SOURCE_TGZ
+CPACK_SOURCE_TGZ-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CPACK_SOURCE_TXZ
+CPACK_SOURCE_TXZ-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CPACK_SOURCE_TZ
+CPACK_SOURCE_TZ-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CPACK_SOURCE_ZIP
+CPACK_SOURCE_ZIP-ADVANCED:INTERNAL=1
+//Details about finding OpenMP
+FIND_PACKAGE_MESSAGE_DETAILS_OpenMP:INTERNAL=[TRUE][TRUE][c ][v4.5()]
+//Details about finding OpenMP_C
+FIND_PACKAGE_MESSAGE_DETAILS_OpenMP_C:INTERNAL=[-fopenmp][/usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so][/usr/lib/x86_64-linux-gnu/libpthread.so][/usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so][/usr/lib/x86_64-linux-gnu/libpthread.so][v4.5()]
+//Details about finding OpenMP_CXX
+FIND_PACKAGE_MESSAGE_DETAILS_OpenMP_CXX:INTERNAL=[-fopenmp][/usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so][/usr/lib/x86_64-linux-gnu/libpthread.so][/usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so][/usr/lib/x86_64-linux-gnu/libpthread.so][v4.5()]
+//Result of TRY_COMPILE
+OpenMP_COMPILE_RESULT_CXX_fopenmp:INTERNAL=TRUE
+//Result of TRY_COMPILE
+OpenMP_COMPILE_RESULT_C_fopenmp:INTERNAL=TRUE
+//ADVANCED property for variable: OpenMP_CXX_FLAGS
+OpenMP_CXX_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: OpenMP_CXX_LIB_NAMES
+OpenMP_CXX_LIB_NAMES-ADVANCED:INTERNAL=1
+//CXX compiler's OpenMP specification date
+OpenMP_CXX_SPEC_DATE:INTERNAL=201511
+//ADVANCED property for variable: OpenMP_C_FLAGS
+OpenMP_C_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: OpenMP_C_LIB_NAMES
+OpenMP_C_LIB_NAMES-ADVANCED:INTERNAL=1
+//C compiler's OpenMP specification date
+OpenMP_C_SPEC_DATE:INTERNAL=201511
+//Result of TRY_COMPILE
+OpenMP_SPECTEST_CXX_:INTERNAL=TRUE
+//Result of TRY_COMPILE
+OpenMP_SPECTEST_C_:INTERNAL=TRUE
+//ADVANCED property for variable: OpenMP_gomp_LIBRARY
+OpenMP_gomp_LIBRARY-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: OpenMP_pthread_LIBRARY
+OpenMP_pthread_LIBRARY-ADVANCED:INTERNAL=1
 

blank/blank.pro

@@ -29,16 +29,16 @@ DESTDIR = "$$PWD/bin"
 
 SOURCES = main.cpp
 
-win32-g++{
-QMAKE_LFLAGS += -static-libgcc
-QMAKE_LFLAGS += -static-libstdc++
-QMAKE_LFLAGS += -static
-}
+#win32-g++{
+#QMAKE_LFLAGS += -static-libgcc
+#QMAKE_LFLAGS += -static-libstdc++
+#QMAKE_LFLAGS += -static
+#}
 
-win32:!win32-g++{
-#QMAKE_CXXFLAGS+= -arch:AVX
-#QMAKE_CFLAGS+= -arch:AVX
-}
+#win32:!win32-g++{
+##QMAKE_CXXFLAGS+= -arch:AVX
+##QMAKE_CFLAGS+= -arch:AVX
+#}
 
 # OpenNN library
 
@@ -49,36 +49,26 @@ else:unix: LIBS += -L$$OUT_PWD/../opennn/ -lopennn
 INCLUDEPATH += $$PWD/../opennn
 DEPENDPATH += $$PWD/../opennn
 
-win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../opennn/release/libopennn.a
-else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../opennn/debug/libopennn.a
-else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../opennn/release/opennn.lib
-else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../opennn/debug/opennn.lib
+
+win32:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../opennn/release/opennn.lib
+else:win32:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../opennn/debug/opennn.lib
 else:unix: PRE_TARGETDEPS += $$OUT_PWD/../opennn/libopennn.a
 
 # OpenMP library
 
-win32:!win32-g++{
-QMAKE_CXXFLAGS += -openmp
-QMAKE_LFLAGS  += -openmp
-}
+#win32:{
+#QMAKE_CXXFLAGS += -openmp
+#QMAKE_LFLAGS  += -openmp
+#}
 
-unix:!macx{
-QMAKE_CXXFLAGS+= -fopenmp
-QMAKE_LFLAGS += -fopenmp
+#unix:!macx{
+#QMAKE_CXXFLAGS+= -fopenmp
+#QMAKE_LFLAGS += -fopenmp
 
-QMAKE_CXXFLAGS+= -std=c++17
-QMAKE_LFLAGS += -std=c++17
-}
+#QMAKE_CXXFLAGS+= -std=c++17
+#QMAKE_LFLAGS += -std=c++17
+#}
 # OpenMP library
 
-win32:!win32-g++{
-QMAKE_CXXFLAGS += -std=c++17 -fopenmp -pthread #-lgomp -openmp
-QMAKE_LFLAGS += -fopenmp -pthread #-lgomp -openmp
-LIBS += -fopenmp -pthread #-lgomp
-}else:!macx{QMAKE_CXXFLAGS+= -fopenmp -lgomp -std=c++17
-QMAKE_LFLAGS += -fopenmp -lgomp
-LIBS += -fopenmp -pthread -lgomp
-}else: macx{
-INCLUDEPATH += /usr/local/opt/libomp/include
-LIBS += /usr/local/opt/libomp/lib/libomp.dylib}
+include(../opennmp.pri)
 

blank/blank.vcxproj

@@ -31,7 +31,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>Intel C++ Compiler 2021</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -42,12 +42,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>Intel C++ Compiler 2021</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>Intel C++ Compiler 2021</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -94,6 +94,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -110,6 +111,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <OpenMP>GenerateParallelCode</OpenMP>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -126,6 +128,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -145,6 +148,7 @@
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <OpenMP>GenerateParallelCode</OpenMP>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

blank/data/MSEH.csv

@@ -0,0 +1 @@
+;0.59536;0.325204;0.379679;0.236538

blank/data/MTEH.csv

@@ -0,0 +1,4 @@
+1;0.566066
+2;0.297062
+3;0.333636
+4;0.172793

blank/data/MeanSEH.csv

@@ -0,0 +1,15 @@
+1;0.513925
+2;0.470169
+3;0.458414
+4;0.449215
+5;0.420672
+6;0.416369
+7;0.397119
+8;0.366913
+9;0.340711
+10;0.346614
+11;0.362562
+12;0.318169
+13;0.288938
+14;0.277164
+15;0.267724