Commit d6a86905 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Update .gitlab-ci.yml

parent 072c1535

.gitlab-ci.yml

+22 −5
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
# can use verions as well, like gcc:5.2

# see https://hub.docker.com/_/gcc/



variables:

  GIT_SUBMODULE_STRATEGY: normal



stages:

    - build

    - test
@@ -22,10 +25,23 @@ before_script: 
        protobuf-c-compiler

        libyaml-cpp-dev

        libyaml-dev

        cmake



    - pushd . &&

      git clone https://github.com/ofiwg/libfabric.git &&

      cd libfabric &&

      ./autogen.sh &&

      mkdir build &&

      cd build &&

      ../configure &&

      make -j $(nproc) &&

      make install &&

      popd



    - git clone https://github.com/mercury-hpc/mercury.git &&

    - pushd . &&

      git clone https://github.com/mercury-hpc/mercury.git &&

      cd mercury &&

      git checkout 3d8ed01eeff6b504862702048d7577457c71227c &&

      git reset --hard 3d8ed01eeff6b504862702048d7577457c71227c &&

      mkdir build &&

      cd build &&

      cmake
@@ -33,14 +49,15 @@ before_script: 
        -DBUILD_TESTING:BOOL=OFF

        -DMERCURY_USE_SM_ROUTING:BOOL=OFF

        -DMERCURY_USE_SELF_FORWARD:BOOL=OFF

        -DMERCURY_USE_CHECKSUMS:BOOL=ON

        -DMERCURY_USE_CHECKSUMS:BOOL=OFF

        -DMERCURY_USE_BOOST_PP:BOOL=ON

        -DMERCURY_USE_EAGER_BULK:BOOL=ON

        -DBUILD_SHARED_LIBS:BOOL=ON

        -DNA_USE_OFI:BOOL=ON

        .. &&

      make -j $(nproc) &&

      make install

      make install &&

      popd





### GCC 5

.gitmodules

+1 −1
Original line number Diff line number Diff line 
[submodule "src/externals/hermes"]

	path = src/externals/hermes

	url = ssh://git@bscssrg.bsc.es:2222/hpc/hermes.git
 
    url = ../hermes.git

src/backends/backend-base.hpp

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public: 
        try {

            return get().create(std::forward<Args>(args)...);

        }

        catch(std::invalid_argument) {

        catch(const std::invalid_argument&) {

            return std::shared_ptr<backend>();

        }

    }

hermes @ 5d30d5aa

Original line number Diff line number Diff line 
Subproject commit 57619ec9e554cca491b2d495f4a64aa411f3a564
 
Subproject commit 5d30d5aaa329e4984ba31f6702000f87f7b7082e

src/urd.cpp

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#include <string.h>

#include <ctime>



#include <boost/optional.hpp>

#include <boost/optional/optional_io.hpp>

#include <boost/atomic.hpp>

#include <functional>