Verified Commit b0c8d184 authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

update deps, drop abt-snoozer 

margo, argobots and mercury have been updated. The abt-snoozer dep
required by margo it is not needed anymore.

RocksDB has been also updated to the lastest release
parent a4395a75

ifs/CMake/FindAbt-Snoozer.cmake

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
find_path(ABT_SNOOZER_DIR

        HINTS

        /usr

        /usr/local

        /usr/local/adafs/

        ${ADAFS_DEPS_INSTALL}

        )



find_path(ABT_SNOOZER_INCLUDE_DIR abt-snoozer.h

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${ABT_SNOOZER_DIR}

        /usr

        /usr/local

        /usr/local/adafs

        /opt

        PATH_SUFFIXES include

        PATH_SUFFIXES include/abt-snoozer

        )



find_library(ABT_SNOOZER_LIBRARY abt-snoozer

        HINTS

        ${ADAFS_DEPS_INSTALL}

        ${ABT_SNOOZER_DIR}

        /usr

        /usr/local

        /usr/local/adafs

        /opt/

        PATH_SUFFIXES lib

        PATH_SUFFIXES lib/argobots

        )



set(ABT_SNOOZER_INCLUDE_DIRS ${ABT_SNOOZER_INCLUDE_DIR})

set(ABT_SNOOZER_LIBRARIES ${ABT_SNOOZER_LIBRARY})





include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(Abt-Snoozer DEFAULT_MSG ABT_SNOOZER_LIBRARY ABT_SNOOZER_INCLUDE_DIR)



mark_as_advanced(

        ABT_SNOOZER_DIR

        ABT_SNOOZER_LIBRARY

        ABT_SNOOZER_INCLUDE_DIR

)
 
 No newline at end of file

ifs/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ find_package(RocksDB REQUIRED) 
find_package(Libev REQUIRED)

find_package(Mercury REQUIRED)

find_package(Abt REQUIRED)

find_package(Abt-Snoozer REQUIRED)

find_package(Margo REQUIRED)



# boost dependencies, system is required for filesystem

ifs/include/daemon/adafs_daemon.hpp

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
// margo

extern "C" {

#include <abt.h>

#include <abt-snoozer.h>

#include <mercury.h>

#include <margo.h>

}

ifs/include/preload/rpc/ld_rpc_data_ws.hpp

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


extern "C" {

#include <abt.h>

#include <abt-snoozer.h>

#include <mercury_types.h>

#include <mercury_proc_string.h>

#include <margo.h>

ifs/scripts/compile_dep.sh

+1 −27
Original line number Diff line number Diff line
@@ -285,37 +285,11 @@ prepare_build_dir ${CURR} 
cd ${CURR}

./autogen.sh

cd ${CURR}/build

../configure --prefix=${INSTALL}

make -j${CORES}

make install

[ "${PERFORM_TEST}" ] && make check



echo "############################################################ Installing:  Abt-snoozer"

# Abt snoozer

CURR=${SOURCE}/abt-snoozer

prepare_build_dir ${CURR}

cd ${CURR}

./prepare.sh

cd ${CURR}/build

../configure --prefix=${INSTALL} PKG_CONFIG_PATH=${INSTALL}/lib/pkgconfig

../configure --prefix=${INSTALL} --enable-perf-opt --disable-checks

make -j${CORES}

make install

[ "${PERFORM_TEST}" ] && make check



#echo "############################################################ Installing:  Abt-IO"

## Abt IO

#CURR=${SOURCE}/abt-io

#prepare_build_dir ${CURR}

#cd ${CURR}

#echo "########## ADA-FS injection: Applying abt-io c++ template clash patch"

#git apply ${PATCH_DIR}/abt_io_cplusplus_template_clash.patch

#./prepare.sh

#cd ${CURR}/build

#../configure --prefix=${INSTALL} PKG_CONFIG_PATH=${INSTALL}/lib/pkgconfig

#make -j${CORES}

#make install

#[ "${PERFORM_TEST}" ] && make check  # The tests create so huge files that breaks memory :D



echo "############################################################ Installing:  Margo"

# Margo

CURR=${SOURCE}/margo