Version 0.9

.github/workflows/build-cpu-windows.yml

@@ -21,7 +21,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_SUPERBUILD=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_TARGET=CPU ..
+        cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_SUPERBUILD=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_TARGET=CPU -DBUILD_HPC=OFF -DBUILD_TESTS=ON ..
       shell: cmd
     - name: Build
       run: cmake --build build --config Release

.github/workflows/build-cpu.yml

@@ -21,7 +21,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DBUILD_SUPERBUILD=ON
+          cmake .. -DBUILD_SUPERBUILD=ON -DBUILD_HPC=OFF -DBUILD_TESTS=ON
           make
       - name: Test
         run: |

CMakeLists.txt

@@ -10,8 +10,7 @@ option(BUILD_SUPERBUILD "Compile using the superbuild system" OFF)
 option(BUILD_PROTOBUF "Compile using Protobuf" ON)
 option(BUILD_OPENMP "Compile using OpenMP" ON)
 option(BUILD_HPC "Compile using aggressive flags" ON)
-option(BUILD_TESTS "Compile tests (HCP needs to be disabled)" ON)  # Disable HCP to pass tests (there are numerical errors)
-option(USE_LOCAL_GTEST "Use the local library to avoid problems derived from the 'One Definition Rule'" ON)
+option(BUILD_TESTS "Compile tests (HPC needs to be disabled)" OFF)  # Disable HPC to pass tests (there are numerical errors)
 option(BUILD_EXAMPLES "Compile examples" ON)
 option(BUILD_SHARED_LIBS "Global flag to cause add_library to create shared libraries if on" ON)
 option(BUILD_COVERAGE "Flag to compile for coverage information" OFF)
@@ -21,26 +20,12 @@ if(WIN32)
     option(BUILD_SHARED_LIBS "" OFF) # Prefer lib over dll in windows
 endif()
 
-###########################################################################
-############################### WARNINGS ##################################
-###########################################################################
-
-# Issues with HPC and logic functions
-if(BUILD_HPC)
-    message(WARNING "[WARNING] The 'BUILD_HPC' flag is enabled and might not work on a different CPU.
-If you intend to compile the library for different CPUs (or for a docker image), you should disable it: '-D BUILD_HPC=OFF'. This happens because it makes use of native compiling flags.")
-endif()
-
-# Issues with HPC and logic functions
-if(BUILD_TESTS AND BUILD_HPC)
-    message(WARNING "[WARNING] Some logic functions are not compatible with the 'BUILD_HPC' flag.
-If you're unit testing, or using one of these logic functions: isfinite(), isinf(), isnan(), isposinf(), isneginf(); then we recommend you to disable the HPC flag: '-D BUILD_HPC=OFF' to obtain the expected results.")
-endif()
-
 ###########################################################################
 ################################# BUILD ###################################
 ###########################################################################
 
+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
+
 # Set a default build type if none was specified
 set(default_build_type "Release")
 #if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
@@ -64,7 +49,7 @@ if(BUILD_SUPERBUILD)
     add_subdirectory(cmake)
 endif()
 # This is executed at compilation time: "make"
-PROJECT(eddl VERSION 0.8 LANGUAGES CXX)
+PROJECT(eddl VERSION 0.9 LANGUAGES CXX)
 
 
 # SET C++ COMPILER STANDARD
@@ -151,12 +136,6 @@ add_subdirectory(src)
 
 # Build tests
 if(BUILD_TESTS)
-    if(USE_LOCAL_GTEST AND NOT BUILD_SUPERBUILD)
-        add_subdirectory(libs/googletest)
-        set(GTEST_INCLUDE_DIRS "${gtest_SOURCE_DIR}/include;${gtest_SOURCE_DIR}")
-        SET(GTEST_BOTH_LIBRARIES "gtest;gtest_main")
-    endif()
-
     add_subdirectory(tests)
 endif(BUILD_TESTS)
 
@@ -190,3 +169,21 @@ install(
         "${PROJECT_BINARY_DIR}/cmake/eddl/EDDLConfigVersion.cmake"
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/eddl"
         COMPONENT devel)
+
+
+
+###########################################################################
+############################### WARNINGS ##################################
+###########################################################################
+
+# Issues with HPC and logic functions
+if(BUILD_HPC)
+    message(WARNING "[WARNING] The 'BUILD_HPC' flag is enabled and might not work on a different CPU.
+If you intend to compile the library for different CPUs (or for a docker image), you should disable it: '-D BUILD_HPC=OFF'. This happens because it makes use of native compiling flags.")
+endif()
+
+# Issues with HPC and logic functions
+if(BUILD_TESTS AND BUILD_HPC)
+    message(WARNING "[WARNING] Some logic functions are not compatible with the 'BUILD_HPC' flag.
+If you're unit testing, or using one of these logic functions: isfinite(), isinf(), isnan(), isposinf(), isneginf(); then we recommend you to disable the HPC flag: '-D BUILD_HPC=OFF' to obtain the expected results.")
+endif()

TODO.txt

@@ -0,0 +1,12 @@
+TODO
+
+- Soporte ONNX: Gather, Unsqueeze ??
+- Comprobar modelos pre-entrenados onnx:
+  - Resizing 224 y predict
+  - o bien ImageNet
+
+- Decoder -> inferencia n-best
+- Ejemplos Enconder-Decoder: MT, Descripción de Imágenes/Videos
+- Modelos de atención
+- Conv3D
+- Apoyo use-cases (examples)

cmake/CMakeLists.txt

@@ -89,9 +89,6 @@ else()
     # Set variables
     SET(GTEST_ROOT "${EP_BASE_DIR}/googletest" PARENT_SCOPE)
     SET(GTEST_INCLUDE_DIRS "${EP_BASE_DIR}/googletest/include" PARENT_SCOPE)
-    SET(GTEST_LIBRARIES_DIRS "${EP_BASE_DIR}/googletest/lib" PARENT_SCOPE)
-    SET(GTEST_BOTH_LIBRARIES "gtest;gtest_main" PARENT_SCOPE)
-    SET(GTEST_BOTH_LIBRARIES_D "gtestd;gtest_maind" PARENT_SCOPE)
 endif()
 message(STATUS "Subproject: GTEST...DONE")
 
@@ -112,33 +109,6 @@ endif()
 message(STATUS "Subproject: EIGEN...DONE")
 
 
-#############
-###  ZLIB  ##
-#############
-# NOT USED *****************************************************
-#message(STATUS "Subproject: ZLIB...")
-#if(USE_SYSTEM_ZLIB)
-#    find_package(ZLIB REQUIRED)
-#else()
-#    # Download and unpack ZLIB at configure time
-#    foreach(config ${config_types})
-#        CONF_PACKAGE(zlib ${config} "")
-#        BUILD_PACKAGE(zlib ${config})
-#    endforeach()
-#    # Set variables
-#    SET(ZLIB_ROOT "${EP_BASE_DIR}/zlib" PARENT_SCOPE)
-#    SET(ZLIB_INCLUDE_DIRS "${EP_BASE_DIR}/zlib/include" PARENT_SCOPE)
-#    SET(ZLIB_LIBRARIES_DIRS "${EP_BASE_DIR}/zlib/lib")
-#    SET(ZLIB_LIBRARIES_DIRS ${ZLIB_LIBRARIES_DIRS} PARENT_SCOPE)
-#    if(WIN32)
-#        SET(ZLIB_LIBRARIES "${ZLIB_LIBRARIES_DIRS}/zlibstatic.lib" PARENT_SCOPE)
-#    elseif(UNIX)
-#        SET(ZLIB_LIBRARIES "${ZLIB_LIBRARIES_DIRS}/libz.a" PARENT_SCOPE)
-#    endif()
-#endif()
-#message(STATUS "Subproject: ZLIB...DONE")
-
-
 ################
 ##  PROTOBUF  ##
 ################
@@ -150,26 +120,10 @@ else()
         CONF_PACKAGE(protobuf ${config} @ONLY)
         BUILD_PACKAGE(protobuf ${config})
     endforeach()
-    # Set Protobuf_DIR  variable
-    if (WIN32)
-        set(Protobuf_DIR "${EP_BASE_DIR}/protobuf/cmake" PARENT_SCOPE)
-    else()
-        set(Protobuf_DIR "${EP_BASE_DIR}/protobuf/lib/cmake/protobuf" PARENT_SCOPE)
-    endif()
 
     set(Protobuf_ROOT "${EP_BASE_DIR}/protobuf" PARENT_SCOPE)
     set(Protobuf_INCLUDE_DIRS "${EP_BASE_DIR}/protobuf/include" PARENT_SCOPE)
-    set(Protobuf_LIBRARIES_DIRS "${EP_BASE_DIR}/protobuf/lib")  # TODO: Fix. Sometimes is /lib, and others /lib64
-    set(Protobuf_LIBRARIES_DIRS ${Protobuf_LIBRARIES_DIRS} PARENT_SCOPE)
-    # set(Protobuf_LIBRARIES "protobuf" PARENT_SCOPE)
     set(Protobuf_PROTOC_EXECUTABLE "${EP_BASE_DIR}/protobuf/bin/protoc" PARENT_SCOPE)
-    if(WIN32)
-        SET(Protobuf_LIBRARIES "${Protobuf_LIBRARIES_DIRS}/libprotobuf.lib" PARENT_SCOPE)
-        SET(Protobuf_LIBRARY_DEBUG "${Protobuf_LIBRARIES_DIRS}/libprotobufd.lib" PARENT_SCOPE)
-        SET(Protobuf_LIBRARY_RELEASE "${Protobuf_LIBRARIES_DIRS}/libprotobuf.lib" PARENT_SCOPE)
-    elseif(UNIX)
-        SET(Protobuf_LIBRARIES "${Protobuf_LIBRARIES_DIRS}/libprotobuf.a" PARENT_SCOPE)
-    endif()
 endif()
 add_custom_target(protobuf_files 
 	protoc --cpp_out=../src/serialization/onnx ../src/serialization/onnx/onnx.proto
@@ -217,7 +171,7 @@ endif()
 #            -DZLIB_LIBRARIES:PATH=${ZLIB_LIBRARIES}
 #            -DZLIB_LIBRARIES_DIRS:PATH=${ZLIB_LIBRARIES_DIRS}
 #
-#            -DProtobuf_DIR:PATH=${Protobuf_DIR}  # Problems
+#            -DProtobuf_ROOT:PATH=${Protobuf_ROOT}  # Problems
 #            -DProtobuf_INCLUDE_DIRS:PATH=${Protobuf_INCLUDE_DIRS}
 #            -DProtobuf_LIBRARIES:PATH=${Protobuf_LIBRARIES}
 #            -DProtobuf_LIBRARIES_DIRS:PATH=${Protobuf_LIBRARIES_DIRS}
@@ -244,7 +198,7 @@ endif()
 #message(STATUS "Zlib libraries: " ${ZLIB_LIBRARIES})
 #message(STATUS "-------------------------------------------" )
 #message(STATUS "Use system Protobuf: " ${USE_SYSTEM_PROTOBUF} )
-#message(STATUS "Protobuf dir: " ${Protobuf_DIR})
+#message(STATUS "Protobuf dir: " ${Protobuf_ROOT})
 #message(STATUS "Protobuf include dirs: " ${Protobuf_INCLUDE_DIRS})
 #message(STATUS "Protobuf libraries dirs: " ${Protobuf_LIBRARIES_DIRS})
 #message(STATUS "Protobuf libraries: " ${Protobuf_LIBRARIES})

cmake/EDDLConfig.cmake.in

@@ -6,6 +6,7 @@ SET(USE_SUPERBUILD @BUILD_SUPERBUILD@)  # Set in parent
 SET(USE_PROTOBUF @BUILD_PROTOBUF@)  # Set in parent
 SET(USE_OPENMP @USE_OPENMP@)  # Modified in a subdirectory
 SET(USE_CUDA @USE_CUDA@) # Modified in a subdirectory
+SET(USE_CUDNN @USE_CUDNN@) # Modified in a subdirectory
 SET(USE_FPGA @USE_FPGA@) # Modified in a subdirectory
 SET(USE_SYSTEM_EIGEN @USE_SYSTEM_EIGEN@) # Modified in a subdirectory
 #SET(USE_SYSTEM_ZLIB @USE_SYSTEM_ZLIB@) # Modified in a subdirectory
@@ -40,22 +41,16 @@ if(USE_SUPERBUILD)
         SET(Eigen3_DIR @Eigen3_DIR@) # Modified in a subdirectory
         list(APPEND CMAKE_PREFIX_PATH ${Eigen3_DIR})
     endif()
-#    if(NOT USE_SYSTEM_ZLIB)
-#        SET(ZLIB_ROOT_PATH @ZLIB_ROOT@) # Modified in a subdirectory
-#        SET(ZLIB_BIN @ZLIB_BIN@) # Modified in a subdirectory
-#        list(APPEND CMAKE_PREFIX_PATH ${ZLIB_BIN} ${ZLIB_ROOT_PATH})
-#    endif()
 endif()
 
 # Core dependencies
 find_dependency(Eigen3 REQUIRED NO_MODULE)
-#find_dependency(ZLIB REQUIRED)
 
 # Protobuf
 if(USE_PROTOBUF)
     if(USE_SUPERBUILD AND NOT USE_SYSTEM_PROTOBUF)
-        SET(Protobuf_DIR @Protobuf_DIR@) # Modified in a subdirectory
-        find_dependency(Protobuf CONFIG REQUIRED HINTS ${Protobuf_DIR})
+        SET(Protobuf_ROOT @Protobuf_ROOT@) # Modified in a subdirectory
+        find_dependency(Protobuf CONFIG REQUIRED HINTS ${Protobuf_ROOT})
     else()
         find_dependency(Protobuf REQUIRED)
     endif()

docs/markdown/bundle/requirements.txt

@@ -0,0 +1,121 @@
+# packages in environment at /home/salvacarrion/anaconda3/envs/eddl:
+#
+# Name                    Version                   Build  Channel
+_libgcc_mutex             0.1                 conda_forge    conda-forge
+_openmp_mutex             4.5                       1_gnu    conda-forge
+alabaster                 0.7.12                   pypi_0    pypi
+atk-1.0                   2.36.0               h3371d22_4    conda-forge
+babel                     2.9.0                    pypi_0    pypi
+breathe                   4.22.1                   pypi_0    pypi
+bzip2                     1.0.8                h7f98852_4    conda-forge
+c-ares                    1.17.1               h36c2ea0_0    conda-forge
+ca-certificates           2020.12.5            ha878542_0    conda-forge
+cairo                     1.16.0            h7979940_1007    conda-forge
+certifi                   2020.12.5        py38h578d9bd_1    conda-forge
+chardet                   4.0.0                    pypi_0    pypi
+cmake                     3.19.4               h4547794_0    conda-forge
+cudatoolkit               11.0.3               h15472ef_7    conda-forge
+cudatoolkit-dev           10.1.243             h516909a_3    conda-forge
+cudnn                     8.0.5.39             ha5ca753_1    conda-forge
+docutils                  0.16                     pypi_0    pypi
+doxygen                   1.9.1                hb166930_0    conda-forge
+eigen                     3.3.7             hc9558a2_1001    conda-forge
+expat                     2.2.10               h9c3ff4c_0    conda-forge
+font-ttf-dejavu-sans-mono 2.37                 hab24e00_0    conda-forge
+font-ttf-inconsolata      2.001                hab24e00_0    conda-forge
+font-ttf-source-code-pro  2.030                hab24e00_0    conda-forge
+font-ttf-ubuntu           0.83                 hab24e00_0    conda-forge
+fontconfig                2.13.1            hba837de_1004    conda-forge
+fonts-conda-ecosystem     1                             0    conda-forge
+fonts-conda-forge         1                             0    conda-forge
+freetype                  2.10.4               h0708190_1    conda-forge
+fribidi                   1.0.10               h36c2ea0_0    conda-forge
+gdk-pixbuf                2.42.2               h0c95a7a_2    conda-forge
+gettext                   0.19.8.1          h0b5b191_1005    conda-forge
+giflib                    5.2.1                h36c2ea0_2    conda-forge
+graphite2                 1.3.13            h58526e2_1001    conda-forge
+graphviz                  2.42.3               h6939c30_2    conda-forge
+gtest                     1.10.0               h4bd325d_7    conda-forge
+gtk2                      2.24.33              hab0c2f8_0    conda-forge
+gts                       0.7.6                h64030ff_2    conda-forge
+harfbuzz                  2.7.4                h5cf4720_0    conda-forge
+icu                       68.1                 h58526e2_0    conda-forge
+idna                      2.10                     pypi_0    pypi
+imagesize                 1.2.0                    pypi_0    pypi
+jinja2                    2.11.3                   pypi_0    pypi
+jpeg                      9d                   h36c2ea0_0    conda-forge
+krb5                      1.17.2               h926e7f8_0    conda-forge
+ld_impl_linux-64          2.35.1               hea4e1c9_2    conda-forge
+libcurl                   7.71.1               hcdd3856_8    conda-forge
+libedit                   3.1.20191231         he28a2e2_2    conda-forge
+libev                     4.33                 h516909a_1    conda-forge
+libffi                    3.3                  h58526e2_2    conda-forge
+libgcc-ng                 9.3.0               h2828fa1_18    conda-forge
+libglib                   2.66.4               h748fe8e_2    conda-forge
+libgomp                   9.3.0               h2828fa1_18    conda-forge
+libiconv                  1.16                 h516909a_0    conda-forge
+libidn2                   2.3.0                h516909a_0    conda-forge
+libnghttp2                1.43.0               h812cca2_0    conda-forge
+libpng                    1.6.37               h21135ba_2    conda-forge
+libprotobuf               3.11.4               h8b12597_0    conda-forge
+libssh2                   1.9.0                hab1572f_5    conda-forge
+libstdcxx-ng              9.3.0               h6de172a_18    conda-forge
+libtiff                   4.2.0                hdc55705_0    conda-forge
+libtool                   2.4.6             h58526e2_1007    conda-forge
+libunistring              0.9.10               h14c3975_0    conda-forge
+libuuid                   2.32.1            h7f98852_1000    conda-forge
+libuv                     1.40.0               h7f98852_0    conda-forge
+libwebp                   1.2.0                h3452ae3_0    conda-forge
+libwebp-base              1.2.0                h7f98852_0    conda-forge
+libxcb                    1.13              h7f98852_1003    conda-forge
+libxml2                   2.9.10               h72842e0_3    conda-forge
+lz4-c                     1.9.3                h9c3ff4c_0    conda-forge
+markupsafe                1.1.1                    pypi_0    pypi
+ncurses                   6.2                  h58526e2_4    conda-forge
+openssl                   1.1.1i               h7f98852_0    conda-forge
+pango                     1.42.4               h69149e4_5    conda-forge
+pcre                      8.44                 he1b5a44_0    conda-forge
+pip                       21.0.1             pyhd8ed1ab_0    conda-forge
+pixman                    0.40.0               h36c2ea0_0    conda-forge
+protobuf                  3.11.4           py38h950e882_1    conda-forge
+pthread-stubs             0.4               h36c2ea0_1001    conda-forge
+pygments                  2.7.4                    pypi_0    pypi
+python                    3.8.6           hffdb5ce_5_cpython    conda-forge
+python_abi                3.8                      1_cp38    conda-forge
+pytz                      2021.1                   pypi_0    pypi
+readline                  8.0                  he28a2e2_2    conda-forge
+requests                  2.25.1                   pypi_0    pypi
+rhash                     1.4.1                h7f98852_0    conda-forge
+setuptools                49.6.0           py38h578d9bd_3    conda-forge
+six                       1.15.0             pyh9f0ad1d_0    conda-forge
+snowballstemmer           2.1.0                    pypi_0    pypi
+sphinx                    3.2.1                    pypi_0    pypi
+sphinx-rtd-theme          0.5.0                    pypi_0    pypi
+sphinx-tabs               1.3.0                    pypi_0    pypi
+sphinxcontrib-applehelp   1.0.2                    pypi_0    pypi
+sphinxcontrib-devhelp     1.0.2                    pypi_0    pypi
+sphinxcontrib-htmlhelp    1.0.3                    pypi_0    pypi
+sphinxcontrib-jsmath      1.0.1                    pypi_0    pypi
+sphinxcontrib-qthelp      1.0.3                    pypi_0    pypi
+sphinxcontrib-serializinghtml 1.1.4                    pypi_0    pypi
+sqlite                    3.34.0               h74cdb3f_0    conda-forge
+tk                        8.6.10               h21135ba_1    conda-forge
+urllib3                   1.26.3                   pypi_0    pypi
+wget                      1.20.1               h22169c7_0    conda-forge
+wheel                     0.36.2             pyhd3deb0d_0    conda-forge
+xorg-kbproto              1.0.7             h7f98852_1002    conda-forge
+xorg-libice               1.0.10               h516909a_0    conda-forge
+xorg-libsm                1.2.3             h84519dc_1000    conda-forge
+xorg-libx11               1.6.12               h516909a_0    conda-forge
+xorg-libxau               1.0.9                h7f98852_0    conda-forge
+xorg-libxdmcp             1.1.3                h7f98852_0    conda-forge
+xorg-libxext              1.3.4                h516909a_0    conda-forge
+xorg-libxpm               3.5.13               h516909a_0    conda-forge
+xorg-libxrender           0.9.10            h516909a_1002    conda-forge
+xorg-libxt                1.1.5             h516909a_1003    conda-forge
+xorg-renderproto          0.11.1            h14c3975_1002    conda-forge
+xorg-xextproto            7.3.0             h7f98852_1002    conda-forge
+xorg-xproto               7.0.31            h7f98852_1007    conda-forge
+xz                        5.2.5                h516909a_1    conda-forge
+zlib                      1.2.11            h516909a_1010    conda-forge
+zstd                      1.4.8                ha95c52a_1    conda-forge