Commit 56677044 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'segments' into 'develop' 

Segments

See merge request !48
parents 7e5bf8aa 456375d0

.gitlab-ci.yml

+1 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ stages: 
          fi

        - export CTEST_OUTPUT_ON_FAILURE=1

        - export CTEST_PARALLEL_LEVEL=4

        # enforce (more or less) warning-free builds

        - export CXXFLAGS="-Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=uninitialized -Wno-error=vla"

        - mkdir -p "./builddir/$CI_JOB_NAME"

        - pushd "./builddir/$CI_JOB_NAME"

        - cmake ../..
@@ -64,6 +62,7 @@ stages: 
                -DWITH_EXAMPLES=${WITH_EXAMPLES}

                -DWITH_TOOLS=${WITH_TOOLS}

                -DWITH_PYTHON=${WITH_PYTHON}

                -DWITH_CI_FLAGS=yes

        # "install" implies the "all" target

        - ninja ${NINJAFLAGS} install

        - if [[ ${WITH_TESTS} == "yes" ]]; then

CMakeLists.txt

+5 −0
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ set( CMAKE_SHARED_LINKER_FLAGS "" ) 
set( CMAKE_SHARED_LINKER_FLAGS_DEBUG "-rdynamic" )

set( CMAKE_SHARED_LINKER_FLAGS_RELEASE "" )



if( ${WITH_CI_FLAGS} )

   # enforce (more or less) warning-free builds

   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=uninitialized -Wno-error=vla" )

endif()



# set additional Debug/Release options using generator expressions

# (that way we can exclude some options for specific targets, see https://stackoverflow.com/a/59734798 for details)

add_compile_options(

build

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ WITH_EXAMPLES="yes" 
WITH_PYTHON="yes"

WITH_TOOLS="yes"

WITH_BENCHMARKS="yes"

WITH_CI_FLAGS="no"



for option in "$@"

do
@@ -62,6 +63,7 @@ do 
        --with-tools=*                   ) WITH_TOOLS="${option#*=}" ;;

        --with-benchmarks=*              ) WITH_BENCHMARKS="${option#*=}" ;;

        --with-python=*                  ) WITH_PYTHON="${option#*=}" ;;

        --with-ci-flags=*                ) WITH_CI_FLAGS="${option#*=}" ;;

        *                                )

           echo "Unknown option ${option}. Use --help for more information."

           exit 1 ;;
@@ -142,6 +144,7 @@ cmake_command=( 
         -DWITH_TOOLS=${WITH_TOOLS}

         -DWITH_PYTHON=${WITH_PYTHON}

         -DWITH_BENCHMARKS=${WITH_BENCHMARKS}

         -DWITH_CI_FLAGS=${WITH_CI_FLAGS}

         -DDCMTK_DIR=${DCMTK_DIR}

)

src/Benchmarks/BLAS/spmv.h

+4 −4
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
#include "../Benchmarks.h"



#include <TNL/Pointers/DevicePointer.h>

#include <TNL/Matrices/CSR.h>

#include <TNL/Matrices/Ellpack.h>

#include <TNL/Matrices/SlicedEllpack.h>

#include <TNL/Matrices/ChunkedEllpack.h>

#include <TNL/Matrices/Legacy/CSR.h>

#include <TNL/Matrices/Legacy/Ellpack.h>

#include <TNL/Matrices/Legacy/SlicedEllpack.h>

#include <TNL/Matrices/Legacy/ChunkedEllpack.h>



namespace TNL {

namespace Benchmarks {

src/Benchmarks/DistSpMV/tnl-benchmark-distributed-spmv.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "../Benchmarks.h"

#include "ordering.h"



#include <TNL/Matrices/SlicedEllpack.h>

#include <TNL/Matrices/Legacy/SlicedEllpack.h>



using namespace TNL;

using namespace TNL::Benchmarks;