lmoneta · lmoneta · May 5, 2014 · May 6, 2014 · May 6, 2014 · May 6, 2014
diff --git a/cmake/modules/FindLibCmaes.cmake b/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 )
diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake
@@ -132,6 +132,7 @@ ROOT_BUILD_OPTION(http ON "Enable suppport for HTTP server")
 ROOT_BUILD_OPTION(fcgi OFF "Enable FastCGI suppport in HTTP server")
 ROOT_BUILD_OPTION(imt ON "Enable support for implicit multi-threading via Intel® Thread Bulding Blocks (TBB)")
 ROOT_BUILD_OPTION(jemalloc OFF "Use jemalloc memory allocator")
+ROOT_BUILD_OPTION(libcmaes OFF "Build the libcmaes minimizer library")
 ROOT_BUILD_OPTION(libcxx OFF "Build using libc++")
 ROOT_BUILD_OPTION(macos_native OFF "Disable looking for libraries, includes and binaries in locations other than a native installation (MacOS only)")
 ROOT_BUILD_OPTION(mathmore ON "Build libMathMore extended math library (requires GSL)")

diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
@@ -317,6 +317,7 @@ set(gslflags)
 
 set(shadowpw ${value${shadowpw}})
 set(buildmathmore ${value${mathmore}})
+set(buildcmaes ${value${libcmaes}})
 set(buildroofit ${value${roofit}})
 set(buildminuit2 ${value${minuit2}})
 set(buildunuran ${value${unuran}})

diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake
@@ -729,6 +729,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")

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

@@ -375,7 +375,7 @@ void TPluginManager::LoadHandlersFromEnv(TEnv *env)
                TString ctor = strtok(0, ";\"");
                if (!ctor.Contains("("))
                   ctor = strtok(0, ";\"");
-               AddHandler(s, regexp, clss, plugin, ctor, "TEnv");
+	       AddHandler(s, regexp, clss, plugin, ctor, "TEnv");
                cnt++;
             }
             delete [] v;
@@ -587,8 +587,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;
       }
    }

@@ -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 *)");
 }
@@ -0,0 +1,5 @@
+void P090_TCMAESMinimizer()
+{
+  gPluginMgr->AddHandler("ROOT::Math::Minimizer", "cmaes", "ROOT::cmaes::TCMAESMinimizer",
+			 "cmaes_root", "TCMAESMinimizer(const char *)");
+}
diff --git a/graf2d/asimage/src/libAfterImage/asfont.c b/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

@@ -1766,7 +1766,6 @@ Double_t TF1::GetMinMaxNDim(Double_t *x , bool findmax, Double_t epsilon, Int_t
          stepSize = (rmax[i] - rmin[i]) / 100;
       else if (std::abs(x[i]) > 1.)
          stepSize = 0.1 * x[i];
-
       // set variable names
       if (ndim <= 3) {
          if (i == 0) {

diff --git a/math/CMakeLists.txt b/math/CMakeLists.txt
@@ -13,6 +13,9 @@ add_subdirectory(minuit)
 if(minuit2)
   add_subdirectory(minuit2)
 endif()
+if (libcmaes)
+  add_subdirectory(cmaes)
+endif()
 add_subdirectory(fumili)
 add_subdirectory(physics)
 if(mlp)

diff --git a/math/cmaes/CMakeLists.txt b/math/cmaes/CMakeLists.txt
@@ -0,0 +1,13 @@
+############################################################################
+# CMakeLists.txt file for building ROOT math/cmaes package
+############################################################################
+
+add_definitions(-DWARNINGMSG -DUSE_ROOT_ERROR)
+
+include_directories(${LIBCMAES_INCLUDE_DIR})
+link_directories(${LIBCMAES_LIBRARIES})
+
+ROOT_GENERATE_DICTIONARY(G__cmaes *.h MODULE cmaes LINKDEF LinkDef.h)
+
+ROOT_LINKER_LIBRARY(cmaes_root *.cxx G__cmaes.cxx DEPENDENCIES MathCore Hist LIBRARIES cmaes)
+ROOT_INSTALL_HEADERS()
@@ -0,0 +1,140 @@
+# Module.mk for cmaes module.
+
+MODNAME       := cmaes
+MODDIR        := $(ROOT_SRCDIR)/math/$(MODNAME)
+MODDIRS       := $(MODDIR)/src
+MODDIRI       := $(MODDIR)/inc
+
+CMAESDIR    := $(MODDIR)
+CMAESDIRS   := $(CMAESDIR)/src
+CMAESDIRI   := $(CMAESDIR)/inc
+#CMAESDIRT   :=$(call stripsrc,$(CMAESDIR)/test)
+
+CMAESBASEVERS := cmaes-1_0_0
+CMAESBASESRCS := $(MODDIRS)/$(CMAESBASEVERS).tar.gz
+CMAESBASEDIRS := $(MODDIRS)/$(CMAESBASEVERS)
+CMAESBASEDIRI := -I$(MODDIRS)/$(CMAESBASEVERS)
+CMAESBASEETAG := $(MODDIRS)/headers.d
+
+##### liblcg_cmaes #####
+ifeq ($(PLATFORM),win32)
+CMAESBASELIBA      := $(CMAESBASEDIRS)/libcmaesbase.lib
+CMAESBASELIB       := $(LPATH)/libcmaesbase.lib
+ifeq (debug,$(findstring debug,$(ROOTBUILD)))
+CMAESBASEBLD        = "DEBUG=1"
+else
+CMAESBASEBLD        = ""
+endif
+else
+CMAESBASELIBA      := $(CMAESBASEDIRS)/src/.libs/liblcg_cmaes.a
+CMAESBASELIB       := $(LPATH)/libcmaesbase.a
+endif
+CMAESBASEDEP       := $(CMAESBASELIB)
+
+##### libcmaes #####
+CMAESL     := $(MODDIRI)/LinkDef.h
+CMAESDS    := $(call stripsrc,$(MODDIRS)/G__cmaes.cxx)
+CMAESDO    := $(CMAESDS:.cxx=.o)
+CMAESDH    := $(CMAESDS:.cxx=.h)
+
+CMAESAH    := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
+CMAESBH    := $(filter-out $(MODDIRI)/cmaes/LinkDef%,$(wildcard $(MODDIRI)/cmaes/*.h))
+CMAESH     := $(CMAESAH) $(CMAESBH)
+CMAESS     := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
+CMAESO     := $(call stripsrc,$(CMAESS:.cxx=.o))
+
+CMAESDEP   := $(CMAESO:.o=.d) $(CMAESDO:.o=.d)
+
+CMAESLIB   := $(LPATH)/libcmaes_root.$(SOEXT)
+CMAESMAP   := $(CMAESLIB:.$(SOEXT)=.rootmap)
+
+# use this compiler option if want to optimize object allocation in cmaes
+# NOTE: using this option one loses the thread safety.
+# It is worth to use only for minimization of cheap (non CPU intensive) functions
+#CXXFLAGS += -DMN_USE_STACK_ALLOC
+
+# used in the main Makefile
+ALLHDRS      += $(patsubst $(MODDIRI)/%.h,include/%.h,$(CMAESH))
+ALLLIBS      += $(CMAESLIB)
+ALLMAPS      += $(CMAESMAP)
+
+# include all dependency files
+INCLUDEFILES += $(CMAESDEP)
+
+##### local rules #####
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
+                test-$(MODNAME)
+
+include/cmaes/%.h: $(CMAESDIRI)/cmaes/%.h
+		@(if [ ! -d "include/cmaes" ]; then     \
+		   mkdir -p include/cmaes;              \
+		fi)
+		cp $< $@
+
+include/%.h:    $(CMAESDIRI)/%.h
+		cp $< $@
+
+$(CMAESLIB):  $(CMAESO) $(CMAESDO) $(ORDER_) $(MAINLIBS) $(CMAESLIBDEP)
+		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
+		   "$(SOFLAGS)" libcmaes_root.$(SOEXT) $@ \
+		"$(CMAESO) $(CMAESDO)" "-lcmaes -lMathCore" "$(CMAESLIBEXTRA)"
+
+$(call pcmrule,CMAES)
+	$(noop)
+
+$(CMAESDS):   $(CMAESH) $(CMAESL) $(ROOTCLINGEXE) $(call pcmdep,CMAES)
+		$(MAKEDIR)
+		@echo "Generating dictionary $@..."
+		$(ROOTCLINGSTAGE2) -f $@ $(call dictModule,CMAES)  -I$(CMAESINCDIR) -I/usr/include/eigen3 -c $(CMAESH) $(CMAESL)
+
+$(CMAESMAP):  $(CMAESH) $(CMAESL) $(ROOTCLINGEXE) $(call pcmdep,CMAES)
+		$(MAKEDIR)
+		@echo "Generating rootmap $@..."
+		$(ROOTCLINGSTAGE2) -r $(CMAESDS) $(call dictModule,CMAES) -c $(CMAESH) $(CMAESL)
+
+all-$(MODNAME): $(CMAESLIB)
+
+#test-$(MODNAME): all-$(MODNAME)
+#ifneq ($(ROOT_OBJDIR),$(ROOT_SRCDIR))
+#		@$(INSTALL) $(CMAESDIR)/test $(CMAESDIRT)
+#endif
+		@cd $(CMAESDIRT) && $(MAKE) ROOTCONFIG=../../../bin/root-config
+
+clean-$(MODNAME):
+		@rm -f $(CMAESO) $(CMAESDO)
+
+clean::         clean-$(MODNAME)
+
+distclean-$(MODNAME): clean-$(MODNAME)
+		@rm -f $(CMAESDEP) $(CMAESDS) $(CMAESDH) $(CMAESLIB) \
+		   $(CMAESMAP)
+		@rm -rf include/cmaes
+ifneq ($(ROOT_OBJDIR),$(ROOT_SRCDIR))
+		@rm -rf $(CMAESDIRT)
+else
+		@cd $(CMAESDIRT) && $(MAKE) distclean ROOTCONFIG=../../../bin/root-config
+endif
+
+distclean::     distclean-$(MODNAME)
+
+##### extra rules ######
+$(CMAESO): CXXFLAGS += -DWARNINGMSG -DUSE_ROOT_ERROR
+$(CMAESDO): CXXFLAGS += -DWARNINGMSG -DUSE_ROOT_ERROR
+#for thread -safet
+#$(CMAESO): CXXFLAGS += -DCMAES_THREAD_SAFE
+# for openMP 
+#ifneq ($(USE_PARALLEL_CMAES),)
+#ifneq ($(USE_OPENMP),)
+#$(CMAESO): CXXFLAGS += -DCMAES_THREAD_SAFE -DCMAES_PARALLEL_OPENMP
+#math/cmaes/src/Numerical2PGradientCalculator.o: 
+$(CMAESO):CXXFLAGS +=  -D_GLIBCXX_PARALLEL -fopenmp
+$(CMAESDO):CXXFLAGS +=  -D_GLIBCXX_PARALLEL -fopenmp 
+$(CMAESLIB):LDFLAGS += -fopenmp
+#endif
+
+$(CMAESO):CXXFLAGS += -I$(CMAESINCDIR) -I/usr/include/eigen3
+$(CMAESDO):CXXFLAGS += -I$(CMAESINCDIR) -I/usr/include/eigen3
+$(CMAESDS):CXXFLAGS += -I$(CMAESINCDIR) -I/usr/include/eigen3
+$(CMAESLIB):LDFLAGS += $(CMAESLIBDIR)
+# Optimize dictionary with stl containers.
+$(CMAESDO): NOOPT = $(OPT)