Commit 0955d6bf authored by Marc Vef's avatar Marc Vef
Browse files

Script version bump for latest Margo version

parent 81ef7b4f

ifs/scripts/clone_dep.sh

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ assertdir "argobots" "git clone -b dev-get-dev-basic https://github.com/carns/ar 
# get Argobots-snoozer

assertdir "abt-snoozer" "git clone https://xgitlab.cels.anl.gov/sds/abt-snoozer.git" "3d9240eda290bfb89f08a5673cebd888194a4bd7"

# get Margo

assertdir "margo" "git clone https://xgitlab.cels.anl.gov/sds/margo.git" "3375e1168185e4443a784e66420d91e122d03a61"

assertdir "margo" "git clone https://xgitlab.cels.anl.gov/sds/margo.git" "68ef7f14178e9066cf38846d90d451e00aaca61d"

# get rocksdb

assertdir "rocksdb" "git clone https://github.com/facebook/rocksdb" "tags/v5.8"

ifs/scripts/compile_dep.sh

+73 −60
Original line number Diff line number Diff line 
#!/bin/bash

HOME=/home/evie

GIT=$HOME/adafs/git

INSTALL=$HOME/adafs/install



#echo "Installing BMI"

## BMI

#CURR=$GIT/bmi

#if [ ! -d "$CURR/build" ]; then

#	mkdir $CURR/build

#fi

#rm -rf $CURR/build/*

#cd $CURR

#./prepare

#cd $CURR/build

#../configure --prefix=$INSTALL --enable-shared --enable-bmi-only

#make -j8

#make install

#

#echo "Installing Mercury"

#

## Mercury

#CURR=$GIT/mercury

#if [ ! -d "$CURR/build" ]; then

#	mkdir $CURR/build

#fi

#rm -rf $CURR/build/*

#cd $CURR/build

#cmake -DMERCURY_USE_SELF_FORWARD:BOOL=ON -DMERCURY_USE_CHECKSUMS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DMERCURY_USE_BOOST_PP:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL -DCMAKE_BUILD_TYPE:STRING=Release -DNA_USE_BMI:BOOL=ON ../

#make -j8

#make install

#

#echo "Installing Argobots"

#

## Argobots

#CURR=$GIT/argobots

#if [ ! -d "$CURR/build" ]; then

#	mkdir $CURR/build

#fi

#rm -rf $CURR/build/*

#cd $CURR

#./autogen.sh

#cd $CURR/build

#../configure --prefix=$INSTALL

#make -j8

#make install

#make check

#

#echo "Installing Abt-snoozer"

## Abt snoozer

#CURR=$GIT/abt-snoozer

#if [ ! -d "$CURR/build" ]; then

#	mkdir $CURR/build

#fi

#rm -rf $CURR/build/*

#cd $CURR

#./prepare.sh

#cd $CURR/build

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

#make -j8

#make install

#make check

if [ -z ${1+x} ]; then

    echo "Please give git destination path as first parameter and install path as second";

    exit

else

    echo "Git path is set to '$1'";

    echo "Install path is set to '$2'";

    echo "Install output is logged at /tmp/adafs_dep_install.log"

fi



LOG=/tmp/adafs_install.log

echo "" &> $LOG

GIT=$1

INSTALL=$2



mkdir -p $GIT



echo "Installing BMI"

# BMI

CURR=$GIT/bmi

if [ ! -d "$CURR/build" ]; then

	mkdir $CURR/build

fi

rm -rf $CURR/build/*

cd $CURR

./prepare

cd $CURR/build

../configure --prefix=$INSTALL --enable-shared --enable-bmi-only

make -j8

make install



echo "Installing Mercury"



# Mercury

CURR=$GIT/mercury

if [ ! -d "$CURR/build" ]; then

	mkdir $CURR/build

fi

rm -rf $CURR/build/*

cd $CURR/build

cmake -DMERCURY_USE_SELF_FORWARD:BOOL=ON -DMERCURY_USE_CHECKSUMS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DMERCURY_USE_BOOST_PP:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_INSTALL_PREFIX=$INSTALL -DCMAKE_BUILD_TYPE:STRING=Release -DNA_USE_BMI:BOOL=ON ../

make -j8

make install



echo "Installing Argobots"



# Argobots

CURR=$GIT/argobots

if [ ! -d "$CURR/build" ]; then

	mkdir $CURR/build

fi

rm -rf $CURR/build/*

cd $CURR

./autogen.sh

cd $CURR/build

../configure --prefix=$INSTALL

make -j8

make install

make check



echo "Installing Abt-snoozer"

# Abt snoozer

CURR=$GIT/abt-snoozer

if [ ! -d "$CURR/build" ]; then

	mkdir $CURR/build

fi

rm -rf $CURR/build/*

cd $CURR

./prepare.sh

cd $CURR/build

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

make -j8

make install

make check



echo "Installing Margo"

# Margo

ifs/scripts/margo_0.2_multiple_clients.patch

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
diff --git a/src/margo.c b/src/margo.c

index e5e2e2c..cef5357 100644

--- a/src/margo.c

+++ b/src/margo.c

@@ -144,15 +144,16 @@ margo_instance_id margo_init(const char *addr_str, int mode,

     struct margo_instance *mid = MARGO_INSTANCE_NULL;

 

     if(mode != MARGO_CLIENT_MODE && mode != MARGO_SERVER_MODE) goto err;

+    if (ABT_initialized() == ABT_ERR_UNINITIALIZED) {

+        ret = ABT_init(0, NULL); /* XXX: argc/argv not currently used by ABT ... */

+        if(ret != 0) goto err;

 

-    ret = ABT_init(0, NULL); /* XXX: argc/argv not currently used by ABT ... */

-    if(ret != 0) goto err;

-

-    /* set caller (self) ES to idle without polling */

+        /* set caller (self) ES to idle without polling */

 #ifdef HAVE_ABT_SNOOZER

-    ret = ABT_snoozer_xstream_self_set();

-    if(ret != 0) goto err;

+        ret = ABT_snoozer_xstream_self_set();

+        if(ret != 0) goto err;

 #endif

+    }

 

     if (use_progress_thread)

     {