Merge pull request #129 from memmett/memmett/hashdist+make

[WIP] HashDist + vanilla make

Author: memmett

3rdparty/CMakeLists.txt

@@ -82,59 +82,6 @@ endif()
 list(APPEND 3rdparty_INCLUDES "${Eigen3_INCLUDE_PATH}")
 
 
-message(STATUS "--------------------------------------------------------------------------------")
-message(STATUS "Easylogging++")
-
-set(EASYLOGGING++_SOURCE_URL
-    "https://github.com/easylogging/easyloggingpp/releases/download/v9.75/easyloggingpp_v9.75.tar.gz"
-)
-
-find_package(Easylogging++)
-set_package_properties(Easylogging++
-    PROPERTIES
-      DESCRIPTION "logging library"
-      URL "https://github.com/easylogging/easyloggingpp"
-      TYPE OPTIONAL
-      PURPOSE "provides functionality for versatile logging"
-)
-
-if(NOT EASYLOGGING++_FOUND)
-    set(Easylogging++_SOURCE_DIR "${pfasst_BINARY_DIR}/3rdparty/src/Easylogging++")
-    set(EASYLOGGING++_SOURCE_MD5 "3e37462b30cb6ee49faeed6a94d1bc1e")
-
-    message(STATUS "Easylogging++ not found on your system")
-    message(STATUS " going to download sources from:")
-    message(STATUS "   ${EASYLOGGING++_SOURCE_URL}")
-    ExternalProject_Add(
-        Easylogging++
-        LIST_SEPARATOR " "
-        URL ${EASYLOGGING++_SOURCE_URL}
-        URL_MD5 ${Easylogging++_SOURCE_MD5}
-        TIMEOUT ${3rdparty_DOWNLOAD_TIMEOUT}
-        UPDATE_COMMAND ""
-        PATCH_COMMAND ""
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        TEST_COMMAND ""
-        INSTALL_DIR ""
-        INSTALL_COMMAND ""
-        LOG_DOWNLOAD ON
-        LOG_CONFIGURE OFF
-        LOG_BUILD OFF
-    )
-
-    # Specify include dir
-    set(Easylogging++_INCLUDE_PATH "${Easylogging++_SOURCE_DIR}")
-    set(EASYLOGGING++_FOUND TRUE)
-
-    list(APPEND pfasst_DEPENDEND_TARGETS Easylogging++)
-
-    msg_not_installed("Easylogging++")
-endif()
-
-list(APPEND 3rdparty_INCLUDES "${Easylogging++_INCLUDE_PATH}")
-
-
 if(pfasst_BUILD_EXAMPLES)
     message(STATUS "--------------------------------------------------------------------------------")
     message(STATUS "FFTW3")

CMakeLists.txt

@@ -8,6 +8,8 @@ include(ExternalProject)
 include(CMakeDependentOption)
 include(FeatureSummary)
 
+list(APPEND CMAKE_FIND_ROOT_PATH ${pfasst_SOURCE_DIR}/stack)
+
 # Set default ExternalProject root directory
 set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/3rdparty)
 

LICENSE

@@ -1,4 +1,7 @@
-Copyright (c) 2014, Parallel-in-Time (PinT) Algorithms
+PFASST
+======
+
+Copyright (c) 2014, Matthew Emmett, Torbjörn Klatt, Daniel Ruprecht, and Robert Speck
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -20,4 +23,13 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Dependencies
+============
+
+Easylogging
+-----------
+
+Easylogging is released under the MIT Licence.  Please see http://www.easylogging.org/licence.php

cmake/FindEasylogging++.cmake

@@ -0,0 +1,17 @@
+PFASST   := $(abspath ../..)
+STACK    ?= $(PFASST)/stack
+CXX      := $(STACK)/bin/mpic++
+CXXFLAGS ?= -std=c++11 -I$(PFASST)/include -I$(STACK)/include -I$(STACK)/include/eigen3
+
+LDFLAGS  ?= -L$(STACK)/lib -Wl,-rpath=$(STACK)/lib -lboost_program_options -lfftw3
+
+all: vanilla_sdc mpi_pfasst serial_mlsdc
+
+vanilla_sdc: vanilla_sdc.cpp
+	$(CXX) -o $@ $(CXXFLAGS) $^ $(LDFLAGS)
+
+serial_mlsdc: serial_mlsdc.cpp
+	$(CXX) -o $@ $(CXXFLAGS) $^ $(LDFLAGS)
+
+mpi_pfasst: mpi_pfasst.cpp
+	$(CXX) -o $@ $(CXXFLAGS) $^ $(LDFLAGS)