Merge branch 'master' into lbfgs and update hessian/opt

Signed-off-by: Conrad Hübler <[email protected]>

CMakeLists.txt

@@ -23,29 +23,20 @@ option (WriteMoreInfo
     "Write statistic files with more info" OFF)
 
 add_subdirectory(${PROJECT_SOURCE_DIR}/external/fmt EXCLUDE_FROM_ALL)
-add_subdirectory(${PROJECT_SOURCE_DIR}/external/finite-diff/ EXCLUDE_FROM_ALL)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
 #if(NOT DEFINED ${CMAKE_BUILD_TYPE})
 #    set(CMAKE_BUILD_TYPE RelWithDebInfo)
 #endif()
 
-#include(FetchContent)
-#FetchContent_Declare(
-#    finite-diff
-#    GIT_REPOSITORY https://github.com/zfergus/finite-diff.git
-#    GIT_TAG "v1.0.1"
-#    GIT_SHALLOW TRUE
-#)
-#FetchContent_MakeAvailable(finite-diff)
+
 
 include_directories(SYSTEM  ${PROJECT_SOURCE_DIR}/external/fmt/include
                             ${PROJECT_SOURCE_DIR}/external/LBFGSpp/include
                             ${PROJECT_SOURCE_DIR}/external/ripser
                             ${PROJECT_SOURCE_DIR}/external/eigen-3.4.0
                             ${PROJECT_SOURCE_DIR}/external/cpp-d4/include
-                            ${PROJECT_SOURCE_DIR}/external/finite-diff/src
                             ${PROJECT_SOURCE_DIR}/external/)
 include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR} )
 
@@ -329,7 +320,8 @@ if(USE_D4)
     target_link_libraries(curcuma_core curcuma_d4)
 endif()
 
-target_link_libraries(curcuma_core pthread fmt::fmt-header-only finitediff::finitediff)
+#target_link_libraries(curcuma_core pthread fmt::fmt-header-only finitediff::finitediff)
+target_link_libraries(curcuma_core pthread fmt::fmt-header-only )
 
 if(WIN32) # Check if we are on Windows
 else()

README.md

@@ -1,5 +1,6 @@
 [![CodeFactor](https://www.codefactor.io/repository/github/conradhuebler/curcuma/badge)](https://www.codefactor.io/repository/github/conradhuebler/curcuma) [![Build](https://github.com/conradhuebler/curcuma/workflows/AutomaticBuild/badge.svg)](https://github.com/conradhuebler/curcuma/actions)  [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4302722.svg)](https://doi.org/10.5281/zenodo.4302722)
 
+![curcuma Logo](https://github.com/conradhuebler/curcuma/raw/master/misc/curcuma_II.png)
 
 # Curcuma