Support for CMA-ES minimizer based on libcmaes

Makefile

@@ -82,7 +82,7 @@ MODULES       = build interpreter/llvm interpreter/cling core/metautils \
                 io/io math/mathcore net/net core/zip core/lzma math/matrix \
                 core/newdelete hist/hist tree/tree graf2d/freetype \
                 graf2d/mathtext graf2d/graf graf2d/gpad graf3d/g3d \
-                gui/gui math/minuit hist/histpainter tree/treeplayer \
+                gui/gui math/minuit math/cmaes hist/histpainter tree/treeplayer \
                 gui/ged tree/treeviewer math/physics graf2d/postscript \
                 core/rint html montecarlo/eg \
                 geom/geom geom/geompainter montecarlo/vmc \
@@ -246,6 +246,12 @@ endif
 ifeq ($(BUILDMINUIT2),yes)
 MODULES      += math/minuit2
 endif
+ifeq ($(BUILDCMAES),yes)
+MODULES      += math/cmaes
+endif
+ifeq ($(BUILDCMAES),yes)
+MODULES      += math/cmaes
+endif
 ifeq ($(BUILDUNURAN),yes)
 MODULES      += math/unuran
 endif
@@ -327,7 +333,7 @@ MODULES      += core/unix core/winnt graf2d/x11 graf2d/x11ttf \
                 sql/oracle io/xmlparser math/mathmore \
                 tmva math/genetic io/hdfs graf2d/fitsio roofit/roofitcore \
                 roofit/roofit roofit/roostats roofit/histfactory \
-                math/minuit2 net/monalisa math/fftw sql/odbc math/unuran \
+                math/minuit2 math/cmaes net/monalisa math/fftw sql/odbc math/unuran \
                 geom/geocad geom/gdml graf3d/eve net/glite misc/memstat \
                 math/genvector net/bonjour graf3d/gviz3d graf2d/gviz \
                 proof/proofbench proof/afdsmgrd graf2d/ios \

cmake/modules/FindLibCmaes.cmake

@@ -0,0 +1,53 @@
+# - Try to find libcmaes, https://github.com/beniz/libcmaes
+# Once done this will define
+#
+#  LIBCMAES_FOUND - system has libcmaes
+#  LIBCMES_INCLUDE_DIR - the libcmaes include directory
+#  LIBCMAES_LIBRARIES - Link these to use libcmaes
+#  LIBCMAES_DEFINITIONS - Compiler switches required for using libcmaes
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+# Copyright (c) 2014, Emmanuel Benazera, <[email protected]>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if ( LIBCMAES_INCLUDE_DIR AND LIBCMAES_LIBRARIES )
+   # in cache already
+   SET(Libcmaes_FIND_QUIETLY TRUE)
+endif ( LIBCMAES_INCLUDE_DIR AND LIBCMAES_LIBRARIES )
+
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+if( NOT WIN32 )
+  find_package(PkgConfig)
+  pkg_check_modules(PC_LIBCMAES QUIET libcmaes)
+
+  if( PKG_CONFIG_FOUND )
+    set(LIBCMAES_INCLUDE_DIR ${PC_LIBCMAES_INCLUDE_DIRS})
+    set(LIBCMAES_LIBRARIES ${PC_LIBCMAES_LIBRARY_DIRS})
+    set(LIBCMAES_DEFINITIONS ${PC_LIBCMAES_CFLAGS_OTHER})
+  endif( PKG_CONFIG_FOUND )
+
+endif( NOT WIN32 )
+
+find_path(LIBCMAES_INCLUDE_DIR NAMES cmaes.h
+  PATHS
+  ${PC_LIBCMAES_INCLUDEDIR}
+  ${PC_LIBCMAES_INCLUDE_DIRS}
+)
+
+find_library(LIBCMAES_LIBRARIES NAMES libcmaes
+  PATHS
+  ${PC_LIBCMAES_LIBDIR}
+  ${PC_LIBCMAES_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Libcmaes DEFAULT_MSG LIBCMAES_INCLUDE_DIR LIBCMAES_LIBRARIES )
+
+# show the LIBCMAES_INCLUDE_DIR and LIBCMAES_LIBRARIES variables only in the advanced view
+mark_as_advanced(LIBCMAES_INCLUDE_DIR LIBCMAES_LIBRARIES )

cmake/modules/FindLibCmaes.cmake~

@@ -0,0 +1,51 @@
+# - Try to find libcmaes, https://github.com/beniz/libcmaes
+# Once done this will define
+#
+#  LIBCMAES_FOUND - system has libcmaes
+#  LIBCMES_INCLUDE_DIR - the libcmaes include directory
+#  LIBCMAES_LIBRARIES - Link these to use libcmaes
+#  LIBCMAES_DEFINITIONS - Compiler switches required for using libcmaes
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+# Copyright (c) 2014, Emmanuel Benazera, <[email protected]>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if ( LIBCMAES_INCLUDE_DIR AND LIBCMAES_LIBRARIES )
+   # in cache already
+   SET(Libcmaes_FIND_QUIETLY TRUE)
+endif ( LIBCMAES_INCLUDE_DIR AND LIBCMAES_LIBRARIES )
+
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+if( NOT WIN32 )
+  find_package(PkgConfig)
+
+  pkg_check_modules(PC_LIBCMAES REQUIRED libcmaes)
+
+  set(LIBCMAES_INCLUDE_DIRS ${PC_LIBCMAES_INCLUDE_DIRS})
+  set(LIBCMAES_LIBRARIES ${PC_LIBCMAES_LIBRARIES_DIRS})
+  set(LIBCMAES_DEFINITIONS ${PC_LIBCMAES_CFLAGS_OTHER})
+endif( NOT WIN32 )
+
+find_path(LIBCMAES_INCLUDE_DIR NAMES cmaes.h
+  PATHS
+  ${PC_LIBCMAES_INCLUDEDIR}
+  ${PC_LIBCMAES_INCLUDE_DIRS}
+)
+
+find_library(LIBCMAES_LIBRARIES NAMES libcmaes
+  PATHS
+  ${PC_LIBCMAES_LIBDIR}
+  ${PC_LIBCMAES_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Libcmaes DEFAULT_MSG LIBCMAES_INCLUDE_DIR LIBCMAES_LIBRARIES )
+
+# show the LIBCMAES_INCLUDE_DIR and LIBCMAES_LIBRARIES variables only in the advanced view
+mark_as_advanced(LIBCMAES_INCLUDE_DIR LIBCMAES_LIBRARIES )

cmake/modules/RootBuildOptions.cmake

@@ -137,6 +137,7 @@ ROOT_BUILD_OPTION(krb5 ON "Kerberos5 support, requires Kerberos libs")
 ROOT_BUILD_OPTION(ldap ON "LDAP support, requires (Open)LDAP libs")
 ROOT_BUILD_OPTION(mathmore ON "Build the new libMathMore extended math library, requires GSL (vers. >= 1.8)")
 ROOT_BUILD_OPTION(memstat ${memstat_defvalue} "A memory statistics utility, helps to detect memory leaks")
+ROOT_BUILD_OPTION(libcmaes OFF "Build the libcmaes minimizer library")
 ROOT_BUILD_OPTION(minuit2 ${minuit2_defvalue} "Build the new libMinuit2 minimizer library")
 ROOT_BUILD_OPTION(monalisa ON "Monalisa monitoring support, requires libapmoncpp")
 ROOT_BUILD_OPTION(mysql ON "MySQL support, requires libmysqlclient")

cmake/modules/RootConfiguration.cmake

@@ -388,6 +388,7 @@ set(buildmathmore ${value${mathmore}})
 set(buildcling ${value${cling}})
 set(buildroofit ${value${roofit}})
 set(buildminuit2 ${value${minuit2}})
+set(buildcmaes ${value${libcmaes}})
 set(buildunuran ${value${unuran}})
 set(buildgdml ${value${gdml}})
 set(buildhttp ${value${http}})

cmake/modules/SearchInstalledSoftware.cmake

@@ -477,6 +477,39 @@ if(sqlite)
   endif()
 endif()
 
+#---Check for Libcmaes-------------------------------------------------------------------
+if(libcmaes)
+  message(STATUS "Looking for libcmaes")
+  find_package(LibCmaes)
+  if(NOT LIBCMAES_FOUND)
+    message(STATUS "Fetching and compiling libcmaes")
+    ExternalProject_Add(
+      eigen3
+      PREFIX eigen3
+      INSTALL_DIR ${CMAKE_BINARY_DIR}
+      URL http://bitbucket.org/eigen/eigen/get/3.2.2.tar.gz
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+      )
+    ExternalProject_Add(
+      cma
+      DEPENDS eigen3
+      PREFIX cma
+      INSTALL_DIR ${CMAKE_BINARY_DIR}
+      URL https://github.com/beniz/libcmaes/archive/master.tar.gz
+      CONFIGURE_COMMAND ./autogen.sh && ./configure --prefix=<INSTALL_DIR> --with-eigen3-include=${CMAKE_BINARY_DIR}/include/eigen3 --enable-onlylib --disable-surrog
+      BUILD_IN_SOURCE 1
+      )
+    set(LIBCMAES_INCLUDE_DIR ${CMAKE_BINARY_DIR}/include/libcmaes ${CMAKE_BINARY_DIR}/include/eigen3)
+    set(LIBCMAES_LIBRARIES ${CMAKE_BINARY_DIR}/lib/)
+    #if(fail-on-missing)
+    #  message(FATAL_ERROR "libcmaes not found")
+    #else() 
+    #  message(STATUS "libcmaes not found. Switching off libcmaes option")
+    #  set(libcmaes OFF CACHE BOOL "" FORCE)
+    #endif()
+  endif()
+endif()
+
 #---Check for Pythia6-------------------------------------------------------------------
 if(pythia6)
   message(STATUS "Looking for Pythia6")

config/Makefile.depend

@@ -27,6 +27,7 @@ HTMLLIBDEPM            = $(GRAFLIB) $(THREADLIB)
 MATHMORELIBDEPM        = $(MATHCORELIB)
 MINUITLIBDEPM          = $(GRAFLIB) $(HISTLIB) $(MATRIXLIB) $(MATHCORELIB)
 MINUIT2LIBDEPM         = $(GRAFLIB) $(HISTLIB) $(MATRIXLIB) $(MATHCORELIB)
+CMAESLIBDEPM           = $(GRAFLIB) $(HISTLIB) $(MATHCORELIB)
 FUMILILIBDEPM          = $(GRAFLIB) $(HISTLIB) $(MATHCORELIB)
 TREELIBDEPM            = $(NETLIB) $(IOLIB) $(THREADLIB)
 TREEPLAYERLIBDEPM      = $(TREELIB) $(G3DLIB) $(GRAFLIB) $(HISTLIB) $(GPADLIB) \
@@ -166,6 +167,7 @@ SPECTRUMPAINTERLIBDEP  = $(SPECTRUMPAINTERLIBDEPM)
 HTMLLIBDEP             = $(HTMLLIBDEPM)
 MINUITLIBDEP           = $(MINUITLIBDEPM)
 MINUIT2LIBDEP          = $(MINUIT2LIBDEPM)
+CMAESLIBDEP            = $(CMAESLIBDEPM)
 MATHMORELIBDEP         = $(MATHMORELIBDEPM)
 FUMILILIBDEP           = $(FUMILILIBDEPM)
 TREELIBDEP             = $(TREELIBDEPM)
@@ -277,6 +279,7 @@ MINUITLIBEXTRA          = lib/libGraf.lib lib/libHist.lib lib/libMatrix.lib \
                           lib/libMathCore.lib
 MINUIT2LIBEXTRA         = lib/libGraf.lib lib/libHist.lib lib/libMatrix.lib \
                           lib/libMathCore.lib
+CMAESLIBEXTRA           = lib/libGraf.lib lib/libHist.lib lib/libMathCore.lib
 MATHMORELIBEXTRA        = lib/libMathCore.lib
 FUMILILIBEXTRA          = lib/libGraf.lib lib/libHist.lib lib/libMathCore.lib
 TREELIBEXTRA            = lib/libNet.lib lib/libRIO.lib lib/libThread.lib
@@ -447,6 +450,7 @@ SPECTRUMPAINTERLIBEXTRA = -Llib -lGraf -lHist
 HTMLLIBEXTRA            = -Llib -lGraf -lThread
 MINUITLIBEXTRA          = -Llib -lGraf -lHist -lMatrix -lMathCore
 MINUIT2LIBEXTRA         = -Llib -lGraf -lHist -lMatrix -lMathCore
+CMAESLIBEXTRA           = -Llib -lGraf -lHist -lMathCore
 FUMILILIBEXTRA          = -Llib -lGraf -lHist -lMathCore
 MATHMORELIBEXTRA        = -Llib -lMathCore
 TREELIBEXTRA            = -Llib -lNet -lRIO -lThread

config/Makefile.in

@@ -396,6 +396,11 @@ BUILDROOFIT    := @buildroofit@
 
 BUILDMINUIT2   := @buildminuit2@
 
+BUILDCMAES     := @buildcmaes@
+CMAESINCDIR    := $(filter-out -I/usr/include, @cmaesincdir@)
+CMAESLIBDIR    := @cmaeslibdir@
+CMAESLIB       := -lcmaes
+
 BUILDUNURAN    := @buildunuran@
 
 BUILDVC        := @buildvc@

configure

@@ -84,6 +84,7 @@ options="                    \
    enable_mathmore           \
    enable_memstat            \
    enable_minuit2            \
+   enable_cmaes              \
    enable_monalisa           \
    enable_mysql              \
    enable_odbc               \
@@ -166,6 +167,7 @@ enable_qt=no
 enable_qtgsi=no
 enable_roofit=no
 enable_minuit2=no
+enable_cmaes=yes
 enable_rpath=no
 enable_ruby=no
 enable_shadowpw=
@@ -193,6 +195,7 @@ if test "x$ENABLEALL" = "xyes"; then
     enable_qtgsi=yes
     enable_roofit=yes
     enable_minuit2=yes
+    enable_cmaes=yes
     #enable_ruby=yes     #not supported in ROOT v6.0.0 yet
     enable_table=yes
     enable_unuran=yes
@@ -247,6 +250,7 @@ SSL              \
 AFS              \
 ROOFIT           \
 MINUIT2          \
+CMAES            \
 TABLE            \
 XMLDIR           \
 CASROOT          \
@@ -1661,6 +1665,7 @@ enable/disable options, prefix with either --enable- or --disable-
   mathmore           Build the new libMathMore extended math library, requires GSL (vers. >= 1.10)
   memstat            A memory statistics utility, helps to detect memory leaks
   minuit2            Build the new libMinuit2 minimizer library
+  cmaes              Build the wrapper to the libcmaes mininmizer library
   monalisa           Monalisa monitoring support, requires libapmoncpp
   mysql              MySQL support, requires libmysqlclient
   odbc               ODBC support, requires libiodbc or libodbc
@@ -2173,6 +2178,8 @@ if test $# -gt 0 ; then
       --with-rfio-libdir=*)    shiftlibdir=$optarg   ; enable_rfio="yes"    ;;
       --with-sqlite-incdir=*)  sqliteincdir=$optarg  ; enable_sqlite="yes"  ;;
       --with-sqlite-libdir=*)  sqlitelibdir=$optarg  ; enable_sqlite="yes"  ;;
+      --with-cmaes-incdir=*)   cmaesincdir=$optarg   ; enable_cmaes="yes"   ;;
+      --with-cmaes-libdir=*)   cmaeslibdir=$optarg   ; enable_cmaes="yes"   ;;
       --with-srp=*)            srpdir=$optarg        ; enable_srp="yes"     ;;
       --with-srp-incdir=*)     srpincdir=$optarg     ; enable_srp="yes"     ;;
       --with-srp-libdir=*)     srplibdir=$optarg     ; enable_srp="yes"     ;;
@@ -6676,6 +6683,19 @@ else
     result "no"
 fi
 
+######################################################################
+#
+### echo %%% libcmaes support - Third party libraries
+#
+#check_header "cmaes.h" $HOME/include/libcmaes /usr/include/libcmaes
+check_header "cmaes.h" "$cmaesincdir" /usr/include/libcmaes
+cmaesinc=$found_hdr
+cmaesincdir=$found_dir
+check_library "libcmaes" "yes" "$cmaeslibdir" /usr/lib
+# $HOME/lib /usr/lib
+cmaeslib=$found_lib
+cmaeslibdir=$found_dir
+
 ######################################################################
 #
 ### echo %%% Unuran Library - Contributed library
@@ -6882,6 +6902,7 @@ if test "x$show_pkglist" = "xyes" ; then
     test "x$enable_fitsio"   = "xyes" && pl="$pl root-plugin-graf2d-fitsio"
     test "x$enable_gviz"     = "xyes" && pl="$pl root-plugin-graf2d-gviz"
     test "x$enable_minuit2"  = "xyes" && pl="$pl root-plugin-math-minuit2"
+    test "x$enable_cmaes"  = "xyes" && pl="$pl root-plugin-math-cmaes"
     test "x$enable_pythia6"  = "xyes" && pl="$pl root-plugin-montecarlo-pythia6"
     test "x$enable_alien"    = "xyes" && pl="$pl root-plugin-net-alien"
     test "x$enable_bonjour"  = "xyes" && pl="$pl root-plugin-net-bonjour"
@@ -6914,6 +6935,7 @@ if test "x$show_pkglist" = "xyes" ; then
         libroot-math-mathcore \
         libroot-math-matrix \
         libroot-math-minuit \
+        libroot-math-cmaes \
         libroot-math-mlp \
         libroot-math-physics \
         libroot-math-quadp \
@@ -7384,6 +7406,10 @@ sed -e "s|@aclocaldir@|$aclocaldir|"            \
     -e "s|@lzmalibdir@|$lzmalibdir|"            \
     -e "s|@buildroofit@|$enable_roofit|"        \
     -e "s|@buildminuit2@|$enable_minuit2|"      \
+    -e "s|@buildcmaes@|$enable_cmaes|"          \
+    -e "s|@cmaeslibdir@|$cmaeslibdir|"          \
+    -e "s|@cmaeslib@|$cmaeslib|"                \
+    -e "s|@cmaesincdir@|$cmaesincdir|"          \
     -e "s|@buildunuran@|$enable_unuran|"        \
     -e "s|@buildvc@|$enable_vc|"                \
     -e "s|@buildvdt@|$enable_vdt|"              \

core/base/src/TPluginManager.cxx

@@ -101,6 +101,7 @@
 #include "TObjString.h"
 #include "ThreadLocalStorage.h"
 
+#include <iostream>
 
 TPluginManager *gPluginMgr;   // main plugin manager created in TROOT
 
@@ -356,7 +357,8 @@ void TPluginManager::LoadHandlersFromEnv(TEnv *env)
                TString ctor = strtok(0, ";\"");
                if (!ctor.Contains("("))
                   ctor = strtok(0, ";\"");
-               AddHandler(s, regexp, clss, plugin, ctor, "TEnv");
+	       std::cout << "class: " << clss << std::endl;
+	       AddHandler(s, regexp, clss, plugin, ctor, "TEnv");
                cnt++;
             }
             delete [] v;
@@ -558,8 +560,8 @@ TPluginHandler *TPluginManager::FindHandler(const char *base, const char *uri)
 
    while ((h = (TPluginHandler*) next())) {
       if (h->CanHandle(base, uri)) {
-         if (gDebug > 0)
-            Info("FindHandler", "found plugin for %s", h->GetClass());
+	/*if (gDebug > 0)
+	  Info("FindHandler", "found plugin for %s", h->GetClass());*/
          return h;
       }
    }

etc/dictpch/makepch.sh

@@ -36,7 +36,7 @@ else
     rootbuild=-rootbuild
 fi
 
-cxxflags="-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DROOT_PCH -I$rootdir/include -I$rootdir/etc -I$rootdir/$cfgdir -I$rootdir/etc/cling `cat $rootdir/$cppflags`"
+cxxflags="-D__CLING__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DROOT_PCH -I$rootdir/include -I$rootdir/include/libcmaes -I$rootdir/include/eigen3 -I$rootdir/etc -I$rootdir/$cfgdir -I$rootdir/etc/cling `cat $rootdir/$cppflags`"
 
 if ! [ "x$1" = "x" ]; then
     cxxflags="$cxxflags $1"

etc/plugins/ROOT@@Math@@Minimizer/P010_Minuit2Minimizer.C

@@ -1,5 +1,5 @@
 void P010_Minuit2Minimizer()
 {
-   gPluginMgr->AddHandler("ROOT::Math::Minimizer", "Minuit2", "ROOT::Minuit2::Minuit2Minimizer",
-      "Minuit2", "Minuit2Minimizer(const char *)");
+  gPluginMgr->AddHandler("ROOT::Math::Minimizer", "Minuit2", "ROOT::Minuit2::Minuit2Minimizer",
+			 "Minuit2", "Minuit2Minimizer(const char *)");
 }

etc/plugins/ROOT@@Math@@Minimizer/P090_TCMAESMinimizer.C

@@ -0,0 +1,5 @@
+void P090_TCMAESMinimizer()
+{
+  gPluginMgr->AddHandler("ROOT::Math::Minimizer", "cmaes", "ROOT::cmaes::TCMAESMinimizer",
+			 "cmaes_root", "TCMAESMinimizer(const char *)");
+}

graf2d/asimage/src/libAfterImage/asfont.c

@@ -63,11 +63,11 @@
 #  include <ft2build.h>
 #  include FT_FREETYPE_H
 # endif
-# ifdef HAVE_FREETYPE_FREETYPE
+/*# ifdef HAVE_FREETYPE_FREETYPE
 #  include <freetype/freetype.h>
-# else
+# else*/
 #  include <freetype.h>
-# endif
+//# endif
 # if (FREETYPE_MAJOR == 2) && ((FREETYPE_MINOR == 0) || ((FREETYPE_MINOR == 1) && (FREETYPE_PATCH < 3)))
 #  define FT_KERNING_DEFAULT ft_kerning_default
 # endif